Changeset 92059 in webkit

Timestamp:

Jul 30, 2011 4:51:31 PM (13 years ago)

Author:

enrica@apple.com

Message:

REGRESSION: culledInlineAbsoluteRects needs to translate a 0,0 point to absolute
coordinates so that the top left position is accurate.
​https://bugs.webkit.org/show_bug.cgi?id=65419
<rdar://problem/9408862>

Source/WebCore:

This patch fixes a regression introduced in r83075.
Make sure that culledInlineAbsoluteRects still does
a translation of a 0,0 point to absolute coordinates so that the top left position is
accurate.
This code path could not be tested via JavaScript. The patch
extends the Internals object to be able to test this case.

Reviewed by Dan Bernstein.

Test: fast/inline/skipped-whitespace-boundingBox.html

• WebCore.exp.in: Added some exports.
• rendering/RenderInline.cpp:

(WebCore::RenderInline::culledInlineAbsoluteRects):

• testing/Internals.cpp:

(WebCore::Internals::boundingBox):

• testing/Internals.h:
• testing/Internals.idl:

LayoutTests:

Reviewed by Dan Bernstein.

• fast/inline/skipped-whitespace-boundingBox-expected.txt: Added.
• fast/inline/skipped-whitespace-boundingBox.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/inline/skipped-whitespace-boundingBox-expected.txt (added)
• LayoutTests/fast/inline/skipped-whitespace-boundingBox.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/WebCore.exp.in (modified) (2 diffs)
• Source/WebCore/rendering/RenderInline.cpp (modified) (1 diff)
• Source/WebCore/testing/Internals.cpp (modified) (3 diffs)
• Source/WebCore/testing/Internals.h (modified) (2 diffs)
• Source/WebCore/testing/Internals.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-07-30  Enrica Casucci  <enrica@apple.com>
+
+        REGRESSION: culledInlineAbsoluteRects needs to translate a 0,0 point to absolute
+        coordinates so that the top left position is accurate.
+        https://bugs.webkit.org/show_bug.cgi?id=65419
+        <rdar://problem/9408862>
+
+        Reviewed by Dan Bernstein.
+
+        * fast/inline/skipped-whitespace-boundingBox-expected.txt: Added.
+        * fast/inline/skipped-whitespace-boundingBox.html: Added.
+
 2011-07-26  Pavel Podivilov  <podivilov@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-30  Enrica Casucci  <enrica@apple.com>
+
+        REGRESSION: culledInlineAbsoluteRects needs to translate a 0,0 point to absolute
+        coordinates so that the top left position is accurate.
+        https://bugs.webkit.org/show_bug.cgi?id=65419
+        <rdar://problem/9408862>
+
+        This patch fixes a regression introduced in r83075.
+        Make sure that culledInlineAbsoluteRects still does
+        a translation of a 0,0 point to absolute coordinates so that the top left position is
+        accurate.
+        This code path could not be tested via JavaScript. The patch
+        extends the Internals object to be able to test this case.
+
+        Reviewed by Dan Bernstein.
+
+        Test: fast/inline/skipped-whitespace-boundingBox.html
+
+        * WebCore.exp.in: Added some exports.
+        * rendering/RenderInline.cpp:
+        (WebCore::RenderInline::culledInlineAbsoluteRects):
+        * testing/Internals.cpp:
+        (WebCore::Internals::boundingBox):
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2011-07-26  Pavel Podivilov  <podivilov@chromium.org>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -153 +153 @@
 __ZN7WebCore10setCookiesEPNS_8DocumentERKNS_4KURLERKN3WTF6StringE
 __ZN7WebCore10toDocumentEN3JSC7JSValueE
+__ZN7WebCore10ClientRectC1Ev
+__ZN7WebCore10ClientRectC1ERKNS_7IntRectE
+__ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_10ClientRectE
 __ZN7WebCore11BitmapImageC1EP7CGImagePNS_13ImageObserverE
 __ZN7WebCore11CachedFrame23cachedFramePlatformDataEv
@@ -281 +284 @@
 __ZN7WebCore12PrintContextD1Ev
 __ZN7WebCore12RenderObject16repaintRectangleERKNS_7IntRectEb
+__ZN7WebCore12RenderObject23absoluteBoundingBoxRectEb
 __ZN7WebCore12RenderWidget19showSubstituteImageEN3WTF10PassRefPtrINS_5ImageEEE
 __ZN7WebCore12RenderWidget28resumeWidgetHierarchyUpdatesEv

trunk/Source/WebCore/rendering/RenderInline.cpp

@@ -487 +487 @@
 void RenderInline::culledInlineAbsoluteRects(const RenderInline* container, Vector<IntRect>& rects, const IntSize& offset)
 {
+    if (!culledInlineFirstLineBox()) {
+        rects.append(IntRect(offset.width(), offset.height(), 0, 0));
+        return;
+    }
+
     bool isHorizontal = style()->isHorizontalWritingMode();
     for (RenderObject* curr = firstChild(); curr; curr = curr->nextSibling()) {

trunk/Source/WebCore/testing/Internals.cpp

@@ -28 +28 @@
 
 #include "CachedResourceLoader.h"
+#include "ClientRect.h"
 #include "Document.h"
 #include "Element.h"
@@ -34 +35 @@
 #include "NodeRenderingContext.h"
 #include "Page.h"
+#include "RenderObject.h"
 #include "RenderTreeAsText.h"
 #include "ShadowContentElement.h"
@@ -148 +150 @@
 #endif
 
+PassRefPtr<ClientRect> Internals::boundingBox(Element* element, ExceptionCode& ec)
+{
+    if (!element) {
+        ec = INVALID_ACCESS_ERR;
+        return ClientRect::create();
+    }
+
+    element->document()->updateLayoutIgnorePendingStylesheets();
+    RenderObject* renderer = element->renderer();
+    if (!renderer)
+        return ClientRect::create();
+    return ClientRect::create(renderer->absoluteBoundingBoxRect());
 }
+
+}

trunk/Source/WebCore/testing/Internals.h

@@ -35 +35 @@
 namespace WebCore {
 
+class ClientRect;
 class Document;
 class Element;
@@ -61 +62 @@
 #endif
 
+    PassRefPtr<ClientRect> boundingBox(Element*, ExceptionCode&);
+
 private:
     Internals();

trunk/Source/WebCore/testing/Internals.idl

@@ -39 +39 @@
 
         void setInspectorResourcesDataSizeLimits(in Document document, in long maximumResourcesContentSize, in long maximumSingleResourceContentSize) raises(DOMException);
+
+        ClientRect boundingBox(in Element element) raises(DOMException);
     };
 }