Merge 92692

Source/WebCore/rendering/RenderInline.cpp

Index: Source/WebCore/rendering/RenderInline.cpp
===================================================================
--- Source/WebCore/rendering/RenderInline.cpp	(revision 92736)
+++ Source/WebCore/rendering/RenderInline.cpp	(working copy)
@@ -162,7 +162,7 @@
     }
 }
 
-void RenderInline::updateAlwaysCreateLineBoxes()
+void RenderInline::updateAlwaysCreateLineBoxes(bool fullLayout)
 {
     // Once we have been tainted once, just assume it will happen again. This way effects like hover highlighting that change the
     // background color will only cause a layout on the first rollover.
@@ -189,7 +189,8 @@
     }
 
     if (alwaysCreateLineBoxes) {
-        dirtyLineBoxes(false);
+        if (!fullLayout)
+            dirtyLineBoxes(false);
         m_alwaysCreateLineBoxes = true;
     }
 }