Changeset 110627 in webkit

Timestamp:

Mar 13, 2012, 3:50:18 PM (15 years ago)

Author:

nduca@chromium.org

Message:

[chromium] vsync ticks are needed in invisible tabs when we are still updating resources
​https://bugs.webkit.org/show_bug.cgi?id=80910

Reviewed by James Robinson.

Source/WebCore:

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

(WebCore::CCSchedulerStateMachine::vsyncCallbackNeeded):

Source/WebKit/chromium:

• tests/CCSchedulerStateMachineTest.cpp:

(WebCore::TEST):
(WebCore):

Location:

trunk/Source

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-13  Nat Duca  <nduca@chromium.org>
+
+        [chromium] vsync ticks are needed in invisible tabs when we are still updating resources
+        https://bugs.webkit.org/show_bug.cgi?id=80910
+
+        Reviewed by James Robinson.
+
+        * platform/graphics/chromium/cc/CCSchedulerStateMachine.cpp:
+        (WebCore::CCSchedulerStateMachine::vsyncCallbackNeeded):
+
 2012-03-13  Dave Tharp  <dtharp@codeaurora.org>
 

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

@@ -165 +165 @@
 {
     if (!m_visible || m_contextState != CONTEXT_ACTIVE) {
-        if (m_needsForcedRedraw)
+        if (m_needsForcedRedraw || m_commitState == COMMIT_STATE_UPDATING_RESOURCES)
             return true;
 
@@ -171 +171 @@
     }
 
-    return m_needsRedraw || m_needsForcedRedraw || m_updateMoreResourcesPending;
+    return m_needsRedraw || m_needsForcedRedraw || m_commitState == COMMIT_STATE_UPDATING_RESOURCES;
 }
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-03-13  Nat Duca  <nduca@chromium.org>
+
+        [chromium] vsync ticks are needed in invisible tabs when we are still updating resources
+        https://bugs.webkit.org/show_bug.cgi?id=80910
+
+        Reviewed by James Robinson.
+
+        * tests/CCSchedulerStateMachineTest.cpp:
+        (WebCore::TEST):
+        (WebCore):
+
 2012-03-13  Dana Jansens  <danakj@chromium.org>
 

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

@@ -160 +160 @@
                 state.setVisible(true);
 
-            // Case 1: needsCommit=false updateMoreResourcesPending=false.
+            // Case 1: needsCommit=false
             state.setNeedsCommit(false);
-            state.setUpdateMoreResourcesPending(false);
-            EXPECT_FALSE(state.vsyncCallbackNeeded());
             EXPECT_NE(CCSchedulerStateMachine::ACTION_DRAW, state.nextAction());
 
-            // Case 2: needsCommit=false updateMoreResourcesPending=true.
-            state.setNeedsCommit(false);
-            state.setUpdateMoreResourcesPending(true);
-            if (visible)
-                EXPECT_TRUE(state.vsyncCallbackNeeded());
-            EXPECT_NE(CCSchedulerStateMachine::ACTION_DRAW, state.nextAction());
-
-            // Case 3: needsCommit=true updateMoreResourcesPending=false.
+            // Case 2: needsCommit=true
             state.setNeedsCommit(true);
-            state.setUpdateMoreResourcesPending(false);
-            EXPECT_FALSE(state.vsyncCallbackNeeded());
-            EXPECT_NE(CCSchedulerStateMachine::ACTION_DRAW, state.nextAction());
-
-            // Case 4: needsCommit=true updateMoreResourcesPending=true.
-            state.setNeedsCommit(true);
-            state.setUpdateMoreResourcesPending(true);
-            if (visible)
-                EXPECT_TRUE(state.vsyncCallbackNeeded());
             EXPECT_NE(CCSchedulerStateMachine::ACTION_DRAW, state.nextAction());
         }
@@ -372 +354 @@
 }
 
+
+TEST(CCSchedulerStateMachineTest, TestVSyncNeededWhenUpdatesPendingButInvisible)
+{
+    StateMachine state;
+    state.setCommitState(CCSchedulerStateMachine::COMMIT_STATE_UPDATING_RESOURCES);
+    state.setNeedsRedraw(false);
+    state.setVisible(false);
+    state.setUpdateMoreResourcesPending(true);
+    EXPECT_TRUE(state.vsyncCallbackNeeded());
+
+    state.setUpdateMoreResourcesPending(false);
+    EXPECT_TRUE(state.vsyncCallbackNeeded());
+}
+
 TEST(CCSchedulerStateMachineTest, TestUpdates_WithRedraw_OneRoundOfUpdates)
 {