Changeset 117214 in webkit

Timestamp:

May 15, 2012 9:07:52 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Chromium] CCTimer::isActive() is incorrect inside tick callback
​https://bugs.webkit.org/show_bug.cgi?id=86513

Source/WebCore:

This patch implements CCTimer::isActive() by clearing the task pointer
when the timer fires.

Patch by Tien-Ren Chen <​trchen@chromium.org> on 2012-05-15
Reviewed by James Robinson.

No new tests. Existing tests updated accordingly.

• platform/graphics/chromium/cc/CCTimer.cpp:

(WebCore::CCTimerTask::performTask):

• rendering/RenderLayerBacking.cpp:

Source/WebKit/chromium:

Update test cases to verify CCTimer::isActive() values.

Patch by Tien-Ren Chen <​trchen@chromium.org> on 2012-05-15
Reviewed by James Robinson.

• tests/CCTimerTest.cpp:

(WebKitTests::TEST_F):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/chromium/cc/CCTimer.cpp (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/tests/CCTimerTest.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-15  Tien-Ren Chen  <trchen@chromium.org>
+
+        [Chromium] CCTimer::isActive() is incorrect inside tick callback
+        https://bugs.webkit.org/show_bug.cgi?id=86513
+
+        This patch implements CCTimer::isActive() by clearing the task pointer
+        when the timer fires.
+
+        Reviewed by James Robinson.
+
+        No new tests. Existing tests updated accordingly.
+
+        * platform/graphics/chromium/cc/CCTimer.cpp:
+        (WebCore::CCTimerTask::performTask):
+        * rendering/RenderLayerBacking.cpp:
+
 2012-05-15  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebCore/platform/graphics/chromium/cc/CCTimer.cpp

@@ -53 +53 @@
     void performTask()
     {
-        if (!m_timer || !m_timer->m_client)
+        if (!m_timer)
             return;
 
-        m_timer->m_client->onTimerFired();
+        CCTimerClient* client = m_timer->m_client;
+
+        m_timer->stop();
+        if (client)
+            client->onTimerFired();
     }
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-05-15  Tien-Ren Chen  <trchen@chromium.org>
+
+        [Chromium] CCTimer::isActive() is incorrect inside tick callback
+        https://bugs.webkit.org/show_bug.cgi?id=86513
+
+        Update test cases to verify CCTimer::isActive() values.
+
+        Reviewed by James Robinson.
+
+        * tests/CCTimerTest.cpp:
+        (WebKitTests::TEST_F):
+
 2012-05-15  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebKit/chromium/tests/CCTimerTest.cpp

@@ -56 +56 @@
     CCTimer timer(&m_thread, this);
     timer.startOneShot(0.001);
-
+    EXPECT_TRUE(timer.isActive());
     m_thread.runPendingTask();
+    EXPECT_FALSE(timer.isActive());
     EXPECT_TRUE(m_flag);
     EXPECT_FALSE(m_thread.hasPendingTask());
@@ -66 +67 @@
     CCTimer timer(&m_thread, this);
     timer.startOneShot(0.001);
+    EXPECT_TRUE(timer.isActive());
     timer.stop();
+    EXPECT_FALSE(timer.isActive());
 
     m_thread.runPendingTask();