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

Side by Side Diff: Source/core/rendering/RenderInline.cpp

Issue 259993006: Cleanup: Replace adjustForColumns() / offsetForColumns() with columnOffset(). (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 7 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 unified diff | Download patch
« no previous file with comments | « Source/core/rendering/RenderBoxModelObject.cpp ('k') | Source/core/rendering/RenderLayer.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 1105 matching lines...) Expand 10 before | Expand all | Expand 10 after
1116 } 1116 }
1117 1117
1118 LayoutSize RenderInline::offsetFromContainer(RenderObject* container, const Layo utPoint& point, bool* offsetDependsOnPoint) const 1118 LayoutSize RenderInline::offsetFromContainer(RenderObject* container, const Layo utPoint& point, bool* offsetDependsOnPoint) const
1119 { 1119 {
1120 ASSERT(container == this->container()); 1120 ASSERT(container == this->container());
1121 1121
1122 LayoutSize offset; 1122 LayoutSize offset;
1123 if (isInFlowPositioned()) 1123 if (isInFlowPositioned())
1124 offset += offsetForInFlowPosition(); 1124 offset += offsetForInFlowPosition();
1125 1125
1126 container->adjustForColumns(offset, point); 1126 offset += container->columnOffset(point);
1127 1127
1128 if (container->hasOverflowClip()) 1128 if (container->hasOverflowClip())
1129 offset -= toRenderBox(container)->scrolledContentOffset(); 1129 offset -= toRenderBox(container)->scrolledContentOffset();
1130 1130
1131 if (offsetDependsOnPoint) { 1131 if (offsetDependsOnPoint) {
1132 *offsetDependsOnPoint = container->hasColumns() 1132 *offsetDependsOnPoint = container->hasColumns()
1133 || (container->isBox() && container->style()->isFlippedBlocksWriting Mode()) 1133 || (container->isBox() && container->style()->isFlippedBlocksWriting Mode())
1134 || container->isRenderFlowThread(); 1134 || container->isRenderFlowThread();
1135 } 1135 }
1136 1136
(...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after
1571 container = this; 1571 container = this;
1572 1572
1573 FloatPoint absPos = container->localToAbsolute(); 1573 FloatPoint absPos = container->localToAbsolute();
1574 region.bounds.setX(absPos.x() + region.bounds.x()); 1574 region.bounds.setX(absPos.x() + region.bounds.x());
1575 region.bounds.setY(absPos.y() + region.bounds.y()); 1575 region.bounds.setY(absPos.y() + region.bounds.y());
1576 1576
1577 regions.append(region); 1577 regions.append(region);
1578 } 1578 }
1579 1579
1580 } // namespace WebCore 1580 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBoxModelObject.cpp ('k') | Source/core/rendering/RenderLayer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698