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

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

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/RenderObject.h ('k') | sky/engine/core/rendering/style/RenderStyle.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/RenderObject.cpp
diff --git a/sky/engine/core/rendering/RenderObject.cpp b/sky/engine/core/rendering/RenderObject.cpp
index 1d85606838161ef4eebb8f1bf4aa09113806bbfc..fd89537b0d00461ceb42e0a5b0b156f6a60e718a 100644
--- a/sky/engine/core/rendering/RenderObject.cpp
+++ b/sky/engine/core/rendering/RenderObject.cpp
@@ -1863,14 +1863,7 @@ void RenderObject::propagateStyleToAnonymousChildren(bool blockChildrenOnly)
continue;
RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyleWithDisplay(style(), child->style()->display());
-
- // Preserve the position style of anonymous block continuations as they can have relative position when
- // they contain block descendants of relative positioned inlines.
- if (child->isRelPositioned() && toRenderBlock(child)->isAnonymousBlockContinuation())
- newStyle->setPosition(child->style()->position());
-
updateAnonymousChildStyle(child, newStyle.get());
-
child->setStyle(newStyle.release());
}
}
@@ -2217,9 +2210,6 @@ void RenderObject::destroyAndCleanupAnonymousWrappers()
RenderObject* destroyRoot = this;
for (RenderObject* destroyRootParent = destroyRoot->parent(); destroyRootParent && destroyRootParent->isAnonymous(); destroyRoot = destroyRootParent, destroyRootParent = destroyRootParent->parent()) {
- // Anonymous block continuations are tracked and destroyed elsewhere (see the bottom of RenderBlock::removeChild)
- if (destroyRootParent->isRenderBlock() && toRenderBlock(destroyRootParent)->isAnonymousBlockContinuation())
- break;
if (destroyRootParent->slowFirstChild() != this || destroyRootParent->slowLastChild() != this)
break;
}
@@ -2379,8 +2369,6 @@ void RenderObject::getTextDecorations(unsigned decorations, AppliedTextDecoratio
}
}
curr = curr->parent();
- if (curr && curr->isAnonymousBlock() && toRenderBlock(curr)->continuation())
- curr = toRenderBlock(curr)->continuation();
} while (curr && decorations && (!quirksMode || !curr->node() || (!isHTMLAnchorElement(*curr->node()))));
// If we bailed out, use the element we bailed out at (typically a <font> or <a> element).
« no previous file with comments | « sky/engine/core/rendering/RenderObject.h ('k') | sky/engine/core/rendering/style/RenderStyle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698