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

Unified Diff: Source/core/layout/LayoutBox.h

Issue 1158183006: Remove the old multicol implementation. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase master Created 5 years, 6 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
« no previous file with comments | « Source/core/layout/LayoutBlockFlow.cpp ('k') | Source/core/layout/LayoutBox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutBox.h
diff --git a/Source/core/layout/LayoutBox.h b/Source/core/layout/LayoutBox.h
index 98e21d660ef16a29d779d162c7539cd5f550af09..6e83511d3d3fff7b20d96cecb002bf14e111c9d5 100644
--- a/Source/core/layout/LayoutBox.h
+++ b/Source/core/layout/LayoutBox.h
@@ -537,8 +537,8 @@ public:
LayoutUnit computePercentageLogicalHeight(const Length& height) const;
// Block flows subclass availableWidth/Height to handle multi column layout (shrinking the width/height available to children when laying out.)
- virtual LayoutUnit availableLogicalWidth() const { return contentLogicalWidth(); }
- virtual LayoutUnit availableLogicalHeight(AvailableLogicalHeightType) const;
+ LayoutUnit availableLogicalWidth() const { return contentLogicalWidth(); }
+ LayoutUnit availableLogicalHeight(AvailableLogicalHeightType) const;
LayoutUnit availableLogicalHeightUsing(const Length&, AvailableLogicalHeightType) const;
// There are a few cases where we need to refer specifically to the available physical width and available physical height.
@@ -633,7 +633,6 @@ public:
return position;
return isHorizontalWritingMode() ? LayoutPoint(position.x(), m_frameRect.height() - position.y()) : LayoutPoint(m_frameRect.width() - position.x(), position.y());
}
- LayoutPoint flipForWritingModeIncludingColumns(const LayoutPoint&) const;
LayoutSize flipForWritingMode(const LayoutSize& offset) const WARN_UNUSED_RETURN
{
if (!UNLIKELY(hasFlippedBlocksWritingMode()))
« no previous file with comments | « Source/core/layout/LayoutBlockFlow.cpp ('k') | Source/core/layout/LayoutBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698