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

WebCore/rendering/RenderBox.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  *           (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 288 matching lines @@
             layer()->scrollToYOffset(top);
         }
     }
 
     bool isBodyRenderer = isBody();
     bool isRootRenderer = isRoot();
 
     // Set the text color if we're the body.
     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());
+            setNeedsLayoutAndPrefWidthsRecalc();
         }
-        
-        if (isRootRenderer || !document()->writingModeSetOnDocumentElement()) {
+
+        if (viewStyle->writingMode() != style()->writingMode() && (isRootRenderer || !document()->writingModeSetOnDocumentElement())) {
             viewStyle->setWritingMode(style()->writingMode());
             if (isBodyRenderer)
                 document()->documentElement()->renderer()->style()->setWritingMode(style()->writingMode());
+            setNeedsLayoutAndPrefWidthsRecalc();
         }
-        setNeedsLayoutAndPrefWidthsRecalc();
     }
 }
 
 void RenderBox::updateBoxModelInfoFromStyle()
 {
     RenderBoxModelObject::updateBoxModelInfoFromStyle();
 
     bool isRootObject = isRoot();
     bool isViewObject = isRenderView();
 
@@ skipping 2928 matching lines @@
 {
     if (!parent() || !parent()->isBox())
         return locationOffset();
     
     IntRect rect(frameRect());
     parentBox()->flipForWritingMode(rect);
     return IntSize(rect.x(), rect.y());
 }
 
 } // namespace WebCore