[chromium] Fix compiler warning in CCSchedulerTest.cpp with gcc 4.6.3

https://bugs.webkit.org/show_bug.cgi?id=85110

Reviewed by James Robinson.

Using gcc 4.6.3 (default on Precise), I get:
third_party/WebKit/Source/WebKit/chromium/tests/CCSchedulerTest.cpp:188:5: error: converting 'false' to pointer type
for argument 1 of 'char testing::internal::IsNullLiteralHelper(testing::internal::Secret*)' [-Werror=conversion-null]

* tests/CCSchedulerTest.cpp:
(WebKitTests::TEST):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@115527 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 38eb41b..55b3eff 100644 (file)
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,17 @@
+2012-04-27  Tony Chang  <tony@chromium.org>
+
+        [chromium] Fix compiler warning in CCSchedulerTest.cpp with gcc 4.6.3
+        https://bugs.webkit.org/show_bug.cgi?id=85110
+
+        Reviewed by James Robinson.
+
+        Using gcc 4.6.3 (default on Precise), I get:
+        third_party/WebKit/Source/WebKit/chromium/tests/CCSchedulerTest.cpp:188:5: error: converting 'false' to pointer type
+        for argument 1 of 'char testing::internal::IsNullLiteralHelper(testing::internal::Secret*)' [-Werror=conversion-null]
+
+        * tests/CCSchedulerTest.cpp:
+        (WebKitTests::TEST):
+
 2012-04-27  Nat Duca  <nduca@chromium.org>
 
         Expose high-resolution on requestAnimationFrame callback

diff --git a/Source/WebKit/chromium/tests/CCSchedulerTest.cpp b/Source/WebKit/chromium/tests/CCSchedulerTest.cpp
index 5730a4f..4125088 100644 (file)
--- a/Source/WebKit/chromium/tests/CCSchedulerTest.cpp
+++ b/Source/WebKit/chromium/tests/CCSchedulerTest.cpp
@@ -185,11 +185,11 @@ TEST(CCSchedulerTest, TextureAcquisitionCollision)
     client.reset();
 
     // Compositor not scheduled to draw because textures are locked by main thread
-    EXPECT_EQ(false, timeSource->active());
+    EXPECT_FALSE(timeSource->active());
 
     // Trigger the commit
     scheduler->beginFrameComplete();
-    EXPECT_EQ(true, timeSource->active());
+    EXPECT_TRUE(timeSource->active());
     client.reset();
 
     // Between commit and draw, texture acquisition for main thread delayed,