Title: [151377] releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk
- Revision
- 151377
- Author
- [email protected]
- Date
- 2013-06-10 03:44:21 -0700 (Mon, 10 Jun 2013)
Log Message
Merge r151198 - [GTK] Make precedence of logical operators explicit
https://bugs.webkit.org/show_bug.cgi?id=117216
Patch by Alberto Garcia <[email protected]> on 2013-06-04
Reviewed by Martin Robinson.
There's a couple of cases where we mix && and || in the same
_expression_. In ChromeClient::contentsSizeChanged() the lack of
parentheses actually makes the _expression_ wrong.
* WebCoreSupport/AcceleratedCompositingContextGL.cpp:
(WebKit::AcceleratedCompositingContext::renderLayersToWindow):
* WebCoreSupport/ChromeClientGtk.cpp:
(WebKit::ChromeClient::contentsSizeChanged):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/ChangeLog (151376 => 151377)
--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/ChangeLog 2013-06-10 10:30:05 UTC (rev 151376)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/ChangeLog 2013-06-10 10:44:21 UTC (rev 151377)
@@ -1,3 +1,19 @@
+2013-06-04 Alberto Garcia <[email protected]>
+
+ [GTK] Make precedence of logical operators explicit
+ https://bugs.webkit.org/show_bug.cgi?id=117216
+
+ Reviewed by Martin Robinson.
+
+ There's a couple of cases where we mix && and || in the same
+ _expression_. In ChromeClient::contentsSizeChanged() the lack of
+ parentheses actually makes the _expression_ wrong.
+
+ * WebCoreSupport/AcceleratedCompositingContextGL.cpp:
+ (WebKit::AcceleratedCompositingContext::renderLayersToWindow):
+ * WebCoreSupport/ChromeClientGtk.cpp:
+ (WebKit::ChromeClient::contentsSizeChanged):
+
2013-05-13 Carlos Garcia Campos <[email protected]>
Unreviewed. Update NEWS and Versions.m4 for 2.0.2 release.
Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp (151376 => 151377)
--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp 2013-06-10 10:30:05 UTC (rev 151376)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp 2013-06-10 10:44:21 UTC (rev 151377)
@@ -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);
Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp (151376 => 151377)
--- releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp 2013-06-10 10:30:05 UTC (rev 151376)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp 2013-06-10 10:44:21 UTC (rev 151377)
@@ -723,8 +723,8 @@
requisition = widget->requisition;
#endif
if (gtk_widget_get_realized(widget)
- && (requisition.height != size.height())
- || (requisition.width != size.width()))
+ && (requisition.height != size.height()
+ || requisition.width != size.width()))
gtk_widget_queue_resize_no_redraw(widget);
// If this was a main frame size change, update the scrollbars.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes