Index: Source/core/rendering/RenderFlowThread.h |
diff --git a/Source/core/rendering/RenderFlowThread.h b/Source/core/rendering/RenderFlowThread.h |
index 3e8236b2064e8259a876c88dce8f71e2e14ad43c..96010d954efbc2d4aa4234c2b656c0ef30befb6e 100644 |
--- a/Source/core/rendering/RenderFlowThread.h |
+++ b/Source/core/rendering/RenderFlowThread.h |
@@ -67,11 +67,6 @@ public: |
virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) OVERRIDE FINAL; |
- void removeFlowChildInfo(RenderObject*); |
-#ifndef NDEBUG |
- bool hasChildInfo(RenderObject* child) const { return child && child->isBox() && m_regionRangeMap.contains(toRenderBox(child)); } |
-#endif |
- |
virtual void addRegionToThread(RenderRegion*); |
virtual void removeRegionFromThread(RenderRegion*); |
const RenderRegionList& renderRegionList() const { return m_regionList; } |
@@ -79,14 +74,7 @@ public: |
virtual void updateLogicalWidth() OVERRIDE FINAL; |
virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const OVERRIDE; |
- void paintFlowThreadPortionInRegion(PaintInfo&, RenderRegion*, const LayoutRect& flowThreadPortionRect, const LayoutRect& flowThreadPortionOverflowRect, const LayoutPoint&) const; |
- bool hitTestFlowThreadPortionInRegion(RenderRegion*, const LayoutRect& flowThreadPortionRect, const LayoutRect& flowThreadPortionOverflowRect, const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset) const; |
- |
bool hasRegions() const { return m_regionList.size(); } |
- // Check if the content is flown into at least a region with region styling rules. |
- bool hasRegionsWithStyling() const { return m_hasRegionsWithStyling; } |
- void checkRegionsWithStyling(); |
- virtual void regionChangedWritingMode(RenderRegion*) { } |
void validateRegions(); |
void invalidateRegions(); |
@@ -94,8 +82,6 @@ public: |
static PassRefPtr<RenderStyle> createFlowThreadStyle(RenderStyle* parentStyle); |
- virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE; |
- |
void repaintRectangleInRegions(const LayoutRect&) const; |
LayoutPoint adjustedPositionRelativeToOffsetParent(const RenderBoxModelObject&, const LayoutPoint&); |
@@ -116,18 +102,10 @@ public: |
RenderRegion* regionFromAbsolutePointAndBox(IntPoint, const RenderBox* flowedBox); |
- bool regionsHaveUniformLogicalWidth() const { return m_regionsHaveUniformLogicalWidth; } |
bool regionsHaveUniformLogicalHeight() const { return m_regionsHaveUniformLogicalHeight; } |
RenderRegion* mapFromFlowToRegion(TransformState&) const; |
- void removeRenderBoxRegionInfo(RenderBox*); |
- bool logicalWidthChangedInRegionsForBlock(const RenderBlock*); |
- |
- LayoutUnit contentLogicalWidthOfFirstRegion() const; |
- LayoutUnit contentLogicalHeightOfFirstRegion() const; |
- LayoutUnit contentLogicalLeftOfFirstRegion() const; |
- |
RenderRegion* firstRegion() const; |
RenderRegion* lastRegion() const; |
@@ -137,37 +115,14 @@ public: |
void setRegionRangeForBox(const RenderBox*, LayoutUnit offsetFromLogicalTopOfFirstPage); |
void getRegionRangeForBox(const RenderBox*, RenderRegion*& startRegion, RenderRegion*& endRegion) const; |
- void clearRenderObjectCustomStyle(const RenderObject*, |
- const RenderRegion* oldStartRegion = 0, const RenderRegion* oldEndRegion = 0, |
- const RenderRegion* newStartRegion = 0, const RenderRegion* newEndRegion = 0); |
- |
- // Check if the object is in region and the region is part of this flow thread. |
- bool objectInFlowRegion(const RenderObject*, const RenderRegion*) const; |
- |
- void markAutoLogicalHeightRegionsForLayout(); |
- |
- virtual bool addForcedRegionBreak(LayoutUnit, RenderObject* breakChild, bool isBefore, LayoutUnit* offsetBreakAdjustment = 0); |
+ virtual bool addForcedRegionBreak(LayoutUnit, RenderObject* breakChild, bool isBefore, LayoutUnit* offsetBreakAdjustment = 0) { return false; } |
void applyBreakAfterContent(LayoutUnit); |
bool pageLogicalSizeChanged() const { return m_pageLogicalSizeChanged; } |
- bool hasAutoLogicalHeightRegions() const { ASSERT(isAutoLogicalHeightRegionsCountConsistent()); return m_autoLogicalHeightRegionsCount; } |
- void incrementAutoLogicalHeightRegions(); |
- void decrementAutoLogicalHeightRegions(); |
- |
-#ifndef NDEBUG |
- bool isAutoLogicalHeightRegionsCountConsistent() const; |
-#endif |
- |
void collectLayerFragments(LayerFragments&, const LayoutRect& layerBoundingBox, const LayoutRect& dirtyRect); |
LayoutRect fragmentsBoundingBox(const LayoutRect& layerBoundingBox); |
- void setInConstrainedLayoutPhase(bool value) { m_inConstrainedLayoutPhase = value; } |
- bool inConstrainedLayoutPhase() const { return m_inConstrainedLayoutPhase; } |
- |
- bool needsTwoPhasesLayout() const { return m_needsTwoPhasesLayout; } |
- void clearNeedsTwoPhasesLayout() { m_needsTwoPhasesLayout = false; } |
- |
void pushFlowThreadLayoutState(const RenderObject*); |
void popFlowThreadLayoutState(); |
LayoutUnit offsetFromLogicalTopOfFirstRegion(const RenderBlock*) const; |
@@ -184,24 +139,12 @@ protected: |
virtual void mapLocalToContainer(const RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0) const OVERRIDE FINAL; |
- void updateRegionsFlowThreadPortionRect(const RenderRegion* = 0); |
+ void updateRegionsFlowThreadPortionRect(); |
bool shouldRepaint(const LayoutRect&) const; |
bool regionInRange(const RenderRegion* targetRegion, const RenderRegion* startRegion, const RenderRegion* endRegion) const; |
LayoutRect computeRegionClippingRect(const LayoutPoint&, const LayoutRect&, const LayoutRect&) const; |
- void setDispatchRegionLayoutUpdateEvent(bool value) { m_dispatchRegionLayoutUpdateEvent = value; } |
- bool shouldDispatchRegionLayoutUpdateEvent() { return m_dispatchRegionLayoutUpdateEvent; } |
- |
- void setDispatchRegionOversetChangeEvent(bool value) { m_dispatchRegionOversetChangeEvent = value; } |
- bool shouldDispatchRegionOversetChangeEvent() const { return m_dispatchRegionOversetChangeEvent; } |
- |
- // Override if the flow thread implementation supports dispatching events when the flow layout is updated (e.g. for named flows) |
- virtual void dispatchRegionLayoutUpdateEvent() { m_dispatchRegionLayoutUpdateEvent = false; } |
- virtual void dispatchRegionOversetChangeEvent() { m_dispatchRegionOversetChangeEvent = false; } |
- |
- void initializeRegionsComputedAutoHeight(RenderRegion* = 0); |
- |
virtual void autoGenerateRegionsToBlockOffset(LayoutUnit) { }; |
bool cachedOffsetFromLogicalTopOfFirstRegion(const RenderBox*, LayoutUnit&) const; |
@@ -265,10 +208,6 @@ protected: |
typedef HashMap<const RenderBox*, RenderRegionRange> RenderRegionRangeMap; |
RenderRegionRangeMap m_regionRangeMap; |
- typedef HashMap<RenderObject*, RenderRegion*> RenderObjectToRegionMap; |
- RenderObjectToRegionMap m_breakBeforeToRegionMap; |
- RenderObjectToRegionMap m_breakAfterToRegionMap; |
- |
// Stack of objects that pushed a LayoutState object on the RenderView. The |
// objects on the stack are the ones that are curently in the process of being |
// laid out. |
@@ -276,19 +215,11 @@ protected: |
typedef HashMap<const RenderBox*, LayoutUnit> RenderBoxToOffsetMap; |
RenderBoxToOffsetMap m_boxesToOffsetMap; |
- unsigned m_autoLogicalHeightRegionsCount; |
- |
RegionIntervalTree m_regionIntervalTree; |
bool m_regionsInvalidated : 1; |
- bool m_regionsHaveUniformLogicalWidth : 1; |
bool m_regionsHaveUniformLogicalHeight : 1; |
- bool m_hasRegionsWithStyling : 1; |
- bool m_dispatchRegionLayoutUpdateEvent : 1; |
- bool m_dispatchRegionOversetChangeEvent : 1; |
bool m_pageLogicalSizeChanged : 1; |
- bool m_inConstrainedLayoutPhase : 1; |
- bool m_needsTwoPhasesLayout : 1; |
private: |
virtual bool supportsPartialLayout() const OVERRIDE FINAL { return false; } |