Title: [211800] releases/WebKitGTK/webkit-2.14/Source/WebKit2
- Revision
- 211800
- Author
- carlo...@webkit.org
- Date
- 2017-02-07 01:39:38 -0800 (Tue, 07 Feb 2017)
Log Message
Merge r211366 - Unreviewed. Fix GTK+ debug build after r211365.
Remove invalid assert.
* WebProcess/WebPage/AcceleratedDrawingArea.cpp:
(WebKit::AcceleratedDrawingArea::exitAcceleratedCompositingModeNow):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog (211799 => 211800)
--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog 2017-02-07 09:38:43 UTC (rev 211799)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog 2017-02-07 09:39:38 UTC (rev 211800)
@@ -1,3 +1,12 @@
+2017-01-30 Carlos Garcia Campos <cgar...@igalia.com>
+
+ Unreviewed. Fix GTK+ debug build after r211365.
+
+ Remove invalid assert.
+
+ * WebProcess/WebPage/AcceleratedDrawingArea.cpp:
+ (WebKit::AcceleratedDrawingArea::exitAcceleratedCompositingModeNow):
+
2017-01-27 Carlos Garcia Campos <cgar...@igalia.com>
[GTK] Stop forcing accelerated compositing by default
Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.cpp (211799 => 211800)
--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.cpp 2017-02-07 09:38:43 UTC (rev 211799)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.cpp 2017-02-07 09:39:38 UTC (rev 211800)
@@ -372,7 +372,6 @@
void AcceleratedDrawingArea::exitAcceleratedCompositingModeNow()
{
- ASSERT(!m_alwaysUseCompositing);
ASSERT(!m_layerTreeStateIsFrozen);
m_exitCompositingTimer.stop();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
