[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[andersca at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit 2ce66ab6f5712a9eebc2ff50ade254cf6c7d277a
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 2 01:11:14 2011 +0000

    Fix Windows build.
    
    * UIProcess/win/WebView.cpp:
    (WebKit::WebView::enterAcceleratedCompositingMode):
    (WebKit::WebView::exitAcceleratedCompositingMode):
    * UIProcess/win/WebView.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77339 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 08b270b..403f90d 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,5 +1,14 @@
 2011-02-01  Anders Carlsson  <andersca at apple.com>
 
+        Fix Windows build.
+
+        * UIProcess/win/WebView.cpp:
+        (WebKit::WebView::enterAcceleratedCompositingMode):
+        (WebKit::WebView::exitAcceleratedCompositingMode):
+        * UIProcess/win/WebView.h:
+
+2011-02-01  Anders Carlsson  <andersca at apple.com>
+
         Reviewed by Dan Bernstein.
 
         Add a layer backed NSView for accelerated content
diff --git a/Source/WebKit2/UIProcess/win/WebView.cpp b/Source/WebKit2/UIProcess/win/WebView.cpp
index ff8d219..d399d8d 100644
--- a/Source/WebKit2/UIProcess/win/WebView.cpp
+++ b/Source/WebKit2/UIProcess/win/WebView.cpp
@@ -1093,6 +1093,16 @@ void WebView::setIsInWindow(bool isInWindow)
 
 #if USE(ACCELERATED_COMPOSITING)
 
+void WebView::enterAcceleratedCompositingMode(const LayerTreeContext&)
+{
+    // FIXME: Implement.
+}
+
+void WebView::exitAcceleratedCompositingMode()
+{
+    // FIXME: Implement.
+}
+
 void WebView::pageDidEnterAcceleratedCompositing()
 {
     switchToDrawingAreaTypeIfNecessary(DrawingAreaInfo::LayerBacked);
diff --git a/Source/WebKit2/UIProcess/win/WebView.h b/Source/WebKit2/UIProcess/win/WebView.h
index 70e6e7c..d000271 100644
--- a/Source/WebKit2/UIProcess/win/WebView.h
+++ b/Source/WebKit2/UIProcess/win/WebView.h
@@ -156,6 +156,9 @@ private:
     virtual void setFindIndicator(PassRefPtr<FindIndicator>, bool fadeOut);
 
 #if USE(ACCELERATED_COMPOSITING)
+    virtual void enterAcceleratedCompositingMode(const LayerTreeContext&);
+    virtual void exitAcceleratedCompositingMode();
+
     virtual void pageDidEnterAcceleratedCompositing();
     virtual void pageDidLeaveAcceleratedCompositing();
     void switchToDrawingAreaTypeIfNecessary(DrawingAreaInfo::Type);

-- 
WebKit Debian packaging