Title: [151379] releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk
Revision
151379
Author
[email protected]
Date
2013-06-10 04:10:53 -0700 (Mon, 10 Jun 2013)

Log Message

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

Patch by Alberto Garcia <[email protected]> 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):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/ChangeLog (151378 => 151379)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/ChangeLog	2013-06-10 11:05:43 UTC (rev 151378)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/ChangeLog	2013-06-10 11:10:53 UTC (rev 151379)
@@ -1,3 +1,16 @@
+2013-06-05  Alberto Garcia  <[email protected]>
+
+        [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  <[email protected]>
 
         [GTK] Make precedence of logical operators explicit

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp (151378 => 151379)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp	2013-06-10 11:05:43 UTC (rev 151378)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp	2013-06-10 11:10:53 UTC (rev 151379)
@@ -149,7 +149,7 @@
     cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
     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);
         m_layerFlushTimerCallbackId = g_timeout_add_full(GDK_PRIORITY_EVENTS, 1000 * nextFlush, reinterpret_cast<GSourceFunc>(layerFlushTimerFiredCallback), this, 0);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to