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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp

Issue 1974323002: Move inlineElementContinuation() to LayoutBlockFlow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Code review. Created 4 years, 7 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
Index: third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp b/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp
index 93006b57f0f2b93a98b286d2d2687c01b6b2991f..53f927924bde1305ce1797ab6daa42d348176ceb 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp
@@ -532,22 +532,6 @@ void LayoutBoxModelObject::updateFromStyle()
setHorizontalWritingMode(styleToUse.isHorizontalWritingMode());
}
-static LayoutSize accumulateInFlowPositionOffsets(const LayoutObject* child)
-{
- if (!child->isAnonymousBlock() || !child->isInFlowPositioned())
- return LayoutSize();
- LayoutSize offset;
- LayoutObject* p = toLayoutBlock(child)->inlineElementContinuation();
- while (p && p->isLayoutInline()) {
- if (p->isInFlowPositioned()) {
- LayoutInline* layoutInline = toLayoutInline(p);
- offset += layoutInline->offsetForInFlowPosition();
- }
- p = p->parent();
- }
- return offset;
-}
-
LayoutBlock* LayoutBoxModelObject::containingBlockForAutoHeightDetection(Length logicalHeight) const
{
// For percentage heights: The percentage is calculated with respect to the height of the generated box's
@@ -598,7 +582,7 @@ bool LayoutBoxModelObject::hasAutoHeightOrContainingBlockWithAutoHeight() const
LayoutSize LayoutBoxModelObject::relativePositionOffset() const
{
- LayoutSize offset = accumulateInFlowPositionOffsets(this);
+ LayoutSize offset = accumulateInFlowPositionOffsets();
LayoutBlock* containingBlock = this->containingBlock();
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBoxModelObject.h ('k') | third_party/WebKit/Source/core/layout/LayoutInline.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698