Changeset 148439 in webkit

Timestamp:

Apr 15, 2013, 8:28:19 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Schedule rendering at regular interval (60fps)
​https://bugs.webkit.org/show_bug.cgi?id=114617

Patch by Seulgi Kim <​seulgikim@company100.net> on 2013-04-15
Reviewed by Martin Robinson.

Schedule rendering reguarly regardless of the time taken to render a
frame. Otherwise, next flush delayed by the amount of the rendering
time.

• WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:

(WebKit::LayerTreeHostGtk::LayerTreeHostGtk):
(WebKit::LayerTreeHostGtk::layerFlushTimerFired):
(WebKit::LayerTreeHostGtk::flushAndRenderLayers):

• WebProcess/WebPage/gtk/LayerTreeHostGtk.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp (modified) (3 diffs)
• WebProcess/WebPage/gtk/LayerTreeHostGtk.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-04-15  Seulgi Kim  <seulgikim@company100.net>
+
+        Schedule rendering at regular interval (60fps)
+        https://bugs.webkit.org/show_bug.cgi?id=114617
+
+        Reviewed by Martin Robinson.
+
+        Schedule rendering reguarly regardless of the time taken to render a
+        frame. Otherwise, next flush delayed by the amount of the rendering
+        time.
+
+        * WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
+        (WebKit::LayerTreeHostGtk::LayerTreeHostGtk):
+        (WebKit::LayerTreeHostGtk::layerFlushTimerFired):
+        (WebKit::LayerTreeHostGtk::flushAndRenderLayers):
+        * WebProcess/WebPage/gtk/LayerTreeHostGtk.h:
+
 2013-04-15  Michał Pakuła vel Rutka  <m.pakula@samsung.com>
 

trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp

@@ -72 +72 @@
     , m_isValid(true)
     , m_notifyAfterScheduledLayerFlush(false)
+    , m_lastFlushTime(0)
     , m_layerFlushSchedulingEnabled(true)
     , m_layerFlushTimerCallbackId(0)
@@ -302 +303 @@
     flushAndRenderLayers();
 
-    if (toTextureMapperLayer(m_rootLayer.get())->descendantsOrSelfHaveRunningAnimations() && !m_layerFlushTimerCallbackId)
-        m_layerFlushTimerCallbackId = g_timeout_add_full(GDK_PRIORITY_EVENTS, 1000.0 / 60.0, reinterpret_cast<GSourceFunc>(layerFlushTimerFiredCallback), this, 0);
+    if (toTextureMapperLayer(m_rootLayer.get())->descendantsOrSelfHaveRunningAnimations() && !m_layerFlushTimerCallbackId) {
+        const double targetFPS = 60;
+        double nextFlush = std::max((1 / targetFPS) - (currentTime() - m_lastFlushTime), 0.0);
+        m_layerFlushTimerCallbackId = g_timeout_add_full(GDK_PRIORITY_EVENTS, nextFlush * 1000.0, reinterpret_cast<GSourceFunc>(layerFlushTimerFiredCallback), this, 0);
+    }
 }
 
@@ -359 +363 @@
         return;
 
+    m_lastFlushTime = currentTime();
     // Our model is very simple. We always composite and render the tree immediately after updating it.
     compositeLayersToContext();

trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h

@@ -105 +105 @@
     OwnPtr<WebCore::TextureMapper> m_textureMapper;
     OwnPtr<WebCore::GLContext> m_context;
+    double m_lastFlushTime;
     bool m_layerFlushSchedulingEnabled;
     unsigned m_layerFlushTimerCallbackId;