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

Side by Side Diff: Source/core/rendering/RenderBlock.h

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 | « no previous file | Source/core/rendering/RenderBlock.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) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 174
175 LayoutRect logicalRectToPhysicalRect(const LayoutPoint& physicalPosition, co nst LayoutRect& logicalRect); 175 LayoutRect logicalRectToPhysicalRect(const LayoutPoint& physicalPosition, co nst LayoutRect& logicalRect);
176 176
177 // Helper methods for computing line counts and heights for line counts. 177 // Helper methods for computing line counts and heights for line counts.
178 RootInlineBox* lineAtIndex(int) const; 178 RootInlineBox* lineAtIndex(int) const;
179 int lineCount(const RootInlineBox* = 0, bool* = 0) const; 179 int lineCount(const RootInlineBox* = 0, bool* = 0) const;
180 int heightForLineCount(int); 180 int heightForLineCount(int);
181 void clearTruncation(); 181 void clearTruncation();
182 182
183 void adjustRectForColumns(LayoutRect&) const; 183 void adjustRectForColumns(LayoutRect&) const;
184 virtual void adjustForColumns(LayoutSize&, const LayoutPoint&) const OVERRID E FINAL; 184 virtual LayoutSize columnOffset(const LayoutPoint&) const OVERRIDE FINAL;
185 void adjustForColumnRect(LayoutSize& offset, const LayoutPoint& locationInCo ntainer) const; 185 void adjustForColumnRect(LayoutSize& offset, const LayoutPoint& locationInCo ntainer) const;
186 186
187 void addContinuationWithOutline(RenderInline*); 187 void addContinuationWithOutline(RenderInline*);
188 bool paintsContinuationOutline(RenderInline*); 188 bool paintsContinuationOutline(RenderInline*);
189 189
190 virtual RenderBoxModelObject* virtualContinuation() const OVERRIDE FINAL { r eturn continuation(); } 190 virtual RenderBoxModelObject* virtualContinuation() const OVERRIDE FINAL { r eturn continuation(); }
191 bool isAnonymousBlockContinuation() const { return continuation() && isAnony mousBlock(); } 191 bool isAnonymousBlockContinuation() const { return continuation() && isAnony mousBlock(); }
192 RenderInline* inlineElementContinuation() const; 192 RenderInline* inlineElementContinuation() const;
193 RenderBlock* blockElementContinuation() const; 193 RenderBlock* blockElementContinuation() const;
194 194
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 // FIXME: This is temporary as we move code that accesses block flow 544 // FIXME: This is temporary as we move code that accesses block flow
545 // member variables out of RenderBlock and into RenderBlockFlow. 545 // member variables out of RenderBlock and into RenderBlockFlow.
546 friend class RenderBlockFlow; 546 friend class RenderBlockFlow;
547 }; 547 };
548 548
549 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock()); 549 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock());
550 550
551 } // namespace WebCore 551 } // namespace WebCore
552 552
553 #endif // RenderBlock_h 553 #endif // RenderBlock_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/rendering/RenderBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698