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

Unified Diff: sky/engine/core/rendering/RenderBlock.h

Issue 734813004: Get rid of continuations. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 | « sky/engine/core/rendering/InlineFlowBox.cpp ('k') | sky/engine/core/rendering/RenderBlock.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/RenderBlock.h
diff --git a/sky/engine/core/rendering/RenderBlock.h b/sky/engine/core/rendering/RenderBlock.h
index 758cd5c8bfcc860a37567b917568f8c2739f7407..c055834faedcca4e36188a77efad306ba983a421 100644
--- a/sky/engine/core/rendering/RenderBlock.h
+++ b/sky/engine/core/rendering/RenderBlock.h
@@ -164,22 +164,9 @@ public:
int heightForLineCount(int);
void clearTruncation();
- void addContinuationWithOutline(RenderInline*);
- bool paintsContinuationOutline(RenderInline*);
-
- virtual RenderBoxModelObject* virtualContinuation() const override final { return continuation(); }
- bool isAnonymousBlockContinuation() const { return continuation() && isAnonymousBlock(); }
- RenderInline* inlineElementContinuation() const;
- RenderBlock* blockElementContinuation() const;
-
- using RenderBoxModelObject::continuation;
- using RenderBoxModelObject::setContinuation;
-
static RenderBlock* createAnonymousWithParentRendererAndDisplay(const RenderObject*, EDisplay = PARAGRAPH);
RenderBlock* createAnonymousBlock(EDisplay display = PARAGRAPH) const { return createAnonymousWithParentRendererAndDisplay(this, display); }
- virtual RenderBox* createAnonymousBoxWithSameTypeAs(const RenderObject* parent) const override;
-
// Accessors for logical width/height and margins in the containing block's block-flow direction.
LayoutUnit logicalWidthForChild(const RenderBox* child) const { return child->width(); }
LayoutUnit logicalHeightForChild(const RenderBox* child) const { return child->height(); }
@@ -303,16 +290,11 @@ private:
virtual void dirtyLinesFromChangedChild(RenderObject* child) override final { m_lineBoxes.dirtyLinesFromChangedChild(this, child); }
- void addChildToContinuation(RenderObject* newChild, RenderObject* beforeChild);
- virtual void addChildIgnoringContinuation(RenderObject* newChild, RenderObject* beforeChild) override;
-
void addChildIgnoringAnonymousColumnBlocks(RenderObject* newChild, RenderObject* beforeChild = 0);
void insertIntoTrackedRendererMaps(RenderBox* descendant, TrackedDescendantsMap*&, TrackedContainerMap*&);
static void removeFromTrackedRendererMaps(RenderBox* descendant, TrackedDescendantsMap*&, TrackedContainerMap*&);
- Node* nodeForHitTest() const;
-
void paintContents(PaintInfo&, const LayoutPoint&);
void paintSelection(PaintInfo&, const LayoutPoint&);
void paintCarets(PaintInfo&, const LayoutPoint&);
@@ -327,11 +309,6 @@ private:
// children.
virtual RenderBlock* firstLineBlock() const override;
- virtual LayoutRect rectWithOutlineForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer, LayoutUnit outlineWidth, const PaintInvalidationState* = 0) const override final;
-
- virtual RenderObject* hoverAncestor() const override final;
- virtual void childBecameNonInline(RenderObject* child) override final;
-
virtual LayoutRect selectionRectForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer, bool /*clipToVisibleContent*/) override final
{
return selectionGapRectsForPaintInvalidation(paintInvalidationContainer);
@@ -349,8 +326,6 @@ private:
virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const override;
virtual void absoluteQuads(Vector<FloatQuad>&) const override;
- void paintContinuationOutlines(PaintInfo&, const LayoutPoint&);
-
virtual LayoutRect localCaretRect(InlineBox*, int caretOffset, LayoutUnit* extraWidthToEndOfLine = 0) override final;
void markLinesDirtyInBlockRange(LayoutUnit logicalTop, LayoutUnit logicalBottom, RootInlineBox* highest = 0);
@@ -358,11 +333,6 @@ private:
Position positionForBox(InlineBox*, bool start = true) const;
PositionWithAffinity positionForPointWithInlineChildren(const LayoutPoint&);
- void splitBlocks(RenderBlock* fromBlock, RenderBlock* toBlock, RenderBlock* middleBlock,
- RenderObject* beforeChild, RenderBoxModelObject* oldCont);
- RenderBlock* clone() const;
- RenderBlock* continuationBefore(RenderObject* beforeChild);
-
// End helper functions and structs used by layoutBlockChildren.
void removeFromGlobalMaps();
« no previous file with comments | « sky/engine/core/rendering/InlineFlowBox.cpp ('k') | sky/engine/core/rendering/RenderBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698