Changeset 94032 in webkit

Timestamp:

Aug 29, 2011, 4:42:22 PM (15 years ago)

Author:

cevans@google.com

Message:

Merge 94001
BUG=91911
Review URL: ​http://codereview.chromium.org/7795013

Location:

branches/chromium/835

Files:

• LayoutTests/fast/block/line-layout/inline-box-wrapper-crash-expected.txt (copied) (copied from trunk/LayoutTests/fast/block/line-layout/inline-box-wrapper-crash-expected.txt )
• LayoutTests/fast/block/line-layout/inline-box-wrapper-crash.html (copied) (copied from trunk/LayoutTests/fast/block/line-layout/inline-box-wrapper-crash.html )
• Source/WebCore/rendering/RenderBox.cpp (modified) (1 diff)

branches/chromium/835/Source/WebCore/rendering/RenderBox.cpp

@@ -1366 +1366 @@
     } else if (isReplaced()) {
         setLocation(roundedIntPoint(FloatPoint(box->x(), box->y())));
+        if (m_inlineBoxWrapper)
+            deleteLineBoxWrapper();
         m_inlineBoxWrapper = box;
     }