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

[dglazkov at chromium.org]

The following commit has been merged in the webkit-1.3 branch:
commit 656e044a33402386e7c96453f36f08462aeb1716
Author: dglazkov at chromium.org <dglazkov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 2 19:58:07 2011 +0000

    2011-02-02  Dimitri Glazkov  <dglazkov at chromium.org>
    
            Reviewed by Dave Hyatt.
    
            Remove remaining references to right() and bottom() from Chromium build.
            https://bugs.webkit.org/show_bug.cgi?id=53613
    
            * src/DragScrollTimer.cpp:
            (WebKit::distanceToRect): Replaced right/bottom with maxX/maxY.
            * src/WebViewImpl.cpp:
            (WebKit::WebViewImpl::doPixelReadbackToCanvas): Ditto.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77395 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 11a37b7..04294db 100644
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2011-02-02  Dimitri Glazkov  <dglazkov at chromium.org>
+
+        Reviewed by Dave Hyatt.
+
+        Remove remaining references to right() and bottom() from Chromium build.
+        https://bugs.webkit.org/show_bug.cgi?id=53613
+
+        * src/DragScrollTimer.cpp:
+        (WebKit::distanceToRect): Replaced right/bottom with maxX/maxY.
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::doPixelReadbackToCanvas): Ditto.
+
 2011-02-01  Darin Fisher  <darin at chromium.org>
 
         Reviewed by Kenneth Russell.
diff --git a/Source/WebKit/chromium/src/DragScrollTimer.cpp b/Source/WebKit/chromium/src/DragScrollTimer.cpp
index 83b81b7..c994cd7 100644
--- a/Source/WebKit/chromium/src/DragScrollTimer.cpp
+++ b/Source/WebKit/chromium/src/DragScrollTimer.cpp
@@ -43,12 +43,12 @@ static IntSize distanceToRect(const IntPoint& point, const IntRect& rect)
     int dx = 0, dy = 0;
     if (point.x() < rect.x())
         dx = point.x() - rect.x();
-    else if (rect.right() < point.x())
-        dx = point.x() - rect.right();
+    else if (rect.maxX() < point.x())
+        dx = point.x() - rect.maxX();
     if (point.y() < rect.y())
         dy = point.y() - rect.y();
-    else if (rect.bottom() < point.y())
-        dy = point.y() - rect.bottom();
+    else if (rect.maxY() < point.y())
+        dy = point.y() - rect.maxY();
     return IntSize(dx, dy);
 }
 
diff --git a/Source/WebKit/chromium/src/WebViewImpl.cpp b/Source/WebKit/chromium/src/WebViewImpl.cpp
index af61700..406e7d6 100644
--- a/Source/WebKit/chromium/src/WebViewImpl.cpp
+++ b/Source/WebKit/chromium/src/WebViewImpl.cpp
@@ -1025,7 +1025,7 @@ void WebViewImpl::doPixelReadbackToCanvas(WebCanvas* canvas, const IntRect& rect
     notImplemented();
 #endif
     // Compute rect to sample from inverted GPU buffer.
-    IntRect invertRect(rect.x(), bitmapHeight - rect.bottom(), rect.width(), rect.height());
+    IntRect invertRect(rect.x(), bitmapHeight - rect.maxY(), rect.width(), rect.height());
 
     OwnPtr<ImageBuffer> imageBuffer(ImageBuffer::create(rect.size()));
     RefPtr<ByteArray> pixelArray(ByteArray::create(rect.width() * rect.height() * 4));

-- 
WebKit Debian packaging