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

Unified Diff: Source/core/layout/ColumnInfo.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 | « no previous file | Source/core/layout/LayoutBlock.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/ColumnInfo.h
diff --git a/Source/core/layout/ColumnInfo.h b/Source/core/layout/ColumnInfo.h
deleted file mode 100644
index ba5fbac93f6a3940b1c50b387aead404aac6c3bc..0000000000000000000000000000000000000000
--- a/Source/core/layout/ColumnInfo.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (C) 2010, 2011 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef ColumnInfo_h
-#define ColumnInfo_h
-
-#include "platform/LayoutUnit.h"
-#include "wtf/FastAllocBase.h"
-#include "wtf/Noncopyable.h"
-#include <algorithm>
-
-namespace blink {
-
-class ColumnInfo {
- WTF_MAKE_NONCOPYABLE(ColumnInfo); WTF_MAKE_FAST_ALLOCATED(ColumnInfo);
-public:
- ColumnInfo()
- : m_desiredColumnWidth(0)
- , m_desiredColumnCount(1)
- , m_progressionAxis(InlineAxis)
- , m_columnCount(1)
- , m_columnHeight(0)
- , m_minimumColumnHeight(0)
- , m_forcedBreaks(0)
- , m_maximumDistanceBetweenForcedBreaks(0)
- , m_forcedBreakOffset(0)
- {
- }
-
- LayoutUnit desiredColumnWidth() const { return m_desiredColumnWidth; }
- void setDesiredColumnWidth(LayoutUnit width) { m_desiredColumnWidth = width; }
-
- unsigned desiredColumnCount() const { return m_desiredColumnCount; }
- void setDesiredColumnCount(unsigned count) { m_desiredColumnCount = count; }
-
- enum Axis { InlineAxis, BlockAxis };
-
- Axis progressionAxis() const { return m_progressionAxis; }
- void setProgressionAxis(Axis progressionAxis) { m_progressionAxis = progressionAxis; }
-
- unsigned columnCount() const { return m_columnCount; }
- LayoutUnit columnHeight() const { return m_columnHeight; }
-
- // Set our count and height. This is enough info for a LayoutBlock to compute page rects
- // dynamically.
- void setColumnCountAndHeight(int count, LayoutUnit height)
- {
- m_columnCount = count;
- m_columnHeight = height;
- }
- void setColumnHeight(LayoutUnit height) { m_columnHeight = height; }
-
- void updateMinimumColumnHeight(LayoutUnit height) { m_minimumColumnHeight = std::max(height, m_minimumColumnHeight); }
- LayoutUnit minimumColumnHeight() const { return m_minimumColumnHeight; }
-
- int forcedBreaks() const { return m_forcedBreaks; }
- LayoutUnit forcedBreakOffset() const { return m_forcedBreakOffset; }
- LayoutUnit maximumDistanceBetweenForcedBreaks() const { return m_maximumDistanceBetweenForcedBreaks; }
- void clearForcedBreaks()
- {
- m_forcedBreaks = 0;
- m_maximumDistanceBetweenForcedBreaks = 0;
- m_forcedBreakOffset = 0;
- }
- void addForcedBreak(LayoutUnit offsetFromFirstPage)
- {
- ASSERT(!m_columnHeight);
- LayoutUnit distanceFromLastBreak = offsetFromFirstPage - m_forcedBreakOffset;
- if (!distanceFromLastBreak)
- return;
- m_forcedBreaks++;
- m_maximumDistanceBetweenForcedBreaks = std::max(m_maximumDistanceBetweenForcedBreaks, distanceFromLastBreak);
- m_forcedBreakOffset = offsetFromFirstPage;
- }
-
-private:
- LayoutUnit m_desiredColumnWidth;
- unsigned m_desiredColumnCount;
- Axis m_progressionAxis;
-
- unsigned m_columnCount;
- LayoutUnit m_columnHeight;
- LayoutUnit m_minimumColumnHeight;
- int m_forcedBreaks; // FIXME: We will ultimately need to cache more information to balance around forced breaks properly.
- LayoutUnit m_maximumDistanceBetweenForcedBreaks;
- LayoutUnit m_forcedBreakOffset;
-};
-
-}
-
-#endif
« no previous file with comments | « no previous file | Source/core/layout/LayoutBlock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698