Changeset 151245 in webkit

Timestamp:

Jun 5, 2013 3:43:00 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] AcceleratedCompositingContext: fix layerFlushTimerFiredCallback condition
​https://bugs.webkit.org/show_bug.cgi?id=117258

Patch by Alberto Garcia <​agarcia@igalia.com> on 2013-06-05
Reviewed by Martin Robinson.

The expressions were incorrectly grouped, a timeout handler can
only be added only if there's none running already.

• WebCoreSupport/AcceleratedCompositingContextGL.cpp:

(WebKit::AcceleratedCompositingContext::renderLayersToWindow):

Location:

trunk/Source/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/AcceleratedCompositingContextGL.cpp (modified) (1 diff)

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2013-06-05  Alberto Garcia  <agarcia@igalia.com>
+
+        [GTK] AcceleratedCompositingContext: fix layerFlushTimerFiredCallback condition
+        https://bugs.webkit.org/show_bug.cgi?id=117258
+
+        Reviewed by Martin Robinson.
+
+        The expressions were incorrectly grouped, a timeout handler can
+        only be added only if there's none running already.
+
+        * WebCoreSupport/AcceleratedCompositingContextGL.cpp:
+        (WebKit::AcceleratedCompositingContext::renderLayersToWindow):
+
 2013-06-04  Alberto Garcia  <agarcia@igalia.com>
 

trunk/Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp

@@ -157 +157 @@
     cairo_fill(cr);
 
-    if ((!m_layerFlushTimerCallbackId && toTextureMapperLayer(m_rootLayer.get())->descendantsOrSelfHaveRunningAnimations()) || m_needsExtraFlush) {
+    if (!m_layerFlushTimerCallbackId && (toTextureMapperLayer(m_rootLayer.get())->descendantsOrSelfHaveRunningAnimations() || m_needsExtraFlush)) {
         m_needsExtraFlush = false;
         double nextFlush = max((1 / gFramesPerSecond) - (currentTime() - m_lastFlushTime), 0.0);