Changeset 211800 in webkit

Timestamp:

Feb 7, 2017 1:39:38 AM (7 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r211366 - Unreviewed. Fix GTK+ debug build after r211365.

Remove invalid assert.

• WebProcess/WebPage/AcceleratedDrawingArea.cpp:

(WebKit::AcceleratedDrawingArea::exitAcceleratedCompositingModeNow):

Location:

releases/WebKitGTK/webkit-2.14/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/AcceleratedDrawingArea.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-01-30  Carlos Garcia Campos  <cgarcia@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  <cgarcia@igalia.com>
 

releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.cpp

@@ -373 +373 @@
 void AcceleratedDrawingArea::exitAcceleratedCompositingModeNow()
 {
-    ASSERT(!m_alwaysUseCompositing);
     ASSERT(!m_layerTreeStateIsFrozen);