[webkit-changes] [88858] branches/safari-534-branch/Source/WebKit2

[lforschler]

Title: [88858] branches/safari-534-branch/Source/WebKit2

Revision

88858

Author

lforsch...@apple.com

Date

2011-06-14 15:54:04 -0700 (Tue, 14 Jun 2011)

Log Message

Merge r87834.

Modified Paths

branches/safari-534-branch/Source/WebKit2/ChangeLog
branches/safari-534-branch/Source/WebKit2/UIProcess/win/WebView.cpp

Diff

Modified: branches/safari-534-branch/Source/WebKit2/ChangeLog (88857 => 88858)

--- branches/safari-534-branch/Source/WebKit2/ChangeLog	2011-06-14 22:23:36 UTC (rev 88857)
+++ branches/safari-534-branch/Source/WebKit2/ChangeLog	2011-06-14 22:54:04 UTC (rev 88858)
@@ -1,5 +1,17 @@
 2011-06-14  Lucas Forschler  <lforsch...@apple.com>
 
+    Merged 87834.
+
+    2011-06-14  Lucas Forschler  <lforsch...@apple.com>
+
+        Build fix after r87831
+
+        * UIProcess/win/WebView.cpp:
+        (WebKit::WebView::enterAcceleratedCompositingMode):
+        (WebKit::WebView::exitAcceleratedCompositingMode):
+        Added some HAVE(WKQCA) guards.
+        2011-06-14  Lucas Forschler  <lforsch...@apple.com>
+
     Merged 87831.
 
     2011-06-01  Adam Roben  <aro...@apple.com>

Modified: branches/safari-534-branch/Source/WebKit2/UIProcess/win/WebView.cpp (88857 => 88858)

--- branches/safari-534-branch/Source/WebKit2/UIProcess/win/WebView.cpp	2011-06-14 22:23:36 UTC (rev 88857)
+++ branches/safari-534-branch/Source/WebKit2/UIProcess/win/WebView.cpp	2011-06-14 22:54:04 UTC (rev 88858)
@@ -1538,6 +1538,7 @@
 
 void WebView::enterAcceleratedCompositingMode(const LayerTreeContext& context)
 {
+#if HAVE(WKQCA)
     ASSERT(!context.isEmpty());
 
     m_layerHostWindow = context.window;
@@ -1545,16 +1546,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
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes