Changeset 127476 in webkit

Timestamp:

Sep 4, 2012 11:37:26 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium] Do not allow infinite pending frames in CCFrameRateController
​https://bugs.webkit.org/show_bug.cgi?id=94254

Patch by Brian Anderson <​brianderson@chromium.org> on 2012-09-04
Reviewed by James Robinson.

Removes support for infinite pending frames in CCFrameRateController
if swap acks are available.

Functionality covered by existing tests.

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

(WebCore::CCFrameRateController::CCFrameRateController):
(WebCore::CCFrameRateController::setMaxFramesPending):
(WebCore::CCFrameRateController::setSwapBuffersCompleteSupported):
(WebCore):
(WebCore::CCFrameRateController::onTimerTick):
(WebCore::CCFrameRateController::didBeginFrame):
(WebCore::CCFrameRateController::didFinishFrame):

• platform/graphics/chromium/cc/CCFrameRateController.h:

(CCFrameRateController):

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

(WebCore::CCScheduler::setSwapBuffersCompleteSupported):
(WebCore):

• platform/graphics/chromium/cc/CCScheduler.h:

(CCScheduler):

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

(WebCore::CCThreadProxy::initializeRendererOnImplThread):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/cc/CCFrameRateController.cpp (modified) (8 diffs, 1 prop)
• platform/graphics/chromium/cc/CCFrameRateController.h (modified) (2 diffs)
• platform/graphics/chromium/cc/CCScheduler.cpp (modified) (1 diff)
• platform/graphics/chromium/cc/CCScheduler.h (modified) (1 diff)
• platform/graphics/chromium/cc/CCThreadProxy.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-04  Brian Anderson  <brianderson@chromium.org>
+
+        [chromium] Do not allow infinite pending frames in CCFrameRateController
+        https://bugs.webkit.org/show_bug.cgi?id=94254
+
+        Reviewed by James Robinson.
+
+        Removes support for infinite pending frames in CCFrameRateController
+        if swap acks are available.        
+
+        Functionality covered by existing tests.
+
+        * platform/graphics/chromium/cc/CCFrameRateController.cpp:
+        (WebCore::CCFrameRateController::CCFrameRateController):
+        (WebCore::CCFrameRateController::setMaxFramesPending):
+        (WebCore::CCFrameRateController::setSwapBuffersCompleteSupported):
+        (WebCore):
+        (WebCore::CCFrameRateController::onTimerTick):
+        (WebCore::CCFrameRateController::didBeginFrame):
+        (WebCore::CCFrameRateController::didFinishFrame):
+        * platform/graphics/chromium/cc/CCFrameRateController.h:
+        (CCFrameRateController):
+        * platform/graphics/chromium/cc/CCScheduler.cpp:
+        (WebCore::CCScheduler::setSwapBuffersCompleteSupported):
+        (WebCore):
+        * platform/graphics/chromium/cc/CCScheduler.h:
+        (CCScheduler):
+        * platform/graphics/chromium/cc/CCThreadProxy.cpp:
+        (WebCore::CCThreadProxy::initializeRendererOnImplThread):
+
 2012-09-04  Tim Horton  <timothy_horton@apple.com>
 

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

@@ -32 +32 @@
 #include <wtf/CurrentTime.h>
 
+namespace {
+
+// This will be the maximum number of pending frames unless
+// CCFrameRateController::setMaxFramesPending is called.
+const int defaultMaxFramesPending = 2;
+
+}
+
 namespace WebCore {
 
@@ -53 +61 @@
     : m_client(0)
     , m_numFramesPending(0)
-    , m_maxFramesPending(0)
+    , m_maxFramesPending(defaultMaxFramesPending)
     , m_timeSource(timer)
     , m_active(false)
+    , m_swapBuffersCompleteSupported(true)
     , m_isTimeSourceThrottling(true)
 {
@@ -65 +74 @@
     : m_client(0)
     , m_numFramesPending(0)
-    , m_maxFramesPending(0)
+    , m_maxFramesPending(defaultMaxFramesPending)
     , m_active(false)
+    , m_swapBuffersCompleteSupported(true)
     , m_isTimeSourceThrottling(false)
 {
@@ -97 +107 @@
 void CCFrameRateController::setMaxFramesPending(int maxFramesPending)
 {
+    ASSERT(maxFramesPending > 0);
     m_maxFramesPending = maxFramesPending;
 }
@@ -106 +117 @@
 }
 
+void CCFrameRateController::setSwapBuffersCompleteSupported(bool supported)
+{
+    m_swapBuffersCompleteSupported = supported;
+}
+
 void CCFrameRateController::onTimerTick()
 {
@@ -111 +127 @@
 
     // Don't forward the tick if we have too many frames in flight.
-    if (m_maxFramesPending && m_numFramesPending >= m_maxFramesPending) {
+    if (m_numFramesPending >= m_maxFramesPending) {
         TRACE_EVENT0("cc", "CCFrameRateController::onTimerTickButMaxFramesPending");
         return;
@@ -119 +135 @@
         m_client->vsyncTick();
 
-    if (!m_isTimeSourceThrottling
-        && (!m_maxFramesPending || m_numFramesPending < m_maxFramesPending))
+    if (m_swapBuffersCompleteSupported && !m_isTimeSourceThrottling && m_numFramesPending < m_maxFramesPending)
         postManualTick();
 }
@@ -137 +152 @@
 void CCFrameRateController::didBeginFrame()
 {
-    m_numFramesPending++;
+    if (m_swapBuffersCompleteSupported)
+        m_numFramesPending++;
+    else if (!m_isTimeSourceThrottling)
+        postManualTick();
 }
 
 void CCFrameRateController::didFinishFrame()
 {
+    ASSERT(m_swapBuffersCompleteSupported);
+
     m_numFramesPending--;
     if (!m_isTimeSourceThrottling)

trunk/Source/WebCore/platform/graphics/chromium/cc/CCFrameRateController.h

@@ -71 +71 @@
 
     void setTimebaseAndInterval(double timebase, double intervalSeconds);
+    void setSwapBuffersCompleteSupported(bool);
 
 protected:
@@ -87 +88 @@
     OwnPtr<CCFrameRateControllerTimeSourceAdapter> m_timeSourceClientAdapter;
     bool m_active;
+    bool m_swapBuffersCompleteSupported;
 
     // Members for unthrottled frame-rate.

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

@@ -107 +107 @@
 }
 
+void CCScheduler::setSwapBuffersCompleteSupported(bool supported)
+{
+    m_frameRateController->setSwapBuffersCompleteSupported(supported);
+}
+
 void CCScheduler::didSwapBuffersComplete()
 {

trunk/Source/WebCore/platform/graphics/chromium/cc/CCScheduler.h

@@ -98 +98 @@
 
     void setMaxFramesPending(int);
+    void setSwapBuffersCompleteSupported(bool);
     void didSwapBuffersComplete();
 

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

@@ -889 +889 @@
     if (*initializeSucceeded) {
         *capabilities = m_layerTreeHostImpl->rendererCapabilities();
-        if (capabilities->usingSwapCompleteCallback)
-            m_schedulerOnImplThread->setMaxFramesPending(2);
+        m_schedulerOnImplThread->setSwapBuffersCompleteSupported(
+                capabilities->usingSwapCompleteCallback);
     }