Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(341)

Unified Diff: third_party/WebKit/WebCore/rendering/RenderBox.cpp

Issue 39293: WebKit merge 41447:41498 [third_party/WebKit] (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: remove CRLF Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/WebCore/rendering/RenderBox.cpp
===================================================================
--- third_party/WebKit/WebCore/rendering/RenderBox.cpp (revision 11154)
+++ third_party/WebKit/WebCore/rendering/RenderBox.cpp (working copy)
@@ -2354,7 +2354,7 @@
} 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();
« no previous file with comments | « third_party/WebKit/WebCore/rendering/RenderBlock.cpp ('k') | third_party/WebKit/WebCore/rendering/RenderBoxModelObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698