Changeset 73245 in webkit

Timestamp:

Dec 2, 2010 11:44:47 PM (13 years ago)

Author:

aa@chromium.org

Message:

2010-12-02 Aaron Boodman <​aa@chromium.org>

Reviewed by David Hyatt.

Reduce the number of cases where we end up with a stale value for
minimumPreferredLogicalWidth(). This isn't a complete fix, but fixes a
large number of cases.

RenderObject::minimumPreferredLogicalWidth() sometimes reports wrong value.
​https://bugs.webkit.org/show_bug.cgi?id=50119

• rendering/RenderBox.cpp: (WebCore::RenderBox::styleDidChange):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBox.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-02  Aaron Boodman  <aa@chromium.org>
+
+        Reviewed by David Hyatt.
+
+        Reduce the number of cases where we end up with a stale value for
+        minimumPreferredLogicalWidth(). This isn't a complete fix, but fixes a
+        large number of cases.
+
+        RenderObject::minimumPreferredLogicalWidth() sometimes reports wrong value.
+        https://bugs.webkit.org/show_bug.cgi?id=50119
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::styleDidChange):
+
 2010-12-02  Gregg Tavares  <gman@google.com>
 

trunk/WebCore/rendering/RenderBox.cpp

@@ -307 +307 @@
     if (isBodyRenderer)
         document()->setTextColor(style()->visitedDependentColor(CSSPropertyColor));
-    
-    if ((isRootRenderer || isBodyRenderer) && (!oldStyle || oldStyle->writingMode() != style()->writingMode() || oldStyle->direction() != style()->direction())) {
+
+    if (isRootRenderer || isBodyRenderer) {
         // Propagate the new writing mode and direction up to the RenderView.
         RenderView* viewRenderer = view();
         RenderStyle* viewStyle = viewRenderer->style();
-        if (isRootRenderer || !document()->directionSetOnDocumentElement()) {
+        if (viewStyle->direction() != style()->direction() && (isRootRenderer || !document()->directionSetOnDocumentElement())) {
             viewStyle->setDirection(style()->direction());
             if (isBodyRenderer)
                 document()->documentElement()->renderer()->style()->setDirection(style()->direction());
-        }
-        
-        if (isRootRenderer || !document()->writingModeSetOnDocumentElement()) {
+            setNeedsLayoutAndPrefWidthsRecalc();
+        }
+
+        if (viewStyle->writingMode() != style()->writingMode() && (isRootRenderer || !document()->writingModeSetOnDocumentElement())) {
             viewStyle->setWritingMode(style()->writingMode());
             if (isBodyRenderer)
                 document()->documentElement()->renderer()->style()->setWritingMode(style()->writingMode());
-        }
-        setNeedsLayoutAndPrefWidthsRecalc();
+            setNeedsLayoutAndPrefWidthsRecalc();
+        }
     }
 }