Modified: trunk/Source/WebKit/chromium/ChangeLog (130140 => 130141)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-10-02 08:59:39 UTC (rev 130140)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-10-02 09:29:01 UTC (rev 130141)
@@ -1,3 +1,14 @@
+2012-10-02 Jochen Eisinger <joc...@chromium.org>
+
+ Use correct gtest macros for tests for true/false
+
+ Unreviewed build-fix.
+
+ Using EXPECT_EQ(true, ...) makes clang trip when it tries to convert
+ true to a pointer. Tests should use EXPECT_TRUE instead.
+
+ * tests/WebFrameTest.cpp:
+
2012-10-02 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r130129.
Modified: trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp (130140 => 130141)
--- trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp 2012-10-02 08:59:39 UTC (rev 130140)
+++ trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp 2012-10-02 09:29:01 UTC (rev 130141)
@@ -363,14 +363,14 @@
EXPECT_NEAR(wideDiv.x * scale, scroll.x, 20);
int vScroll = (wideDiv.y + wideDiv.height / 2) * scale - (viewportHeight / 2);
EXPECT_NEAR(vScroll, scroll.y, 1);
- EXPECT_EQ(false, isAnchor);
+ EXPECT_FALSE(isAnchor);
setScaleAndScrollAndLayout(webViewImpl, scroll, scale);
// Test zoom out back to minimum scale.
webViewImpl->computeScaleAndScrollForHitRect(doubleTapPointWide, WebViewImpl::DoubleTap, scale, scroll, isAnchor);
EXPECT_FLOAT_EQ(webViewImpl->minimumPageScaleFactor(), scale);
- EXPECT_EQ(true, isAnchor);
+ EXPECT_TRUE(isAnchor);
setScaleAndScrollAndLayout(webViewImpl, WebPoint(0, 0), scale);
@@ -380,7 +380,7 @@
EXPECT_NEAR(viewportWidth / (float) tallDiv.width, scale, 0.1);
EXPECT_NEAR(tallDiv.x * scale, scroll.x, 20);
EXPECT_NEAR(tallDiv.y * scale, scroll.y, 20);
- EXPECT_EQ(false, isAnchor);
+ EXPECT_FALSE(isAnchor);
// Test for Non-doubletap scaling
// Test zooming into div.
