Title: [151245] trunk/Source/WebKit/gtk
- Revision
- 151245
- Author
- [email protected]
- Date
- 2013-06-05 15:43:00 -0700 (Wed, 05 Jun 2013)
Log Message
[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: trunk/Source/WebKit/gtk/ChangeLog (151244 => 151245)
--- trunk/Source/WebKit/gtk/ChangeLog 2013-06-05 22:24:29 UTC (rev 151244)
+++ trunk/Source/WebKit/gtk/ChangeLog 2013-06-05 22:43:00 UTC (rev 151245)
@@ -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: trunk/Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp (151244 => 151245)
--- trunk/Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp 2013-06-05 22:24:29 UTC (rev 151244)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp 2013-06-05 22:43:00 UTC (rev 151245)
@@ -156,7 +156,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
