WebKit merge 41447:41498 [third_party/WebKit]

third_party/WebKit/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 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 2336 matching lines @@
             // 'staticX' should already have been set through layout of the parent.
             int staticPosition = layer()->staticX() - containerBlock->borderLeft();
             for (RenderObject* po = parent(); po && po != containerBlock; po = po->parent()) {
                 if (po->isBox())
                     staticPosition += toRenderBox(po)->x();
             }
             left.setValue(Fixed, staticPosition);
         } else {
             RenderObject* po = parent();
             // 'staticX' should already have been set through layout of the parent.
-            int staticPosition = layer()->staticX() + containerWidth + toRenderBoxModelObject(containerBlock)->borderRight();
+            int staticPosition = layer()->staticX() + containerWidth + containerBlock->borderRight();
             for ( ; po && po != containerBlock; po = po->parent()) {
                 if (po->isBox())
                     staticPosition += toRenderBox(po)->x();
             }
             right.setValue(Fixed, staticPosition);
         }
     }
 
     /*-----------------------------------------------------------------------*\
      * 3. If 'left' or 'right' are 'auto', replace any 'auto' on 'margin-left'
@@ skipping 429 matching lines @@
 #if ENABLE(SVG)
 
 TransformationMatrix RenderBox::localTransform() const
 {
     return TransformationMatrix(1, 0, 0, 1, x(), y());
 }
 
 #endif
 
 } // namespace WebCore