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

Side by Side Diff: Source/core/rendering/RenderBox.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/RenderBlock.cpp ('k') | Source/core/rendering/RenderBoxModelObject.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 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 1859 matching lines...) Expand 10 before | Expand all | Expand 10 after
1870 offset += offsetForInFlowPosition(); 1870 offset += offsetForInFlowPosition();
1871 1871
1872 if (!isInline() || isReplaced()) { 1872 if (!isInline() || isReplaced()) {
1873 if (!style()->hasOutOfFlowPosition() && o->hasColumns()) { 1873 if (!style()->hasOutOfFlowPosition() && o->hasColumns()) {
1874 RenderBlock* block = toRenderBlock(o); 1874 RenderBlock* block = toRenderBlock(o);
1875 LayoutRect columnRect(frameRect()); 1875 LayoutRect columnRect(frameRect());
1876 block->adjustStartEdgeForWritingModeIncludingColumns(columnRect); 1876 block->adjustStartEdgeForWritingModeIncludingColumns(columnRect);
1877 offset += toSize(columnRect.location()); 1877 offset += toSize(columnRect.location());
1878 LayoutPoint columnPoint = block->flipForWritingModeIncludingColumns( point + offset); 1878 LayoutPoint columnPoint = block->flipForWritingModeIncludingColumns( point + offset);
1879 offset = toLayoutSize(block->flipForWritingModeIncludingColumns(toLa youtPoint(offset))); 1879 offset = toLayoutSize(block->flipForWritingModeIncludingColumns(toLa youtPoint(offset)));
1880 o->adjustForColumns(offset, columnPoint); 1880 offset += o->columnOffset(columnPoint);
1881 offset = block->flipForWritingMode(offset); 1881 offset = block->flipForWritingMode(offset);
1882 1882
1883 if (offsetDependsOnPoint) 1883 if (offsetDependsOnPoint)
1884 *offsetDependsOnPoint = true; 1884 *offsetDependsOnPoint = true;
1885 } else 1885 } else
1886 offset += topLeftLocationOffset(); 1886 offset += topLeftLocationOffset();
1887 } 1887 }
1888 1888
1889 if (o->hasOverflowClip()) 1889 if (o->hasOverflowClip())
1890 offset -= toRenderBox(o)->scrolledContentOffset(); 1890 offset -= toRenderBox(o)->scrolledContentOffset();
(...skipping 2764 matching lines...) Expand 10 before | Expand all | Expand 10 after
4655 return 0; 4655 return 0;
4656 4656
4657 if (!layoutState && !flowThreadContainingBlock()) 4657 if (!layoutState && !flowThreadContainingBlock())
4658 return 0; 4658 return 0;
4659 4659
4660 RenderBlock* containerBlock = containingBlock(); 4660 RenderBlock* containerBlock = containingBlock();
4661 return containerBlock->offsetFromLogicalTopOfFirstPage() + logicalTop(); 4661 return containerBlock->offsetFromLogicalTopOfFirstPage() + logicalTop();
4662 } 4662 }
4663 4663
4664 } // namespace WebCore 4664 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBlock.cpp ('k') | Source/core/rendering/RenderBoxModelObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698