[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 3f1f5ce986c805613f390a7a771d68fa66566645
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 2 18:29:28 2011 +0000

    Conversion of right()/bottom() to maxX()/maxY() as part of the removal of those accessors.
    
    Reviewed by Darin Adler.
    
    * UIProcess/win/WebPopupMenuProxyWin.cpp:
    (WebKit::WebPopupMenuProxyWin::calculatePositionAndSize):
    * UIProcess/win/WebView.cpp:
    (WebKit::WebView::prepareCandidateWindow):
    * WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp:
    (WebKit::NetscapePlugin::platformGeometryDidChange):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77381 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 8903856..fd78ef0 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2011-02-02  David Hyatt  <hyatt at apple.com>
+
+        Reviewed by Darin Adler.
+
+        Conversion of right()/bottom() to maxX()/maxY() as part of the removal of those accessors.
+
+        * UIProcess/win/WebPopupMenuProxyWin.cpp:
+        (WebKit::WebPopupMenuProxyWin::calculatePositionAndSize):
+        * UIProcess/win/WebView.cpp:
+        (WebKit::WebView::prepareCandidateWindow):
+        * WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp:
+        (WebKit::NetscapePlugin::platformGeometryDidChange):
+
 2011-02-01  Darin Adler  <darin at apple.com>
 
         Reviewed by Anders Carlsson.
diff --git a/Source/WebKit2/UIProcess/win/WebPopupMenuProxyWin.cpp b/Source/WebKit2/UIProcess/win/WebPopupMenuProxyWin.cpp
index 18f8ade..b497e72 100644
--- a/Source/WebKit2/UIProcess/win/WebPopupMenuProxyWin.cpp
+++ b/Source/WebKit2/UIProcess/win/WebPopupMenuProxyWin.cpp
@@ -373,7 +373,7 @@ void WebPopupMenuProxyWin::calculatePositionAndSize(const IntRect& rect)
     // Always left-align items in the popup.  This matches popup menus on the mac.
     int popupX = rectInScreenCoords.x() + m_data.m_clientInsetLeft;
 
-    IntRect popupRect(popupX, rectInScreenCoords.bottom(), popupWidth, popupHeight);
+    IntRect popupRect(popupX, rectInScreenCoords.maxY(), popupWidth, popupHeight);
 
     // The popup needs to stay within the bounds of the screen and not overlap any toolbars
     HMONITOR monitor = ::MonitorFromWindow(m_webView->window(), MONITOR_DEFAULTTOPRIMARY);
@@ -383,7 +383,7 @@ void WebPopupMenuProxyWin::calculatePositionAndSize(const IntRect& rect)
     FloatRect screen = monitorInfo.rcWork;
 
     // 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 (rectInScreenCoords.y() - popupRect.height() < 0) {
             // The popup won't fit above, either, so place it whereever's bigger and resize it to fit
diff --git a/Source/WebKit2/UIProcess/win/WebView.cpp b/Source/WebKit2/UIProcess/win/WebView.cpp
index d399d8d..1815e5a 100644
--- a/Source/WebKit2/UIProcess/win/WebView.cpp
+++ b/Source/WebKit2/UIProcess/win/WebView.cpp
@@ -758,11 +758,11 @@ void WebView::prepareCandidateWindow(HIMC hInputContext)
     form.dwIndex = 0;
     form.dwStyle = CFS_EXCLUDE;
     form.ptCurrentPos.x = caret.x();
-    form.ptCurrentPos.y = caret.bottom();
+    form.ptCurrentPos.y = caret.maxY();
     form.rcArea.top = caret.y();
-    form.rcArea.bottom = caret.bottom();
+    form.rcArea.bottom = caret.maxY();
     form.rcArea.left = caret.x();
-    form.rcArea.right = caret.right();
+    form.rcArea.right = caret.maxX();
     Ime::ImmSetCandidateWindow(hInputContext, &form);
 }
 
diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp
index b91090a..e713f83 100644
--- a/Source/WebKit2/WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp
+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp
@@ -127,7 +127,7 @@ void NetscapePlugin::platformGeometryDidChange()
     IntRect clipRectInPluginWindowCoordinates = m_clipRect;
     clipRectInPluginWindowCoordinates.move(-m_frameRect.x(), -m_frameRect.y());
 
-    OwnPtr<HRGN> clipRegion = adoptPtr(::CreateRectRgn(clipRectInPluginWindowCoordinates.x(), clipRectInPluginWindowCoordinates.y(), clipRectInPluginWindowCoordinates.right(), clipRectInPluginWindowCoordinates.bottom()));
+    OwnPtr<HRGN> clipRegion = adoptPtr(::CreateRectRgn(clipRectInPluginWindowCoordinates.x(), clipRectInPluginWindowCoordinates.y(), clipRectInPluginWindowCoordinates.maxX(), clipRectInPluginWindowCoordinates.maxY()));
     setWindowRegion(m_window, clipRegion.release(), Redraw);
 
     // FIXME: We should only update the size here and let the UI process update our position so

-- 
WebKit Debian packaging