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

Unified Diff: Source/core/rendering/RenderObjectChildList.cpp

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 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
« no previous file with comments | « Source/core/rendering/RenderObjectChildList.h ('k') | Source/core/rendering/RenderObjectInlines.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderObjectChildList.cpp
diff --git a/Source/core/rendering/RenderObjectChildList.cpp b/Source/core/rendering/RenderObjectChildList.cpp
deleted file mode 100644
index 88068765015b38282be6191bd0dff43572a2999c..0000000000000000000000000000000000000000
--- a/Source/core/rendering/RenderObjectChildList.cpp
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright (C) 2009, 2010 Apple Inc. All rights reserved.
- * Copyright (C) Research In Motion Limited 2010. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "core/rendering/RenderObjectChildList.h"
-
-#include "core/dom/AXObjectCache.h"
-#include "core/layout/Layer.h"
-#include "core/layout/LayoutCounter.h"
-#include "core/rendering/RenderObject.h"
-#include "core/rendering/RenderView.h"
-#include "core/rendering/style/RenderStyle.h"
-
-namespace blink {
-
-void RenderObjectChildList::destroyLeftoverChildren()
-{
- while (firstChild()) {
- // List markers are owned by their enclosing list and so don't get destroyed by this container.
- if (firstChild()->isListMarker()) {
- firstChild()->remove();
- continue;
- }
-
- // Destroy any anonymous children remaining in the render tree, as well as implicit (shadow) DOM elements like those used in the engine-based text fields.
- if (firstChild()->node())
- firstChild()->node()->setRenderer(0);
- firstChild()->destroy();
- }
-}
-
-RenderObject* RenderObjectChildList::removeChildNode(RenderObject* owner, RenderObject* oldChild, bool notifyRenderer)
-{
- ASSERT(oldChild->parent() == owner);
- ASSERT(this == owner->virtualChildren());
-
- if (oldChild->isFloatingOrOutOfFlowPositioned())
- toRenderBox(oldChild)->removeFloatingOrPositionedChildFromBlockLists();
-
- {
- // FIXME: We should not be allowing paint invalidation during layout. crbug.com/336250
- AllowPaintInvalidationScope scoper(owner->frameView());
-
- // So that we'll get the appropriate dirty bit set (either that a normal flow child got yanked or
- // that a positioned child got yanked). We also issue paint invalidations, so that the area exposed when the child
- // disappears gets paint invalidated properly.
- if (!owner->documentBeingDestroyed() && notifyRenderer && oldChild->everHadLayout()) {
- oldChild->setNeedsLayoutAndPrefWidthsRecalc();
- invalidatePaintOnRemoval(*oldChild);
- }
- }
-
- // If we have a line box wrapper, delete it.
- if (oldChild->isBox())
- toRenderBox(oldChild)->deleteLineBoxWrapper();
-
- // If oldChild is the start or end of the selection, then clear the selection to
- // avoid problems of invalid pointers.
- // FIXME: The FrameSelection should be responsible for this when it
- // is notified of DOM mutations.
- if (!owner->documentBeingDestroyed() && oldChild->isSelectionBorder())
- owner->view()->clearSelection();
-
- if (!owner->documentBeingDestroyed() && notifyRenderer)
- oldChild->willBeRemovedFromTree();
-
- // WARNING: There should be no code running between willBeRemovedFromTree and the actual removal below.
- // This is needed to avoid race conditions where willBeRemovedFromTree would dirty the tree's structure
- // and the code running here would force an untimely rebuilding, leaving |oldChild| dangling.
-
- if (oldChild->previousSibling())
- oldChild->previousSibling()->setNextSibling(oldChild->nextSibling());
- if (oldChild->nextSibling())
- oldChild->nextSibling()->setPreviousSibling(oldChild->previousSibling());
-
- if (firstChild() == oldChild)
- setFirstChild(oldChild->nextSibling());
- if (lastChild() == oldChild)
- setLastChild(oldChild->previousSibling());
-
- oldChild->setPreviousSibling(0);
- oldChild->setNextSibling(0);
- oldChild->setParent(0);
-
- // rendererRemovedFromTree walks the whole subtree. We can improve performance
- // by skipping this step when destroying the entire tree.
- if (!owner->documentBeingDestroyed())
- LayoutCounter::rendererRemovedFromTree(oldChild);
-
- if (AXObjectCache* cache = owner->document().existingAXObjectCache())
- cache->childrenChanged(owner);
-
- return oldChild;
-}
-
-void RenderObjectChildList::insertChildNode(RenderObject* owner, RenderObject* newChild, RenderObject* beforeChild, bool notifyRenderer)
-{
- ASSERT(!newChild->parent());
- ASSERT(this == owner->virtualChildren());
- ASSERT(!owner->isRenderBlockFlow() || (!newChild->isTableSection() && !newChild->isTableRow() && !newChild->isTableCell()));
-
- while (beforeChild && beforeChild->parent() && beforeChild->parent() != owner)
- beforeChild = beforeChild->parent();
-
- // This should never happen, but if it does prevent render tree corruption
- // where child->parent() ends up being owner but child->nextSibling()->parent()
- // is not owner.
- if (beforeChild && beforeChild->parent() != owner) {
- ASSERT_NOT_REACHED();
- return;
- }
-
- newChild->setParent(owner);
-
- if (firstChild() == beforeChild)
- setFirstChild(newChild);
-
- if (beforeChild) {
- RenderObject* previousSibling = beforeChild->previousSibling();
- if (previousSibling)
- previousSibling->setNextSibling(newChild);
- newChild->setPreviousSibling(previousSibling);
- newChild->setNextSibling(beforeChild);
- beforeChild->setPreviousSibling(newChild);
- } else {
- if (lastChild())
- lastChild()->setNextSibling(newChild);
- newChild->setPreviousSibling(lastChild());
- setLastChild(newChild);
- }
-
- if (!owner->documentBeingDestroyed() && notifyRenderer)
- newChild->insertedIntoTree();
-
- if (!owner->documentBeingDestroyed()) {
- LayoutCounter::rendererSubtreeAttached(newChild);
- }
-
- newChild->setNeedsLayoutAndPrefWidthsRecalc();
- newChild->setShouldDoFullPaintInvalidation(PaintInvalidationRendererInsertion);
- if (!owner->normalChildNeedsLayout())
- owner->setChildNeedsLayout(); // We may supply the static position for an absolute positioned child.
-
- if (AXObjectCache* cache = owner->document().axObjectCache())
- cache->childrenChanged(owner);
-}
-
-void RenderObjectChildList::invalidatePaintOnRemoval(const RenderObject& oldChild)
-{
- if (!oldChild.isRooted())
- return;
- if (oldChild.isBody()) {
- oldChild.view()->setShouldDoFullPaintInvalidation();
- return;
- }
- DisableCompositingQueryAsserts disabler;
- oldChild.invalidatePaintUsingContainer(oldChild.containerForPaintInvalidation(), oldChild.previousPaintInvalidationRect(), PaintInvalidationRendererRemoval);
-}
-
-} // namespace blink
« no previous file with comments | « Source/core/rendering/RenderObjectChildList.h ('k') | Source/core/rendering/RenderObjectInlines.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698