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

[paroga at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 7ed0c94a775f77384929580bd6cda8eeb6f00e10
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Sep 18 13:55:03 2010 +0000

    2010-09-18  Patrick Gansterer  <paroga at paroga.com>
    
            Unreviewed.
    
            [WINCE] Buildfix for FrameWince.cpp after r51353, r67762 and r67771.
    
            * page/wince/FrameWince.cpp:
            (WebCore::computePageRectsForFrame):
            (WebCore::imageFromSelection):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67779 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d2d783e..869b3c4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-18  Patrick Gansterer  <paroga at paroga.com>
+
+        Unreviewed.
+
+        [WINCE] Buildfix for FrameWince.cpp after r51353, r67762 and r67771.
+
+        * page/wince/FrameWince.cpp:
+        (WebCore::computePageRectsForFrame):
+        (WebCore::imageFromSelection):
+
 2010-09-18  Kent Tamura  <tkent at chromium.org>
 
         Unreviewed, a trivial change.
diff --git a/WebCore/page/wince/FrameWince.cpp b/WebCore/page/wince/FrameWince.cpp
index ba51cb6..dfea864 100644
--- a/WebCore/page/wince/FrameWince.cpp
+++ b/WebCore/page/wince/FrameWince.cpp
@@ -96,7 +96,7 @@ void computePageRectsForFrame(Frame* frame, const IntRect& printRect, float head
     float printedPagesHeight = 0.0;
     do {
         float proposedBottom = min(docHeight, printedPagesHeight + pageHeight);
-        frame->view()->adjustPageHeight(&proposedBottom, printedPagesHeight, proposedBottom, printedPagesHeight);
+        frame->view()->adjustPageHeightDeprecated(&proposedBottom, printedPagesHeight, proposedBottom, printedPagesHeight);
         currPageHeight = max(1.0f, proposedBottom - printedPagesHeight);
 
         pages.append(IntRect(0, printedPagesHeight, currPageWidth, currPageHeight));
@@ -109,7 +109,7 @@ HBITMAP imageFromSelection(Frame* frame, bool forceBlackText)
     if (!frame->view())
         return 0;
 
-    frame->view()->setPaintRestriction(forceBlackText ? PaintRestrictionSelectionOnlyBlackText : PaintRestrictionSelectionOnly);
+    frame->view()->setPaintBehavior(PaintBehaviorSelectionOnly | (forceBlackText ? PaintBehaviorForceBlackText : 0));
     FloatRect fr = frame->selection()->bounds();
     IntRect ir((int)fr.x(), (int)fr.y(), (int)fr.width(), (int)fr.height());
     if (ir.isEmpty())
@@ -120,8 +120,8 @@ HBITMAP imageFromSelection(Frame* frame, bool forceBlackText)
     FrameView* view = frame->view();
     if (view->parent()) {
         ir.setLocation(view->parent()->convertChildToSelf(view, ir.location()));
-        w = ir.width() * view->zoomFactor() + 0.5;
-        h = ir.height() * view->zoomFactor() + 0.5;
+        w = ir.width() * frame->pageZoomFactor() + 0.5;
+        h = ir.height() * frame->pageZoomFactor() + 0.5;
     } else {
         ir = view->contentsToWindow(ir);
         w = ir.width();
@@ -143,7 +143,7 @@ HBITMAP imageFromSelection(Frame* frame, bool forceBlackText)
 
     SelectObject(bmpDC.get(), hbmpOld);
 
-    frame->view()->setPaintRestriction(PaintRestrictionNone);
+    frame->view()->setPaintBehavior(PaintBehaviorNormal);
 
     return hBmp;
 }

-- 
WebKit Debian packaging