2010-07-21 Simon Fraser <simon.fraser@apple.com>

smfr · smfr · commit 7680ba99e876 · 2010-07-21T19:27:29.000Z
Windows build fix. Need to supply implementations of PageClient::pageDidEnterAcceleratedCompositing() and pageDidLeaveAcceleratedCompositing() for WebView on Windows. * UIProcess/win/WebView.cpp: (WebKit::WebView::pageDidEnterAcceleratedCompositing): (WebKit::WebView::pageDidLeaveAcceleratedCompositing): * UIProcess/win/WebView.h: Canonical link: https://commits.webkit.org/54685@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@63848 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-21  Simon Fraser  <simon.fraser@apple.com>
+
+        Windows build fix.
+
+        Need to supply implementations of PageClient::pageDidEnterAcceleratedCompositing()
+        and pageDidLeaveAcceleratedCompositing() for WebView on Windows.
+
+        * UIProcess/win/WebView.cpp:
+        (WebKit::WebView::pageDidEnterAcceleratedCompositing):
+        (WebKit::WebView::pageDidLeaveAcceleratedCompositing):
+        * UIProcess/win/WebView.h:
+
 2010-07-21  Anders Carlsson  <andersca@apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKit2/UIProcess/win/WebView.cpp b/WebKit2/UIProcess/win/WebView.cpp
@@ -553,6 +553,16 @@ void WebView::setCursor(const WebCore::Cursor& cursor)
     ::SetCursor(platformCursor);
 }
 
+#if USE(ACCELERATED_COMPOSITING)
+void WebView::pageDidEnterAcceleratedCompositing()
+{
+}
+
+void WebView::pageDidLeaveAcceleratedCompositing()
+{
+}
+#endif // USE(ACCELERATED_COMPOSITING)
+
 // WebCore::WindowMessageListener
 
 void WebView::windowReceivedMessage(HWND, UINT message, WPARAM wParam, LPARAM)
diff --git a/WebKit2/UIProcess/win/WebView.h b/WebKit2/UIProcess/win/WebView.h
@@ -95,6 +95,10 @@ class WebView : public RefCounted<WebView>, public PageClient, WebCore::WindowMe
     virtual void takeFocus(bool direction);
     virtual void toolTipChanged(const WebCore::String&, const WebCore::String&);
     virtual void setCursor(const WebCore::Cursor&);
+#if USE(ACCELERATED_COMPOSITING)
+    virtual void pageDidEnterAcceleratedCompositing();
+    virtual void pageDidLeaveAcceleratedCompositing();
+#endif
 
     // WebCore::WindowMessageListener
     virtual void windowReceivedMessage(HWND, UINT message, WPARAM, LPARAM);
