[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
hyatt at apple.com
hyatt at apple.com
Mon Feb 21 00:38:05 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 0625f6ddcad48340137831fef852402e2342c19a
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Feb 2 18:30:27 2011 +0000
Removal of right()/bottom(), converting to maxX()/maxY().
Reviewed by Darin Adler.
../WebKit/gtk:
* webkit/webkitwebview.cpp:
(webkit_web_view_popup_menu_handler):
../WebKit/win:
* DOMHTMLClasses.cpp:
(DOMHTMLInputElement::rectOnScreen):
* WebCoreSupport/EmbeddedWidget.cpp:
(EmbeddedWidget::frameRectsChanged):
* WebFrame.cpp:
(WebFrame::computePageRects):
* WebScrollBar.cpp:
(WebScrollBar::frameRect):
* WebView.cpp:
(WebView::addToDirtyRegion):
(WebView::visibleContentRect):
(WebView::prepareCandidateWindow):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77382 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit/gtk/ChangeLog b/Source/WebKit/gtk/ChangeLog
index 0e5debc..4b79988 100644
--- a/Source/WebKit/gtk/ChangeLog
+++ b/Source/WebKit/gtk/ChangeLog
@@ -1,3 +1,12 @@
+2011-02-02 David Hyatt <hyatt at apple.com>
+
+ Reviewed by Darin Adler.
+
+ Removal of right()/bottom(), converting to maxX()/maxY().
+
+ * webkit/webkitwebview.cpp:
+ (webkit_web_view_popup_menu_handler):
+
2011-02-01 Mario Sanchez Prada <msanchez at igalia.com>
Reviewed by Martin Robinson.
diff --git a/Source/WebKit/gtk/webkit/webkitwebview.cpp b/Source/WebKit/gtk/webkit/webkitwebview.cpp
index 4ff1582..91588a6 100644
--- a/Source/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/Source/WebKit/gtk/webkit/webkitwebview.cpp
@@ -402,7 +402,7 @@ static gboolean webkit_web_view_popup_menu_handler(GtkWidget* widget)
// If there's a focused elment, use its location.
if (Node* focusedNode = getFocusedNode(frame)) {
IntRect focusedNodeRect = focusedNode->getRect();
- location = IntPoint(rightAligned ? focusedNodeRect.right() : focusedNodeRect.x(), focusedNodeRect.bottom());
+ location = IntPoint(rightAligned ? focusedNodeRect.maxX() : focusedNodeRect.x(), focusedNodeRect.maxY());
} else
location = IntPoint(rightAligned ? view->contentsWidth() - contextMenuMargin : contextMenuMargin, contextMenuMargin);
} else {
@@ -440,7 +440,7 @@ static gboolean webkit_web_view_popup_menu_handler(GtkWidget* widget)
startCaretRect.width() + extraWidthToEndOfLine,
startCaretRect.height());
- location = IntPoint(rightAligned ? firstRect.right() : firstRect.x(), firstRect.bottom());
+ location = IntPoint(rightAligned ? firstRect.maxX() : firstRect.x(), firstRect.maxY());
}
// FIXME: The IntSize(0, -1) is a hack to get the hit-testing to result in the selected element.
diff --git a/Source/WebKit/win/ChangeLog b/Source/WebKit/win/ChangeLog
index 92afffe..35a28a4 100644
--- a/Source/WebKit/win/ChangeLog
+++ b/Source/WebKit/win/ChangeLog
@@ -1,3 +1,22 @@
+2011-02-02 David Hyatt <hyatt at apple.com>
+
+ Reviewed by Darin Adler.
+
+ Removal of right()/bottom(), converting to maxX()/maxY().
+
+ * DOMHTMLClasses.cpp:
+ (DOMHTMLInputElement::rectOnScreen):
+ * WebCoreSupport/EmbeddedWidget.cpp:
+ (EmbeddedWidget::frameRectsChanged):
+ * WebFrame.cpp:
+ (WebFrame::computePageRects):
+ * WebScrollBar.cpp:
+ (WebScrollBar::frameRect):
+ * WebView.cpp:
+ (WebView::addToDirtyRegion):
+ (WebView::visibleContentRect):
+ (WebView::prepareCandidateWindow):
+
2011-01-31 Brady Eidson <beidson at apple.com>
Reviewed by Adam Roben.
diff --git a/Source/WebKit/win/DOMHTMLClasses.cpp b/Source/WebKit/win/DOMHTMLClasses.cpp
index 2dd6deb..7fe2748 100644
--- a/Source/WebKit/win/DOMHTMLClasses.cpp
+++ b/Source/WebKit/win/DOMHTMLClasses.cpp
@@ -1314,8 +1314,8 @@ HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::rectOnScreen(
IntRect coreRect = view->contentsToScreen(renderer->absoluteBoundingBoxRect());
rect->left = coreRect.x();
rect->top = coreRect.y();
- rect->right = coreRect.right();
- rect->bottom = coreRect.bottom();
+ rect->right = coreRect.maxX();
+ rect->bottom = coreRect.maxY();
return S_OK;
}
diff --git a/Source/WebKit/win/WebCoreSupport/EmbeddedWidget.cpp b/Source/WebKit/win/WebCoreSupport/EmbeddedWidget.cpp
index 371ff3a..fb2b564 100644
--- a/Source/WebKit/win/WebCoreSupport/EmbeddedWidget.cpp
+++ b/Source/WebKit/win/WebCoreSupport/EmbeddedWidget.cpp
@@ -120,7 +120,7 @@ void EmbeddedWidget::frameRectsChanged()
rgn = ::CreateRectRgn(0, 0, 0, 0);
::SetWindowRgn(m_window, rgn, FALSE);
} else {
- rgn = ::CreateRectRgn(m_clipRect.x(), m_clipRect.y(), m_clipRect.right(), m_clipRect.bottom());
+ rgn = ::CreateRectRgn(m_clipRect.x(), m_clipRect.y(), m_clipRect.maxX(), m_clipRect.maxY());
::SetWindowRgn(m_window, rgn, TRUE);
}
@@ -128,7 +128,7 @@ void EmbeddedWidget::frameRectsChanged()
::MoveWindow(m_window, m_windowRect.x(), m_windowRect.y(), m_windowRect.width(), m_windowRect.height(), TRUE);
if (clipToZeroRect) {
- rgn = ::CreateRectRgn(m_clipRect.x(), m_clipRect.y(), m_clipRect.right(), m_clipRect.bottom());
+ rgn = ::CreateRectRgn(m_clipRect.x(), m_clipRect.y(), m_clipRect.maxX(), m_clipRect.maxY());
::SetWindowRgn(m_window, rgn, TRUE);
}
}
diff --git a/Source/WebKit/win/WebFrame.cpp b/Source/WebKit/win/WebFrame.cpp
index 0b03032..7ec1874 100644
--- a/Source/WebKit/win/WebFrame.cpp
+++ b/Source/WebKit/win/WebFrame.cpp
@@ -2066,8 +2066,8 @@ const Vector<WebCore::IntRect>& WebFrame::computePageRects(HDC printDC)
IntRect adjustedRect = IntRect(
pageRect.x() + marginRect.x(),
pageRect.y() + marginRect.y(),
- pageRect.width() - marginRect.x() - marginRect.right(),
- pageRect.height() - marginRect.y() - marginRect.bottom());
+ pageRect.width() - marginRect.x() - marginRect.maxX(),
+ pageRect.height() - marginRect.y() - marginRect.maxY());
computePageRectsForFrame(coreFrame, adjustedRect, headerHeight, footerHeight, 1.0,m_pageRects, m_pageHeight);
diff --git a/Source/WebKit/win/WebScrollBar.cpp b/Source/WebKit/win/WebScrollBar.cpp
index 94faaf8..9f0131b 100644
--- a/Source/WebKit/win/WebScrollBar.cpp
+++ b/Source/WebKit/win/WebScrollBar.cpp
@@ -174,9 +174,9 @@ HRESULT STDMETHODCALLTYPE WebScrollBar::frameRect(
return E_POINTER;
IntRect rect = m_scrollBar->frameRect();
bounds->left = rect.x();
- bounds->right = rect.right();
+ bounds->right = rect.maxX();
bounds->top = rect.y();
- bounds->bottom = rect.bottom();
+ bounds->bottom = rect.maxY();
return S_OK;
}
diff --git a/Source/WebKit/win/WebView.cpp b/Source/WebKit/win/WebView.cpp
index 7f98a00..a85b23d 100644
--- a/Source/WebKit/win/WebView.cpp
+++ b/Source/WebKit/win/WebView.cpp
@@ -802,7 +802,7 @@ void WebView::addToDirtyRegion(const IntRect& dirtyRect)
#endif
HRGN newRegion = ::CreateRectRgn(dirtyRect.x(), dirtyRect.y(),
- dirtyRect.right(), dirtyRect.bottom());
+ dirtyRect.maxX(), dirtyRect.maxY());
addToDirtyRegion(newRegion);
}
@@ -4980,8 +4980,8 @@ HRESULT STDMETHODCALLTYPE WebView::visibleContentRect(
FloatRect visibleContent = m_page->mainFrame()->view()->visibleContentRect();
rect->left = (LONG) visibleContent.x();
rect->top = (LONG) visibleContent.y();
- rect->right = (LONG) visibleContent.right();
- rect->bottom = (LONG) visibleContent.bottom();
+ rect->right = (LONG) visibleContent.maxX();
+ rect->bottom = (LONG) visibleContent.maxY();
return S_OK;
}
@@ -5345,9 +5345,9 @@ void WebView::prepareCandidateWindow(Frame* targetFrame, HIMC hInputContext)
form.ptCurrentPos.x = caret.x();
form.ptCurrentPos.y = caret.y() + caret.height();
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();
IMMDict::dict().setCandidateWindow(hInputContext, &form);
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list