[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 1543444af348fce1acbb32b36158f1373f69706c
Author: dglazkov at chromium.org <dglazkov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 2 20:54:03 2011 +0000

    2011-02-02  Dimitri Glazkov  <dglazkov at chromium.org>
    
            Update more references to right() and bottom() in Chromium Win.
    
            * platform/graphics/chromium/TransparencyWin.cpp:
            (WebCore::TransparencyWin::compositeOpaqueComposite): Replaced bottom/right with maxY/maxX.
            (WebCore::TransparencyWin::compositeTextComposite): Ditto.
            * rendering/RenderThemeChromiumWin.cpp:
            (WebCore::RenderThemeChromiumWin::paintMenuList): Ditto.
    2011-02-02  Dimitri Glazkov  <dglazkov at chromium.org>
    
            Update more references to right() and bottom() in Chromium Win.
    
            * tests/TransparencyWinTest.cpp:
            (WebCore::TEST): Replaced bottom/right with maxY/maxX.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77402 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 036dd56..6cc8dcf 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2011-02-02  Dimitri Glazkov  <dglazkov at chromium.org>
+
+        Update more references to right() and bottom() in Chromium Win.
+
+        * platform/graphics/chromium/TransparencyWin.cpp:
+        (WebCore::TransparencyWin::compositeOpaqueComposite): Replaced bottom/right with maxY/maxX.
+        (WebCore::TransparencyWin::compositeTextComposite): Ditto.
+        * rendering/RenderThemeChromiumWin.cpp:
+        (WebCore::RenderThemeChromiumWin::paintMenuList): Ditto.
+
 2011-02-02  Adam Roben  <aroben at apple.com>
 
         Encode/decode FormData and FormDataElement objects consistently
diff --git a/Source/WebCore/platform/graphics/chromium/TransparencyWin.cpp b/Source/WebCore/platform/graphics/chromium/TransparencyWin.cpp
index ba66eae..193271d 100644
--- a/Source/WebCore/platform/graphics/chromium/TransparencyWin.cpp
+++ b/Source/WebCore/platform/graphics/chromium/TransparencyWin.cpp
@@ -446,9 +446,9 @@ void TransparencyWin::compositeOpaqueComposite()
         identity.reset();
         destCanvas->setMatrix(identity);
 
-        destRect.set(m_transformedSourceRect.x(), m_transformedSourceRect.y(), m_transformedSourceRect.right(), m_transformedSourceRect.bottom());
+        destRect.set(m_transformedSourceRect.x(), m_transformedSourceRect.y(), m_transformedSourceRect.maxX(), m_transformedSourceRect.maxY());
     } else
-        destRect.set(m_sourceRect.x(), m_sourceRect.y(), m_sourceRect.right(), m_sourceRect.bottom());
+        destRect.set(m_sourceRect.x(), m_sourceRect.y(), m_sourceRect.maxX(), m_sourceRect.maxY());
 
     SkPaint paint;
     paint.setFilterBitmap(true);
@@ -487,7 +487,7 @@ void TransparencyWin::compositeTextComposite()
     SkMatrix identity;
     identity.reset();
     destCanvas->setMatrix(identity);
-    SkRect destRect = { m_transformedSourceRect.x(), m_transformedSourceRect.y(), m_transformedSourceRect.right(), m_transformedSourceRect.bottom() };
+    SkRect destRect = { m_transformedSourceRect.x(), m_transformedSourceRect.y(), m_transformedSourceRect.maxX(), m_transformedSourceRect.maxY() };
 
     // Note that we need to specify the source layer subset, since the bitmap
     // may have been cached and it could be larger than what we're using.
diff --git a/Source/WebCore/rendering/RenderThemeChromiumWin.cpp b/Source/WebCore/rendering/RenderThemeChromiumWin.cpp
index bba0520..d538050 100644
--- a/Source/WebCore/rendering/RenderThemeChromiumWin.cpp
+++ b/Source/WebCore/rendering/RenderThemeChromiumWin.cpp
@@ -479,15 +479,15 @@ bool RenderThemeChromiumWin::paintMenuList(RenderObject* o, const PaintInfo& i,
     int spacingBottom = borderBottom + box->paddingBottom();
 
     int buttonX;
-    if (r.right() - r.x() < buttonWidth)
+    if (r.maxX() - r.x() < buttonWidth)
         buttonX = r.x();
     else
-        buttonX = o->style()->direction() == LTR ? r.right() - spacingRight - buttonWidth : r.x() + spacingLeft;
+        buttonX = o->style()->direction() == LTR ? r.maxX() - spacingRight - buttonWidth : r.x() + spacingLeft;
 
     // Compute the rectangle of the button in the destination image.
     IntRect rect(buttonX,
                  r.y() + spacingTop,
-                 std::min(buttonWidth, r.right() - r.x()),
+                 std::min(buttonWidth, r.maxX() - r.x()),
                  r.height() - (spacingTop + spacingBottom));
 
     // Get the correct theme data for a textfield and paint the menu.
diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 0457659..8f30bb7 100644
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,10 @@
+2011-02-02  Dimitri Glazkov  <dglazkov at chromium.org>
+
+        Update more references to right() and bottom() in Chromium Win.
+
+        * tests/TransparencyWinTest.cpp:
+        (WebCore::TEST): Replaced bottom/right with maxY/maxX.
+
 2011-02-02  Matthew Vosburgh  <maf at chromium.org>
 
         Reviewed by Kenneth Russell.
diff --git a/Source/WebKit/chromium/tests/TransparencyWinTest.cpp b/Source/WebKit/chromium/tests/TransparencyWinTest.cpp
index ed7f12f..ee3307f 100644
--- a/Source/WebKit/chromium/tests/TransparencyWinTest.cpp
+++ b/Source/WebKit/chromium/tests/TransparencyWinTest.cpp
@@ -552,8 +552,8 @@ TEST(TransparencyWin, Scale)
         EXPECT_TRUE(helper.context()->getCTM().isIdentity());
         EXPECT_EQ(2, helper.drawRect().x());
         EXPECT_EQ(2, helper.drawRect().y());
-        EXPECT_EQ(8, helper.drawRect().right());
-        EXPECT_EQ(8, helper.drawRect().bottom());
+        EXPECT_EQ(8, helper.drawRect().maxX());
+        EXPECT_EQ(8, helper.drawRect().maxY());
 
         // Set the pixel at (2, 2) to be transparent. This should be fixed when
         // the helper goes out of scope. We don't want to call

-- 
WebKit Debian packaging