[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 ef58d30cb911079edfad6cbfc49d3dee60357726
Author: dglazkov at chromium.org <dglazkov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 2 21:12:07 2011 +0000

    2011-02-02  Dimitri Glazkov  <dglazkov at chromium.org>
    
            Update more references to right() and bottom() in Chromium.
    
            * src/WebViewImpl.cpp:
            (WebKit::WebViewImpl::doPixelReadbackToCanvas): Replaced bottom/right with maxY/maxX.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77406 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 8f30bb7..2c15ccb 100644
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,5 +1,12 @@
 2011-02-02  Dimitri Glazkov  <dglazkov at chromium.org>
 
+        Update more references to right() and bottom() in Chromium.
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::doPixelReadbackToCanvas): Replaced bottom/right with maxY/maxX.
+
+2011-02-02  Dimitri Glazkov  <dglazkov at chromium.org>
+
         Update more references to right() and bottom() in Chromium Win.
 
         * tests/TransparencyWinTest.cpp:
diff --git a/Source/WebKit/chromium/src/WebViewImpl.cpp b/Source/WebKit/chromium/src/WebViewImpl.cpp
index 406e7d6..0b21f5f 100644
--- a/Source/WebKit/chromium/src/WebViewImpl.cpp
+++ b/Source/WebKit/chromium/src/WebViewImpl.cpp
@@ -1009,8 +1009,8 @@ void WebViewImpl::layout()
 #if USE(ACCELERATED_COMPOSITING)
 void WebViewImpl::doPixelReadbackToCanvas(WebCanvas* canvas, const IntRect& rect)
 {
-    ASSERT(rect.right() <= m_layerRenderer->rootLayerTextureSize().width()
-           && rect.bottom() <= m_layerRenderer->rootLayerTextureSize().height());
+    ASSERT(rect.maxX() <= m_layerRenderer->rootLayerTextureSize().width()
+           && rect.maxY() <= m_layerRenderer->rootLayerTextureSize().height());
 
 #if PLATFORM(SKIA)
     PlatformContextSkia context(canvas);

-- 
WebKit Debian packaging