Changeset 68335 in webkit

Timestamp:

Sep 25, 2010, 10:34:01 AM (14 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/8478160> Null deref in InlineBox::height()
​https://bugs.webkit.org/show_bug.cgi?id=45344

Reviewed by John Sullivan.

WebCore:

Test: fast/css/first-line-parent-style-different.html

• rendering/RenderObject.cpp:

(WebCore::RenderObject::firstLineStyleSlowCase): Set the pseudo style bit on the RenderStyle
which is going to supply the first-line style rather than on this object’s RenderStyle. The
styles may differ.

LayoutTests:

• fast/css/first-line-parent-style-different-expected.txt: Added.
• fast/css/first-line-parent-style-different.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/first-line-parent-style-different-expected.txt (added)
• LayoutTests/fast/css/first-line-parent-style-different.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderObject.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-09-25  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by John Sullivan.
+
+        <rdar://problem/8478160> Null deref in InlineBox::height()
+        https://bugs.webkit.org/show_bug.cgi?id=45344
+
+        * fast/css/first-line-parent-style-different-expected.txt: Added.
+        * fast/css/first-line-parent-style-different.html: Added.
+
 2010-09-25  Andreas Kling  <andreas.kling@nokia.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-09-25  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by John Sullivan.
+
+        <rdar://problem/8478160> Null deref in InlineBox::height()
+        https://bugs.webkit.org/show_bug.cgi?id=45344
+
+        Test: fast/css/first-line-parent-style-different.html
+
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::firstLineStyleSlowCase): Set the pseudo style bit on the RenderStyle
+        which is going to supply the first-line style rather than on this object’s RenderStyle. The
+        styles may differ.
+
 2010-09-25  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/rendering/RenderObject.cpp

@@ -2343 +2343 @@
         if (parentStyle != renderer->parent()->style()) {
             // A first-line style is in effect. Cache a first-line style for ourselves.
-            style->setHasPseudoStyle(FIRST_LINE_INHERITED);
+            renderer->style()->setHasPseudoStyle(FIRST_LINE_INHERITED);
             style = renderer->getCachedPseudoStyle(FIRST_LINE_INHERITED, parentStyle);
         }