Title: [87834] trunk/Source/WebKit2
- Revision
- 87834
- Author
- [email protected]
- Date
- 2011-06-01 11:54:48 -0700 (Wed, 01 Jun 2011)
Log Message
Build fix after r87831
* UIProcess/win/WebView.cpp:
(WebKit::WebView::enterAcceleratedCompositingMode):
(WebKit::WebView::exitAcceleratedCompositingMode):
Added some HAVE(WKQCA) guards.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (87833 => 87834)
--- trunk/Source/WebKit2/ChangeLog 2011-06-01 18:44:12 UTC (rev 87833)
+++ trunk/Source/WebKit2/ChangeLog 2011-06-01 18:54:48 UTC (rev 87834)
@@ -1,5 +1,14 @@
2011-06-01 Adam Roben <[email protected]>
+ Build fix after r87831
+
+ * UIProcess/win/WebView.cpp:
+ (WebKit::WebView::enterAcceleratedCompositingMode):
+ (WebKit::WebView::exitAcceleratedCompositingMode):
+ Added some HAVE(WKQCA) guards.
+
+2011-06-01 Adam Roben <[email protected]>
+
Delete a bunch of dead code in DrawingAreaImpl
LayerTreeHost::participatesInDisplay always returns false now, which means a bunch of code
Modified: trunk/Source/WebKit2/UIProcess/win/WebView.cpp (87833 => 87834)
--- trunk/Source/WebKit2/UIProcess/win/WebView.cpp 2011-06-01 18:44:12 UTC (rev 87833)
+++ trunk/Source/WebKit2/UIProcess/win/WebView.cpp 2011-06-01 18:54:48 UTC (rev 87834)
@@ -1520,6 +1520,7 @@
void WebView::enterAcceleratedCompositingMode(const LayerTreeContext& context)
{
+#if HAVE(WKQCA)
ASSERT(!context.isEmpty());
m_layerHostWindow = context.window;
@@ -1527,16 +1528,23 @@
IntSize size = viewSize();
// Ensure the layer host window is behind all other child windows (since otherwise it would obscure them).
::SetWindowPos(m_layerHostWindow, HWND_BOTTOM, 0, 0, size.width(), size.height(), SWP_SHOWWINDOW | SWP_NOACTIVATE);
+#else
+ ASSERT_NOT_REACHED();
+#endif
}
void WebView::exitAcceleratedCompositingMode()
{
+#if HAVE(WKQCA)
ASSERT(m_layerHostWindow);
// Tell the WKCACFViewWindow to destroy itself. We can't call ::DestroyWindow directly because
// the window is owned by another thread.
::PostMessageW(m_layerHostWindow, WKCACFViewWindow::customDestroyMessage, 0, 0);
m_layerHostWindow = 0;
+#else
+ ASSERT_NOT_REACHED();
+#endif
}
#endif // USE(ACCELERATED_COMPOSITING)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
