Changeset 176287 in webkit

Timestamp:

Nov 18, 2014 2:51:42 PM (9 years ago)

Author:

hyatt@apple.com

Message:

REGRESSION(r152313): Inline-block element doesn't wrap properly
​https://bugs.webkit.org/show_bug.cgi?id=138846 - <rdar://problem/18838703>

Reviewed by Simon Fraser.

Source/WebCore:

Added fast/inline-block/inline-block-empty-spans.html

• rendering/line/BreakingContextInlineHeaders.h:

(WebCore::BreakingContext::canBreakAtThisPosition):

LayoutTests:

• fast/inline-block/inline-block-empty-spans-expected.html: Added.
• fast/inline-block/inline-block-empty-spans.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/inline-block/inline-block-empty-spans-expected.html (added)
• LayoutTests/fast/inline-block/inline-block-empty-spans.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/line/BreakingContextInlineHeaders.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-11-18  David Hyatt  <hyatt@apple.com>
+
+        REGRESSION(r152313): Inline-block element doesn't wrap properly
+        https://bugs.webkit.org/show_bug.cgi?id=138846 - <rdar://problem/18838703>
+
+        Reviewed by Simon Fraser.
+
+        * fast/inline-block/inline-block-empty-spans-expected.html: Added.
+        * fast/inline-block/inline-block-empty-spans.html: Added.
+
 2014-11-18  Myles C. Maxfield  <litherum@gmail.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-18  David Hyatt  <hyatt@apple.com>
+
+        REGRESSION(r152313): Inline-block element doesn't wrap properly
+        https://bugs.webkit.org/show_bug.cgi?id=138846 - <rdar://problem/18838703>
+
+        Reviewed by Simon Fraser.
+
+        Added fast/inline-block/inline-block-empty-spans.html
+
+        * rendering/line/BreakingContextInlineHeaders.h:
+        (WebCore::BreakingContext::canBreakAtThisPosition):
+
 2014-11-18  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h

@@ -932 +932 @@
         return false;
 
-    // Avoid breaking before empty inlines.
-    if (is<RenderInline>(m_nextObject) && isEmptyInline(downcast<RenderInline>(*m_nextObject)))
+    // Avoid breaking before empty inlines (as long as the current object isn't replaced).
+    if (!m_current.renderer()->isReplaced() && is<RenderInline>(m_nextObject) && isEmptyInline(downcast<RenderInline>(*m_nextObject)))
         return false;