Title: [99778] trunk/Source
- Revision
- 99778
- Author
- [email protected]
- Date
- 2011-11-09 15:59:21 -0800 (Wed, 09 Nov 2011)
Log Message
Element::boundsInWindowSpace should be Element::boundsInRootViewSpace
https://bugs.webkit.org/show_bug.cgi?id=71955
Reviewed by Sam Weinig.
Source/WebCore:
Element::boundsInWindowSpace is only used by WebKit2, where the window coordinate space is the
same as the root view coordinate space. This lets us get rid of another use of contentsToWindow.
* WebCore.exp.in:
* dom/Element.cpp:
(WebCore::Element::boundsInRootViewSpace):
* dom/Element.h:
Source/WebKit2:
* WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp:
(WebKit::InjectedBundleNodeHandle::elementBounds):
Call Element::boundsInRootViewSpace.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (99777 => 99778)
--- trunk/Source/WebCore/ChangeLog 2011-11-09 23:56:43 UTC (rev 99777)
+++ trunk/Source/WebCore/ChangeLog 2011-11-09 23:59:21 UTC (rev 99778)
@@ -1,3 +1,18 @@
+2011-11-09 Anders Carlsson <[email protected]>
+
+ Element::boundsInWindowSpace should be Element::boundsInRootViewSpace
+ https://bugs.webkit.org/show_bug.cgi?id=71955
+
+ Reviewed by Sam Weinig.
+
+ Element::boundsInWindowSpace is only used by WebKit2, where the window coordinate space is the
+ same as the root view coordinate space. This lets us get rid of another use of contentsToWindow.
+
+ * WebCore.exp.in:
+ * dom/Element.cpp:
+ (WebCore::Element::boundsInRootViewSpace):
+ * dom/Element.h:
+
2011-11-09 Kentaro Hara <[email protected]>
Unreviewed, rebaseline run-bindings-tests results.
Modified: trunk/Source/WebCore/WebCore.exp.in (99777 => 99778)
--- trunk/Source/WebCore/WebCore.exp.in 2011-11-09 23:56:43 UTC (rev 99777)
+++ trunk/Source/WebCore/WebCore.exp.in 2011-11-09 23:59:21 UTC (rev 99778)
@@ -881,7 +881,7 @@
__ZN7WebCore7Console24setShouldPrintExceptionsEb
__ZN7WebCore7Element16ensureShadowRootEv
__ZN7WebCore7Element16removeShadowRootEv
-__ZN7WebCore7Element19boundsInWindowSpaceEv
+__ZN7WebCore7Element21boundsInRootViewSpaceEv
__ZN7WebCore7Element9innerTextEv
__ZN7WebCore7IntRect5scaleEf
__ZN7WebCore7IntRect5uniteERKS0_
Modified: trunk/Source/WebCore/dom/Element.cpp (99777 => 99778)
--- trunk/Source/WebCore/dom/Element.cpp 2011-11-09 23:56:43 UTC (rev 99777)
+++ trunk/Source/WebCore/dom/Element.cpp 2011-11-09 23:59:21 UTC (rev 99778)
@@ -470,7 +470,7 @@
return 0;
}
-LayoutRect Element::boundsInWindowSpace()
+LayoutRect Element::boundsInRootViewSpace()
{
document()->updateLayoutIgnorePendingStylesheets();
@@ -501,7 +501,7 @@
for (size_t i = 1; i < quads.size(); ++i)
result.unite(quads[i].enclosingBoundingBox());
- result = view->contentsToWindow(result);
+ result = view->contentsToRootView(result);
return result;
}
Modified: trunk/Source/WebCore/dom/Element.h (99777 => 99778)
--- trunk/Source/WebCore/dom/Element.h 2011-11-09 23:56:43 UTC (rev 99777)
+++ trunk/Source/WebCore/dom/Element.h 2011-11-09 23:59:21 UTC (rev 99778)
@@ -169,8 +169,7 @@
virtual int scrollWidth();
virtual int scrollHeight();
- // Note that the 'window space' has a flipped coordinate system on some platforms.
- LayoutRect boundsInWindowSpace();
+ LayoutRect boundsInRootViewSpace();
PassRefPtr<ClientRectList> getClientRects();
PassRefPtr<ClientRect> getBoundingClientRect();
Modified: trunk/Source/WebKit2/ChangeLog (99777 => 99778)
--- trunk/Source/WebKit2/ChangeLog 2011-11-09 23:56:43 UTC (rev 99777)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-09 23:59:21 UTC (rev 99778)
@@ -1,3 +1,14 @@
+2011-11-09 Anders Carlsson <[email protected]>
+
+ Element::boundsInWindowSpace should be Element::boundsInRootViewSpace
+ https://bugs.webkit.org/show_bug.cgi?id=71955
+
+ Reviewed by Sam Weinig.
+
+ * WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp:
+ (WebKit::InjectedBundleNodeHandle::elementBounds):
+ Call Element::boundsInRootViewSpace.
+
2011-11-09 Alexis Menard <[email protected]>
WebGraphicsLayer behaves wrongly when no contentsScale is set.
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp (99777 => 99778)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp 2011-11-09 23:56:43 UTC (rev 99777)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp 2011-11-09 23:59:21 UTC (rev 99778)
@@ -109,7 +109,7 @@
if (!m_node->isElementNode())
return IntRect();
- return static_cast<Element*>(m_node.get())->boundsInWindowSpace();
+ return static_cast<Element*>(m_node.get())->boundsInRootViewSpace();
}
IntRect InjectedBundleNodeHandle::renderRect(bool* isReplaced) const
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
