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

Unified Diff: Source/core/rendering/RenderFlowThread.h

Issue 712553003: [New Multicolumn] Actual support for layout of column-span:all. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Code review. Camelize. Created 6 years 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/rendering/RenderBlockFlow.cpp ('k') | Source/core/rendering/RenderFlowThread.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderFlowThread.h
diff --git a/Source/core/rendering/RenderFlowThread.h b/Source/core/rendering/RenderFlowThread.h
index 74a6b9cb50c34fa38658469ba0c5b208af1935e2..b44d5ced73650a4d5eef47455679daccdcbb430e 100644
--- a/Source/core/rendering/RenderFlowThread.h
+++ b/Source/core/rendering/RenderFlowThread.h
@@ -58,7 +58,6 @@ public:
virtual ~RenderFlowThread() { };
virtual bool isRenderFlowThread() const override final { return true; }
- virtual bool isRenderMultiColumnFlowThread() const { return false; }
virtual bool isRenderPagedFlowThread() const { return false; }
virtual void layout() override;
@@ -67,7 +66,15 @@ public:
// can easily avoid drawing the children directly.
virtual LayerType layerTypeRequired() const override final { return NormalLayer; }
+ virtual bool isColumnSpanner(const RenderObject*) const { return false; }
+
+ // Is the specified renderer a column spanner or inside one?
+ virtual bool isInsideColumnSpanner(const RenderObject*) const { return false; }
+
+ virtual LayoutUnit enterColumnSpannerBeforeLayout(RenderBox*, LayoutUnit logicalTop, SubtreeLayoutScope&) { return LayoutUnit(); }
+ virtual void exitColumnSpannerAfterLayout(RenderBox*, LayoutUnit logicalBottom) { }
virtual void flowThreadDescendantWasInserted(RenderObject*) { }
+ virtual void flowThreadDescendantWillBeRemoved(RenderObject*) { }
virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) override final;
@@ -116,14 +123,14 @@ public:
// Used to estimate the maximum height of the flow thread.
static LayoutUnit maxLogicalHeight() { return LayoutUnit::max() / 2; }
+ virtual RenderMultiColumnSet* columnSetAtBlockOffset(LayoutUnit) const = 0;
+
protected:
virtual const char* renderName() const = 0;
void updateRegionsFlowThreadPortionRect();
bool shouldIssuePaintInvalidations(const LayoutRect&) const;
- virtual RenderMultiColumnSet* columnSetAtBlockOffset(LayoutUnit) const = 0;
-
bool cachedOffsetFromLogicalTopOfFirstRegion(const RenderBox*, LayoutUnit&) const;
void setOffsetFromLogicalTopOfFirstRegion(const RenderBox*, LayoutUnit);
void clearOffsetFromLogicalTopOfFirstRegion(const RenderBox*);
@@ -135,9 +142,9 @@ protected:
typedef PODInterval<LayoutUnit, RenderMultiColumnSet*> MultiColumnSetInterval;
typedef PODIntervalTree<LayoutUnit, RenderMultiColumnSet*> MultiColumnSetIntervalTree;
- class RegionSearchAdapter {
+ class MultiColumnSetSearchAdapter {
public:
- RegionSearchAdapter(LayoutUnit offset)
+ MultiColumnSetSearchAdapter(LayoutUnit offset)
: m_offset(offset)
, m_result(0)
{
@@ -147,11 +154,11 @@ protected:
const LayoutUnit& highValue() const { return m_offset; }
void collectIfNeeded(const MultiColumnSetInterval&);
- RenderRegion* result() const { return m_result; }
+ RenderMultiColumnSet* result() const { return m_result; }
private:
LayoutUnit m_offset;
- RenderRegion* m_result;
+ RenderMultiColumnSet* m_result;
};
// Stack of objects that pushed a LayoutState object on the RenderView. The
« no previous file with comments | « Source/core/rendering/RenderBlockFlow.cpp ('k') | Source/core/rendering/RenderFlowThread.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698