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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutBlock.h

Issue 1997033002: Move continuation getter and setter down to LayoutBlockFlow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 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
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 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 183
184 PositionWithAffinity positionForPoint(const LayoutPoint&) override; 184 PositionWithAffinity positionForPoint(const LayoutPoint&) override;
185 185
186 LayoutUnit blockDirectionOffset(const LayoutSize& offsetFromBlock) const; 186 LayoutUnit blockDirectionOffset(const LayoutSize& offsetFromBlock) const;
187 LayoutUnit inlineDirectionOffset(const LayoutSize& offsetFromBlock) const; 187 LayoutUnit inlineDirectionOffset(const LayoutSize& offsetFromBlock) const;
188 188
189 LayoutBlock* blockBeforeWithinSelectionRoot(LayoutSize& offset) const; 189 LayoutBlock* blockBeforeWithinSelectionRoot(LayoutSize& offset) const;
190 190
191 void setSelectionState(SelectionState) override; 191 void setSelectionState(SelectionState) override;
192 192
193 LayoutBoxModelObject* virtualContinuation() const final { return continuatio n(); }
194 bool isAnonymousBlockContinuation() const { return continuation() && isAnony mousBlock(); }
195
196 using LayoutBoxModelObject::continuation;
197 using LayoutBoxModelObject::setContinuation;
198
199 static LayoutBlock* createAnonymousWithParentAndDisplay(const LayoutObject*, EDisplay = BLOCK); 193 static LayoutBlock* createAnonymousWithParentAndDisplay(const LayoutObject*, EDisplay = BLOCK);
200 LayoutBlock* createAnonymousBlock(EDisplay display = BLOCK) const { return c reateAnonymousWithParentAndDisplay(this, display); } 194 LayoutBlock* createAnonymousBlock(EDisplay display = BLOCK) const { return c reateAnonymousWithParentAndDisplay(this, display); }
201 195
202 LayoutBox* createAnonymousBoxWithSameTypeAs(const LayoutObject* parent) cons t override; 196 LayoutBox* createAnonymousBoxWithSameTypeAs(const LayoutObject* parent) cons t override;
203 197
204 int columnGap() const; 198 int columnGap() const;
205 199
206 // Accessors for logical width/height and margins in the containing block's block-flow direction. 200 // Accessors for logical width/height and margins in the containing block's block-flow direction.
207 LayoutUnit logicalWidthForChild(const LayoutBox& child) const { return logic alWidthForChildSize(child.size()); } 201 LayoutUnit logicalWidthForChild(const LayoutBox& child) const { return logic alWidthForChildSize(child.size()); }
208 LayoutUnit logicalWidthForChildSize(LayoutSize childSize) const { return isH orizontalWritingMode() ? childSize.width() : childSize.height(); } 202 LayoutUnit logicalWidthForChildSize(LayoutSize childSize) const { return isH orizontalWritingMode() ? childSize.width() : childSize.height(); }
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
440 // FIXME: This is temporary as we move code that accesses block flow 434 // FIXME: This is temporary as we move code that accesses block flow
441 // member variables out of LayoutBlock and into LayoutBlockFlow. 435 // member variables out of LayoutBlock and into LayoutBlockFlow.
442 friend class LayoutBlockFlow; 436 friend class LayoutBlockFlow;
443 }; 437 };
444 438
445 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlock, isLayoutBlock()); 439 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlock, isLayoutBlock());
446 440
447 } // namespace blink 441 } // namespace blink
448 442
449 #endif // LayoutBlock_h 443 #endif // LayoutBlock_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/dom/ContainerNode.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutBlockFlow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698