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

[andersca at apple.com]

The following commit has been merged in the debian/experimental branch:
commit ef10ab1bb861f72ffcc000e096ba6b8e33384582
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 1 02:20:09 2010 +0000

    Fix Qt build.
    
    * UIProcess/API/qt/qgraphicswkview.cpp:
    (QGraphicsWKView::takeSnapshot):
    (QGraphicsWKViewPrivate::commitScale):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72998 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 4e9e6d8..b31ed68 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,13 @@
 2010-11-30  Anders Carlsson  <andersca at apple.com>
 
+        Fix Qt build.
+
+        * UIProcess/API/qt/qgraphicswkview.cpp:
+        (QGraphicsWKView::takeSnapshot):
+        (QGraphicsWKViewPrivate::commitScale):
+
+2010-11-30  Anders Carlsson  <andersca at apple.com>
+
         Reviewed by Sam Weinig.
 
         Change DrawingArea and DrawingAreaProxy to not inherit from DrawingAreaBase
diff --git a/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp b/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp
index 664b914..ddd2b27 100644
--- a/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp
+++ b/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp
@@ -326,7 +326,7 @@ void QGraphicsWKView::takeSnapshot(const QSize& size, const QRect& contentsRect)
 {
 #if ENABLE(TILED_BACKING_STORE)
     DrawingAreaProxy* drawingArea = page()->d->page->drawingArea();
-    if (drawingArea->info().type != DrawingAreaProxy::TiledDrawingAreaType)
+    if (drawingArea->info().type != DrawingAreaBase::TiledDrawingAreaType)
         return;
     TiledDrawingAreaProxy* tiledDrawingArea = static_cast<TiledDrawingAreaProxy*>(drawingArea);
     tiledDrawingArea->takeSnapshot(size, contentsRect);
@@ -386,7 +386,7 @@ void QGraphicsWKViewPrivate::commitScale()
 #if ENABLE(TILED_BACKING_STORE)
     DrawingAreaProxy* drawingArea = page->d->page->drawingArea();
     float newScale = q->scale();
-    if (drawingArea->info().type == DrawingAreaProxy::TiledDrawingAreaType) {
+    if (drawingArea->info().type == DrawingAreaBase::TiledDrawingAreaType) {
         TiledDrawingAreaProxy* tiledDrawingArea = static_cast<TiledDrawingAreaProxy*>(drawingArea);
         if (tiledDrawingArea->contentsScale() == newScale)
             return;

-- 
WebKit Debian packaging