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

Unified Diff: sky/engine/core/rendering/RenderBlockFlow.cpp

Issue 706953003: Delete unused methods/arguments from RenderBlockFlow. (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/RenderBlockFlow.h ('k') | sky/engine/core/rendering/RenderBlockLineLayout.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/RenderBlockFlow.cpp
diff --git a/sky/engine/core/rendering/RenderBlockFlow.cpp b/sky/engine/core/rendering/RenderBlockFlow.cpp
index 250e72d0a32fc34af088aeb7a8345e5dc18c6986..9a25aaea73e673cc1e3e2e5cdb92e470d702a556 100644
--- a/sky/engine/core/rendering/RenderBlockFlow.cpp
+++ b/sky/engine/core/rendering/RenderBlockFlow.cpp
@@ -192,7 +192,7 @@ void RenderBlockFlow::adjustPositionedBlock(RenderBox* child)
bool hasStaticBlockPosition = child->style()->hasStaticBlockPosition();
LayoutUnit logicalTop = logicalHeight();
- updateStaticInlinePositionForChild(child, logicalTop);
+ updateStaticInlinePositionForChild(child);
RenderLayer* childLayer = child->layer();
if (childLayer->staticBlockPosition() != logicalTop) {
@@ -215,10 +215,10 @@ void RenderBlockFlow::deleteLineBoxTree()
m_lineBoxes.deleteLineBoxTree();
}
-void RenderBlockFlow::updateStaticInlinePositionForChild(RenderBox* child, LayoutUnit logicalTop)
+void RenderBlockFlow::updateStaticInlinePositionForChild(RenderBox* child)
{
if (child->style()->isOriginalDisplayInlineType())
- setStaticInlinePositionForChild(child, startAlignedOffsetForLine(logicalTop, false));
+ setStaticInlinePositionForChild(child, startAlignedOffsetForLine(false));
else
setStaticInlinePositionForChild(child, startOffsetForContent());
}
@@ -233,13 +233,6 @@ void RenderBlockFlow::addChild(RenderObject* newChild, RenderObject* beforeChild
RenderBlock::addChild(newChild, beforeChild);
}
-void RenderBlockFlow::moveAllChildrenIncludingFloatsTo(RenderBlock* toBlock, bool fullRemoveInsert)
-{
- // FIXME(sky): Merge this into callers.
- RenderBlockFlow* toBlockFlow = toRenderBlockFlow(toBlock);
- moveAllChildrenTo(toBlockFlow, fullRemoveInsert);
-}
-
void RenderBlockFlow::invalidatePaintForOverflow()
{
// FIXME: We could tighten up the left and right invalidation points if we let layoutInlineChildren fill them in based off the particular lines
@@ -276,63 +269,6 @@ void RenderBlockFlow::invalidatePaintForOverflow()
m_paintInvalidationLogicalBottom = 0;
}
-void RenderBlockFlow::paintFloats(PaintInfo& paintInfo, const LayoutPoint& paintOffset, bool preservePhase)
-{
- // FIXME(sky): Remove this.
-}
-
-LayoutUnit RenderBlockFlow::logicalLeftOffsetForPositioningFloat(LayoutUnit logicalTop, LayoutUnit fixedOffset, bool applyTextIndent, LayoutUnit* heightRemaining) const
-{
- // FIXME(sky): Remove this.
- LayoutUnit offset = fixedOffset;
- return adjustLogicalLeftOffsetForLine(offset, applyTextIndent);
-}
-
-LayoutUnit RenderBlockFlow::logicalRightOffsetForPositioningFloat(LayoutUnit logicalTop, LayoutUnit fixedOffset, bool applyTextIndent, LayoutUnit* heightRemaining) const
-{
- // FIXME(sky): Remove this.
- LayoutUnit offset = fixedOffset;
- return adjustLogicalRightOffsetForLine(offset, applyTextIndent);
-}
-
-LayoutUnit RenderBlockFlow::adjustLogicalLeftOffsetForLine(LayoutUnit offsetFromFloats, bool applyTextIndent) const
-{
- LayoutUnit left = offsetFromFloats;
-
- if (applyTextIndent && style()->isLeftToRightDirection())
- left += textIndentOffset();
-
- return left;
-}
-
-LayoutUnit RenderBlockFlow::adjustLogicalRightOffsetForLine(LayoutUnit offsetFromFloats, bool applyTextIndent) const
-{
- LayoutUnit right = offsetFromFloats;
-
- if (applyTextIndent && !style()->isLeftToRightDirection())
- right -= textIndentOffset();
-
- return right;
-}
-
-bool RenderBlockFlow::hitTestFloats(const HitTestRequest& request, HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset)
-{
- // FIXME(sky): Remove this.
- return false;
-}
-
-LayoutUnit RenderBlockFlow::logicalLeftFloatOffsetForLine(LayoutUnit logicalTop, LayoutUnit fixedOffset, LayoutUnit logicalHeight) const
-{
- // FIXME(sky): remove this.
- return fixedOffset;
-}
-
-LayoutUnit RenderBlockFlow::logicalRightFloatOffsetForLine(LayoutUnit logicalTop, LayoutUnit fixedOffset, LayoutUnit logicalHeight) const
-{
- // FIXME(sky): remove this.
- return fixedOffset;
-}
-
GapRects RenderBlockFlow::inlineSelectionGaps(RenderBlock* rootBlock, const LayoutPoint& rootBlockPhysicalPosition, const LayoutSize& offsetFromRootBlock,
LayoutUnit& lastLogicalTop, LayoutUnit& lastLogicalLeft, LayoutUnit& lastLogicalRight, const PaintInfo* paintInfo)
{
@@ -390,7 +326,7 @@ GapRects RenderBlockFlow::inlineSelectionGaps(RenderBlock* rootBlock, const Layo
LayoutUnit RenderBlockFlow::logicalLeftSelectionOffset(RenderBlock* rootBlock, LayoutUnit position)
{
- LayoutUnit logicalLeft = logicalLeftOffsetForLine(position, false);
+ LayoutUnit logicalLeft = logicalLeftOffsetForLine(false);
if (logicalLeft == logicalLeftOffsetForContent())
return RenderBlock::logicalLeftSelectionOffset(rootBlock, position);
@@ -404,7 +340,7 @@ LayoutUnit RenderBlockFlow::logicalLeftSelectionOffset(RenderBlock* rootBlock, L
LayoutUnit RenderBlockFlow::logicalRightSelectionOffset(RenderBlock* rootBlock, LayoutUnit position)
{
- LayoutUnit logicalRight = logicalRightOffsetForLine(position, false);
+ LayoutUnit logicalRight = logicalRightOffsetForLine(false);
if (logicalRight == logicalRightOffsetForContent())
return RenderBlock::logicalRightSelectionOffset(rootBlock, position);
« no previous file with comments | « sky/engine/core/rendering/RenderBlockFlow.h ('k') | sky/engine/core/rendering/RenderBlockLineLayout.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698