Index: Source/core/rendering/RenderObject.cpp |
diff --git a/Source/core/rendering/RenderObject.cpp b/Source/core/rendering/RenderObject.cpp |
index b472dc13930b530acdb9795dee3ceedac5be7fcf..d894df9529a3e2800f5bc00bbea3323b5ee7de4a 100644 |
--- a/Source/core/rendering/RenderObject.cpp |
+++ b/Source/core/rendering/RenderObject.cpp |
@@ -56,6 +56,7 @@ |
#include "core/rendering/RenderCounter.h" |
#include "core/rendering/RenderDeprecatedFlexibleBox.h" |
#include "core/rendering/RenderFlexibleBox.h" |
+#include "core/rendering/RenderFlowThread.h" |
#include "core/rendering/RenderGeometryMap.h" |
#include "core/rendering/RenderGrid.h" |
#include "core/rendering/RenderImage.h" |
@@ -66,8 +67,6 @@ |
#include "core/rendering/RenderListItem.h" |
#include "core/rendering/RenderMarquee.h" |
#include "core/rendering/RenderMultiColumnBlock.h" |
-#include "core/rendering/RenderNamedFlowThread.h" |
-#include "core/rendering/RenderRegion.h" |
#include "core/rendering/RenderRuby.h" |
#include "core/rendering/RenderRubyText.h" |
#include "core/rendering/RenderScrollbarPart.h" |
@@ -622,15 +621,6 @@ RenderFlowThread* RenderObject::locateFlowThreadContainingBlock() const |
return 0; |
} |
-RenderNamedFlowThread* RenderObject::renderNamedFlowThreadWrapper() const |
-{ |
- RenderObject* object = const_cast<RenderObject*>(this); |
- while (object && object->isAnonymousBlock() && !object->isRenderNamedFlowThread()) |
- object = object->parent(); |
- |
- return object && object->isRenderNamedFlowThread() ? toRenderNamedFlowThread(object) : 0; |
-} |
- |
RenderBlock* RenderObject::firstLineBlock() const |
{ |
return 0; |
@@ -2573,18 +2563,6 @@ void RenderObject::willBeDestroyed() |
if (AXObjectCache* cache = document().existingAXObjectCache()) |
cache->remove(this); |
-#ifndef NDEBUG |
- if (!documentBeingDestroyed() && view() && view()->hasRenderNamedFlowThreads()) { |
- // After remove, the object and the associated information should not be in any flow thread. |
- const RenderNamedFlowThreadList* flowThreadList = view()->flowThreadController()->renderNamedFlowThreadList(); |
- for (RenderNamedFlowThreadList::const_iterator iter = flowThreadList->begin(); iter != flowThreadList->end(); ++iter) { |
- const RenderNamedFlowThread* renderFlowThread = *iter; |
- ASSERT(!renderFlowThread->hasChild(this)); |
- ASSERT(!renderFlowThread->hasChildInfo(this)); |
- } |
- } |
-#endif |
- |
// If this renderer had a parent, remove should have destroyed any counters |
// attached to this renderer and marked the affected other counters for |
// reevaluation. This apparently redundant check is here for the case when |
@@ -2621,9 +2599,6 @@ void RenderObject::insertedIntoTree() |
if (!isFloating() && parent()->childrenInline()) |
parent()->dirtyLinesFromChangedChild(this); |
- |
- if (RenderNamedFlowThread* containerFlowThread = parent()->renderNamedFlowThreadWrapper()) |
- containerFlowThread->addFlowChild(this); |
} |
void RenderObject::willBeRemovedFromTree() |
@@ -2649,9 +2624,6 @@ void RenderObject::willBeRemovedFromTree() |
removeFromRenderFlowThread(); |
- if (RenderNamedFlowThread* containerFlowThread = parent()->renderNamedFlowThreadWrapper()) |
- containerFlowThread->removeFlowChild(this); |
- |
// Update cached boundaries in SVG renderers if a child is removed. |
if (parent()->isSVG()) |
parent()->setNeedsBoundariesUpdate(); |
@@ -2676,11 +2648,6 @@ void RenderObject::removeFromRenderFlowThreadRecursive(RenderFlowThread* renderF |
child->removeFromRenderFlowThreadRecursive(renderFlowThread); |
} |
- RenderFlowThread* localFlowThread = renderFlowThread; |
- if (flowThreadState() == InsideInFlowThread) |
- localFlowThread = flowThreadContainingBlock(); // We have to ask. We can't just assume we are in the same flow thread. |
- if (localFlowThread) |
- localFlowThread->removeFlowChildInfo(this); |
setFlowThreadState(NotInsideFlowThread); |
} |
@@ -3143,33 +3110,6 @@ void RenderObject::imageChanged(ImageResource* image, const IntRect* rect) |
imageChanged(static_cast<WrappedImagePtr>(image), rect); |
} |
-RenderObject* RenderObject::hoverAncestor() const |
-{ |
- // When searching for the hover ancestor and encountering a named flow thread, |
- // the search will continue with the DOM ancestor of the top-most element |
- // in the named flow thread. |
- // See https://code.google.com/p/chromium/issues/detail?id=243278 |
- RenderObject* hoverAncestor = parent(); |
- |
- // Skip anonymous blocks directly flowed into flow threads as it would |
- // prevent us from continuing the search on the DOM tree when reaching the named flow thread. |
- if (hoverAncestor && hoverAncestor->isAnonymousBlock() && hoverAncestor->parent() && hoverAncestor->parent()->isRenderNamedFlowThread()) |
- hoverAncestor = hoverAncestor->parent(); |
- |
- if (hoverAncestor && hoverAncestor->isRenderNamedFlowThread()) { |
- hoverAncestor = 0; |
- |
- Node* node = this->node(); |
- if (node) { |
- Node* domAncestorNode = node->parentNode(); |
- if (domAncestorNode) |
- hoverAncestor = domAncestorNode->renderer(); |
- } |
- } |
- |
- return hoverAncestor; |
-} |
- |
Element* RenderObject::offsetParent() const |
{ |
if (isRoot() || isBody()) |
@@ -3187,10 +3127,6 @@ Element* RenderObject::offsetParent() const |
for (RenderObject* ancestor = parent(); ancestor; ancestor = ancestor->parent()) { |
// Spec: http://www.w3.org/TR/cssom-view/#offset-attributes |
- // CSS regions specification says that region flows should return the body element as their offsetParent. |
- if (ancestor->isRenderNamedFlowThread()) |
- return document().body(); |
- |
node = ancestor->node(); |
if (!node) |
@@ -3348,11 +3284,6 @@ bool RenderObject::isRelayoutBoundaryForInspector() const |
return objectIsRelayoutBoundary(this); |
} |
-bool RenderObject::isRenderNamedFlowFragmentContainer() const |
-{ |
- return isRenderBlockFlow() && toRenderBlockFlow(this)->renderNamedFlowFragment(); |
-} |
- |
} // namespace WebCore |
#ifndef NDEBUG |