Changeset 83629 in webkit

Timestamp:

Apr 12, 2011 1:31:02 PM (13 years ago)

Author:

hyatt@apple.com

Message:

​https://bugs.webkit.org/show_bug.cgi?id=58176

Reviewed by Dan Bernstein.

Inline replaced elements following positioned elements on lines are not rendered. Make sure the
logic for skipping run construction in appendRunsForObject matches the new logic that I added
to findNextLineBreak. If they don't match up, you risk confusing the run construction code and
causing it to not make runs for objects that follow the positioned object on the line.

Source/WebCore:

Added fast/inline/positioned-object-between-replaced-elements.html

• rendering/RenderBlockLineLayout.cpp:

(WebCore::RenderBlock::appendRunsForObject):

LayoutTests:

• fast/inline/positioned-object-between-replaced-elements.html: Added.
• platform/mac/fast/inline/positioned-object-between-replaced-elements-expected.checksum: Added.
• platform/mac/fast/inline/positioned-object-between-replaced-elements-expected.png: Added.
• platform/mac/fast/inline/positioned-object-between-replaced-elements-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/inline/positioned-object-between-replaced-elements.html (added)
• LayoutTests/platform/mac/fast/inline/positioned-object-between-replaced-elements-expected.checksum (added)
• LayoutTests/platform/mac/fast/inline/positioned-object-between-replaced-elements-expected.png (added)
• LayoutTests/platform/mac/fast/inline/positioned-object-between-replaced-elements-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockLineLayout.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-12  David Hyatt  <hyatt@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        https://bugs.webkit.org/show_bug.cgi?id=58176
+        
+        Inline replaced elements following positioned elements on lines are not rendered. Make sure the
+        logic for skipping run construction in appendRunsForObject matches the new logic that I added
+        to findNextLineBreak. If they don't match up, you risk confusing the run construction code and
+        causing it to not make runs for objects that follow the positioned object on the line.
+
+        * fast/inline/positioned-object-between-replaced-elements.html: Added.
+        * platform/mac/fast/inline/positioned-object-between-replaced-elements-expected.checksum: Added.
+        * platform/mac/fast/inline/positioned-object-between-replaced-elements-expected.png: Added.
+        * platform/mac/fast/inline/positioned-object-between-replaced-elements-expected.txt: Added.
+
 2011-04-12  Alice Liu  <alice.liu@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-12  David Hyatt  <hyatt@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        https://bugs.webkit.org/show_bug.cgi?id=58176
+        
+        Inline replaced elements following positioned elements on lines are not rendered. Make sure the
+        logic for skipping run construction in appendRunsForObject matches the new logic that I added
+        to findNextLineBreak. If they don't match up, you risk confusing the run construction code and
+        causing it to not make runs for objects that follow the positioned object on the line.
+
+        Added fast/inline/positioned-object-between-replaced-elements.html
+        
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::RenderBlock::appendRunsForObject):
+
 2011-04-12  Alice Liu  <alice.liu@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -126 +126 @@
 {
     if (start > end || obj->isFloating() ||
-        (obj->isPositioned() && !obj->style()->hasAutoLeftAndRight() && !obj->style()->hasAutoTopAndBottom() && !obj->container()->isRenderInline()))
+        (obj->isPositioned() && !obj->style()->isOriginalDisplayInlineType() && !obj->container()->isRenderInline()))
         return;