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

[hyatt at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit 8d5a334099aadf5390d3f67b7378dfcb07fa25b6
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 2 18:35:41 2011 +0000

    More conversion from right()/bottom() to maxX()/maxY().
    
    Reviewed by Darin Adler.
    
    * platform/win/PopupMenuWin.cpp:
    (WebCore::PopupMenuWin::calculatePositionAndSize):
    (WebCore::PopupMenuWin::paint):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77385 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index b2af3c6..0fe849a 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -2,6 +2,16 @@
 
         Reviewed by Darin Adler.
 
+        More conversion from right()/bottom() to maxX()/maxY().
+
+        * platform/win/PopupMenuWin.cpp:
+        (WebCore::PopupMenuWin::calculatePositionAndSize):
+        (WebCore::PopupMenuWin::paint):
+
+2011-02-02  David Hyatt  <hyatt at apple.com>
+
+        Reviewed by Darin Adler.
+
         Removal of right()/bottom().  Replace with maxX() and maxY().  Still converting.  Haven't removed yet.
 
         * platform/chromium/PopupMenuChromium.cpp:
diff --git a/Source/WebCore/platform/win/PopupMenuWin.cpp b/Source/WebCore/platform/win/PopupMenuWin.cpp
index 322afb1..9c9388a 100644
--- a/Source/WebCore/platform/win/PopupMenuWin.cpp
+++ b/Source/WebCore/platform/win/PopupMenuWin.cpp
@@ -347,13 +347,13 @@ void PopupMenuWin::calculatePositionAndSize(const IntRect& r, FrameView* v)
     // Always left-align items in the popup.  This matches popup menus on the mac.
     int popupX = rScreenCoords.x() + client()->clientInsetLeft();
 
-    IntRect popupRect(popupX, rScreenCoords.bottom(), popupWidth, popupHeight);
+    IntRect popupRect(popupX, rScreenCoords.maxY(), popupWidth, popupHeight);
 
     // The popup needs to stay within the bounds of the screen and not overlap any toolbars
     FloatRect screen = screenAvailableRect(v);
 
     // Check that we don't go off the screen vertically
-    if (popupRect.bottom() > screen.height()) {
+    if (popupRect.maxY() > screen.height()) {
         // The popup will go off the screen, so try placing it above the client
         if (rScreenCoords.y() - popupRect.height() < 0) {
             // The popup won't fit above, either, so place it whereever's bigger and resize it to fit
@@ -602,7 +602,7 @@ void PopupMenuWin::paint(const IntRect& damageRect, HDC hdc)
     IntRect listRect = damageRect;
     listRect.move(IntSize(0, m_scrollOffset * m_itemHeight));
 
-    for (int y = listRect.y(); y < listRect.bottom(); y += m_itemHeight) {
+    for (int y = listRect.y(); y < listRect.maxY(); y += m_itemHeight) {
         int index = y / m_itemHeight;
 
         Color optionBackgroundColor, optionTextColor;

-- 
WebKit Debian packaging