Title: [141297] trunk/Source/WebKit/chromium
Revision
141297
Author
[email protected]
Date
2013-01-30 12:42:40 -0800 (Wed, 30 Jan 2013)

Log Message

Fix compile error in WebFrameTest
https://bugs.webkit.org/show_bug.cgi?id=108360

Unreviewed build fix.

Fixes compile error:
../../Source/WebKit/chromium/tests/WebFrameTest.cpp:330:5: error: converting false to pointer type for argument 1 of char testing::internal::IsNullLiteralHelper(testing::internal::Secret*) [-Werror=conversion-null]


* tests/WebFrameTest.cpp:

Modified Paths

Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (141296 => 141297)


--- trunk/Source/WebKit/chromium/ChangeLog	2013-01-30 20:22:45 UTC (rev 141296)
+++ trunk/Source/WebKit/chromium/ChangeLog	2013-01-30 20:42:40 UTC (rev 141297)
@@ -1,3 +1,15 @@
+2013-01-30  Tony Gentilcore  <[email protected]>
+
+        Fix compile error in WebFrameTest
+        https://bugs.webkit.org/show_bug.cgi?id=108360
+
+        Unreviewed build fix.
+
+        Fixes compile error:
+        ../../Source/WebKit/chromium/tests/WebFrameTest.cpp:330:5: error: converting false to pointer type for argument 1 of char testing::internal::IsNullLiteralHelper(testing::internal::Secret*) [-Werror=conversion-null]
+
+        * tests/WebFrameTest.cpp:
+
 2013-01-30  John Knottenbelt  <[email protected]>
 
         [Chromium] Fix find in page rects for overflowing content.

Modified: trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp (141296 => 141297)


--- trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp	2013-01-30 20:22:45 UTC (rev 141296)
+++ trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp	2013-01-30 20:42:40 UTC (rev 141297)
@@ -327,7 +327,7 @@
 
     int prevLayoutCount = webViewImpl->mainFrameImpl()->frameView()->layoutCount();
     webViewImpl->setPageScaleFactor(3, WebPoint());
-    EXPECT_EQ(false, webViewImpl->mainFrameImpl()->frameView()->needsLayout());
+    EXPECT_FALSE(webViewImpl->mainFrameImpl()->frameView()->needsLayout());
     EXPECT_EQ(prevLayoutCount, webViewImpl->mainFrameImpl()->frameView()->layoutCount());
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to