Changeset 99778 in webkit

Timestamp:

Nov 9, 2011, 3:59:21 PM (15 years ago)

Author:

andersca@apple.com

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.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebCore/dom/Element.cpp (modified) (2 diffs)
• WebCore/dom/Element.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-09  Anders Carlsson  <andersca@apple.com>
+
+        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  <haraken@chromium.org>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -882 +882 @@
 __ZN7WebCore7Element16ensureShadowRootEv
 __ZN7WebCore7Element16removeShadowRootEv
-__ZN7WebCore7Element19boundsInWindowSpaceEv
+__ZN7WebCore7Element21boundsInRootViewSpaceEv
 __ZN7WebCore7Element9innerTextEv
 __ZN7WebCore7IntRect5scaleEf

trunk/Source/WebCore/dom/Element.cpp

@@ -471 +471 @@
 }
 
-LayoutRect Element::boundsInWindowSpace()
+LayoutRect Element::boundsInRootViewSpace()
 {
     document()->updateLayoutIgnorePendingStylesheets();
@@ -502 +502 @@
         result.unite(quads[i].enclosingBoundingBox());
 
-    result = view->contentsToWindow(result);
+    result = view->contentsToRootView(result);
     return result;
 }

trunk/Source/WebCore/dom/Element.h

@@ -170 +170 @@
     virtual int scrollHeight();
 
-    // Note that the 'window space' has a flipped coordinate system on some platforms.
-    LayoutRect boundsInWindowSpace();
+    LayoutRect boundsInRootViewSpace();
 
     PassRefPtr<ClientRectList> getClientRects();

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-11-09  Anders Carlsson  <andersca@apple.com>
+
+        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  <alexis.menard@openbossa.org>
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp

@@ -110 +110 @@
         return IntRect();
 
-    return static_cast<Element*>(m_node.get())->boundsInWindowSpace();
+    return static_cast<Element*>(m_node.get())->boundsInRootViewSpace();
 }