Title: [212097] trunk/Source/WebKit2
- Revision
- 212097
- Author
- carlo...@webkit.org
- Date
- 2017-02-10 00:26:45 -0800 (Fri, 10 Feb 2017)
Log Message
Unreviewed. Fix GTK+ build with threaded compositor disabled.
* WebProcess/WebPage/AcceleratedDrawingArea.cpp:
(WebKit::AcceleratedDrawingArea::enterAcceleratedCompositingMode):
(WebKit::AcceleratedDrawingArea::exitAcceleratedCompositingModeNow):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (212096 => 212097)
--- trunk/Source/WebKit2/ChangeLog 2017-02-10 08:16:28 UTC (rev 212096)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-10 08:26:45 UTC (rev 212097)
@@ -1,3 +1,11 @@
+2017-02-09 Carlos Garcia Campos <cgar...@igalia.com>
+
+ Unreviewed. Fix GTK+ build with threaded compositor disabled.
+
+ * WebProcess/WebPage/AcceleratedDrawingArea.cpp:
+ (WebKit::AcceleratedDrawingArea::enterAcceleratedCompositingMode):
+ (WebKit::AcceleratedDrawingArea::exitAcceleratedCompositingModeNow):
+
2017-02-09 Alex Christensen <achristen...@webkit.org>
Unreviewed, rolling out r212040.
Modified: trunk/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.cpp (212096 => 212097)
--- trunk/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.cpp 2017-02-10 08:16:28 UTC (rev 212096)
+++ trunk/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.cpp 2017-02-10 08:26:45 UTC (rev 212097)
@@ -334,6 +334,7 @@
ASSERT(!m_layerTreeHost);
if (m_previousLayerTreeHost) {
+#if USE(COORDINATED_GRAPHICS)
m_layerTreeHost = WTFMove(m_previousLayerTreeHost);
m_layerTreeHost->setIsDiscardable(false);
if (!m_isPaintingSuspended)
@@ -340,6 +341,9 @@
m_layerTreeHost->resumeRendering();
if (!m_layerTreeStateIsFrozen)
m_layerTreeHost->setLayerFlushSchedulingEnabled(true);
+#else
+ ASSERT_NOT_REACHED();
+#endif
} else {
m_layerTreeHost = LayerTreeHost::create(m_webPage);
@@ -377,6 +381,7 @@
m_exitCompositingTimer.stop();
m_wantsToExitAcceleratedCompositingMode = false;
+#if USE(COORDINATED_GRAPHICS)
ASSERT(m_layerTreeHost);
m_previousLayerTreeHost = WTFMove(m_layerTreeHost);
m_previousLayerTreeHost->setIsDiscardable(true);
@@ -383,6 +388,9 @@
m_previousLayerTreeHost->pauseRendering();
m_previousLayerTreeHost->setLayerFlushSchedulingEnabled(false);
m_discardPreviousLayerTreeHostTimer.startOneShot(5);
+#else
+ m_layerTreeHost = nullptr;
+#endif
}
void AcceleratedDrawingArea::discardPreviousLayerTreeHost()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
