Update to Chromium revision fc6aaca4 (#406441)

This commit is contained in:
Marshall Greenblatt
2016-07-21 17:21:32 -04:00
parent d92bc1d200
commit 98f59f47fd
79 changed files with 478 additions and 402 deletions

View File

@ -656,10 +656,7 @@ class OSRTestHandler : public RoutingTestHandler,
#if defined(OS_MACOSX)
EXPECT_EQ(0xff5d99d6, *(reinterpret_cast<const uint32*>(buffer)));
#elif defined(OS_LINUX) || defined(OS_WIN)
if (scale_factor_ == 1.0f)
EXPECT_EQ(0xff6497ea, *(reinterpret_cast<const uint32*>(buffer)));
else if (scale_factor_ == 2.0f)
EXPECT_EQ(0xff4d90fe, *(reinterpret_cast<const uint32*>(buffer)));
EXPECT_EQ(0xff6497ea, *(reinterpret_cast<const uint32*>(buffer)));
#else
#error "Unsupported platform"
#endif