[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[rniwa at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 4d871287fc6c152da0523699f5363d4647c10904
Author: rniwa at webkit.org <rniwa at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 1 03:19:32 2010 +0000

    2010-11-30  Ryosuke Niwa  <rniwa at webkit.org>
    
            Unreviewed speculative build fix for Windows.
    
            * UIProcess/win/WebView.cpp:
            (WebKit::WebView::pageDidEnterAcceleratedCompositing):
            (WebKit::WebView::pageDidLeaveAcceleratedCompositing):
            (WebKit::WebView::switchToDrawingAreaTypeIfNecessary):
            * UIProcess/win/WebView.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73004 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index b31ed68..1382c43 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-30  Ryosuke Niwa  <rniwa at webkit.org>
+
+        Unreviewed speculative build fix for Windows.
+
+        * UIProcess/win/WebView.cpp:
+        (WebKit::WebView::pageDidEnterAcceleratedCompositing):
+        (WebKit::WebView::pageDidLeaveAcceleratedCompositing):
+        (WebKit::WebView::switchToDrawingAreaTypeIfNecessary):
+        * UIProcess/win/WebView.h:
+
 2010-11-30  Anders Carlsson  <andersca at apple.com>
 
         Fix Qt build.
diff --git a/WebKit2/UIProcess/win/WebView.cpp b/WebKit2/UIProcess/win/WebView.cpp
index fa6d37c..91d7433 100644
--- a/WebKit2/UIProcess/win/WebView.cpp
+++ b/WebKit2/UIProcess/win/WebView.cpp
@@ -652,15 +652,15 @@ void WebView::setIsInWindow(bool isInWindow)
 
 void WebView::pageDidEnterAcceleratedCompositing()
 {
-    switchToDrawingAreaTypeIfNecessary(DrawingAreaProxy::LayerBackedDrawingAreaType);
+    switchToDrawingAreaTypeIfNecessary(DrawingAreaBase::LayerBackedDrawingAreaType);
 }
 
 void WebView::pageDidLeaveAcceleratedCompositing()
 {
-    switchToDrawingAreaTypeIfNecessary(DrawingAreaProxy::ChunkedUpdateDrawingAreaType);
+    switchToDrawingAreaTypeIfNecessary(DrawingAreaBase::ChunkedUpdateDrawingAreaType);
 }
 
-void WebView::switchToDrawingAreaTypeIfNecessary(DrawingAreaProxy::Type type)
+void WebView::switchToDrawingAreaTypeIfNecessary(DrawingAreaBase::Type type)
 {
     DrawingAreaBase::Type existingDrawingAreaType = m_page->drawingArea() ? m_page->drawingArea()->info().type : DrawingAreaBase::None;
     if (existingDrawingAreaType == type)
@@ -668,13 +668,13 @@ void WebView::switchToDrawingAreaTypeIfNecessary(DrawingAreaProxy::Type type)
 
     OwnPtr<DrawingAreaProxy> newDrawingArea;
     switch (type) {
-        case DrawingAreaProxy::None:
+        case DrawingAreaBase::None:
             break;
-        case DrawingAreaProxy::ChunkedUpdateDrawingAreaType: {
+        case DrawingAreaBase::ChunkedUpdateDrawingAreaType: {
             newDrawingArea = ChunkedUpdateDrawingAreaProxy::create(this);
             break;
         }
-        case DrawingAreaProxy::LayerBackedDrawingAreaType: {
+        case DrawingAreaBase::LayerBackedDrawingAreaType: {
             newDrawingArea = LayerBackedDrawingAreaProxy::create(this);
             break;
         }
diff --git a/WebKit2/UIProcess/win/WebView.h b/WebKit2/UIProcess/win/WebView.h
index ca76779..d4b57de 100644
--- a/WebKit2/UIProcess/win/WebView.h
+++ b/WebKit2/UIProcess/win/WebView.h
@@ -118,7 +118,7 @@ private:
 #if USE(ACCELERATED_COMPOSITING)
     virtual void pageDidEnterAcceleratedCompositing();
     virtual void pageDidLeaveAcceleratedCompositing();
-    void switchToDrawingAreaTypeIfNecessary(DrawingAreaProxy::Type);
+    void switchToDrawingAreaTypeIfNecessary(DrawingAreaBase::Type);
 #endif
 
     virtual HWND nativeWindow();

-- 
WebKit Debian packaging