Diff
Modified: trunk/Source/WebCore/ChangeLog (88475 => 88476)
--- trunk/Source/WebCore/ChangeLog 2011-06-09 20:05:51 UTC (rev 88475)
+++ trunk/Source/WebCore/ChangeLog 2011-06-09 20:24:59 UTC (rev 88476)
@@ -1,3 +1,43 @@
+2011-06-09 Dimitri Glazkov <[email protected]>
+
+ Reviewed by Kent Tamura.
+
+ Fold isShadowBoundary into isShadowRoot.
+ https://bugs.webkit.org/show_bug.cgi?id=62317
+
+ Since there are no longer cases where Node::isShadowBoundary() != Node::isShadowRoot, we can remove this function.
+
+ In one case where isShadowBoundary was also tested to find ShadowContentElemnt, added a new isContentElement function.
+
+ Refactoring, covered by existing tests.
+
+ * css/CSSStyleSelector.cpp:
+ (WebCore::isAtShadowBoundary): Changed to use isShadowRoot.
+ * dom/Element.cpp:
+ (WebCore::Element::isSpellCheckingEnabled): Ditto.
+ * dom/Node.cpp:
+ (WebCore::Node::nonBoundaryShadowTreeRootNode): Ditto.
+ (WebCore::Node::nonShadowBoundaryParentNode): Ditto.
+ * dom/Node.h:
+ (WebCore::Node::isContentElement): Added.
+ * dom/NodeRenderingContext.cpp:
+ (WebCore::NodeRenderingContext::NodeRenderingContext): Changed to use isShadowRoot.
+ * dom/Position.cpp:
+ (WebCore::Position::Position): Ditto.
+ * dom/ShadowContentElement.h:
+ (WebCore::ShadowContentElement::isContentElement): Added.
+ * dom/ShadowRoot.cpp:
+ (WebCore::ShadowRoot::hasContentElement): Changed to use isContentElement.
+ * editing/CompositeEditCommand.cpp:
+ (WebCore::CompositeEditCommand::insertNodeAfter): Changed to use isShadowRoot.
+ * editing/htmlediting.cpp:
+ (WebCore::visiblePositionBeforeNode): Ditto.
+ (WebCore::visiblePositionAfterNode): Ditto.
+ * page/DragController.cpp:
+ (WebCore::asFileInput): Ditto.
+ * rendering/RenderTreeAsText.cpp:
+ (WebCore::nodePosition): Ditto.
+
2011-06-09 Simon Fraser <[email protected]>
Reviewed by Darin Adler.
Modified: trunk/Source/WebCore/css/CSSStyleSelector.cpp (88475 => 88476)
--- trunk/Source/WebCore/css/CSSStyleSelector.cpp 2011-06-09 20:05:51 UTC (rev 88475)
+++ trunk/Source/WebCore/css/CSSStyleSelector.cpp 2011-06-09 20:24:59 UTC (rev 88476)
@@ -1786,7 +1786,7 @@
return false;
ContainerNode* parentNode = element->parentNode();
- return parentNode && parentNode->isShadowBoundary();
+ return parentNode && parentNode->isShadowRoot();
}
void CSSStyleSelector::adjustRenderStyle(RenderStyle* style, RenderStyle* parentStyle, Element *e)
Modified: trunk/Source/WebCore/dom/Element.cpp (88475 => 88476)
--- trunk/Source/WebCore/dom/Element.cpp 2011-06-09 20:05:51 UTC (rev 88475)
+++ trunk/Source/WebCore/dom/Element.cpp 2011-06-09 20:24:59 UTC (rev 88476)
@@ -1952,7 +1952,7 @@
ContainerNode* parent = const_cast<Element*>(element)->parentOrHostNode();
if (parent && parent->isElementNode())
element = toElement(parent);
- else if (parent && parent->isShadowBoundary())
+ else if (parent && parent->isShadowRoot())
element = toElement(parent->parentOrHostNode());
else
element = 0;
Modified: trunk/Source/WebCore/dom/Node.cpp (88475 => 88476)
--- trunk/Source/WebCore/dom/Node.cpp 2011-06-09 20:05:51 UTC (rev 88475)
+++ trunk/Source/WebCore/dom/Node.cpp 2011-06-09 20:24:59 UTC (rev 88476)
@@ -1549,13 +1549,13 @@
Node* Node::nonBoundaryShadowTreeRootNode()
{
- ASSERT(!isShadowBoundary());
+ ASSERT(!isShadowRoot());
Node* root = this;
while (root) {
if (root->isShadowRoot() || root->isSVGShadowRoot())
return root;
Node* parent = root->parentNodeGuaranteedHostFree();
- if (parent && parent->isShadowBoundary())
+ if (parent && parent->isShadowRoot())
return root;
root = parent;
}
@@ -1565,7 +1565,7 @@
ContainerNode* Node::nonShadowBoundaryParentNode() const
{
ContainerNode* parent = parentNode();
- return parent && !parent->isShadowBoundary() ? parent : 0;
+ return parent && !parent->isShadowRoot() ? parent : 0;
}
bool Node::isInShadowTree()
Modified: trunk/Source/WebCore/dom/Node.h (88475 => 88476)
--- trunk/Source/WebCore/dom/Node.h 2011-06-09 20:05:51 UTC (rev 88475)
+++ trunk/Source/WebCore/dom/Node.h 2011-06-09 20:24:59 UTC (rev 88476)
@@ -211,8 +211,7 @@
virtual bool isCharacterDataNode() const { return false; }
bool isDocumentNode() const;
bool isShadowRoot() const { return getFlag(IsShadowRootFlag); }
- // FIXME: Remove this when all shadow roots are ShadowRoots.
- virtual bool isShadowBoundary() const { return false; }
+ virtual bool isContentElement() const { return false; }
virtual bool canHaveLightChildRendererWithShadow() const { return false; }
Node* shadowAncestorNode() const;
Modified: trunk/Source/WebCore/dom/NodeRenderingContext.cpp (88475 => 88476)
--- trunk/Source/WebCore/dom/NodeRenderingContext.cpp 2011-06-09 20:05:51 UTC (rev 88475)
+++ trunk/Source/WebCore/dom/NodeRenderingContext.cpp 2011-06-09 20:24:59 UTC (rev 88476)
@@ -46,7 +46,7 @@
if (!parent)
return;
- if (parent->isShadowBoundary()) {
+ if (parent->isShadowRoot()) {
m_location = LocationShadowChild;
m_parentNodeForRenderingAndStyle = parent->shadowHost();
return;
Modified: trunk/Source/WebCore/dom/Position.cpp (88475 => 88476)
--- trunk/Source/WebCore/dom/Position.cpp 2011-06-09 20:05:51 UTC (rev 88475)
+++ trunk/Source/WebCore/dom/Position.cpp 2011-06-09 20:24:59 UTC (rev 88476)
@@ -80,7 +80,7 @@
, m_anchorType(anchorTypeForLegacyEditingPosition(m_anchorNode.get(), m_offset))
, m_isLegacyEditingPosition(true)
{
- ASSERT(!m_anchorNode || !m_anchorNode->isShadowBoundary());
+ ASSERT(!m_anchorNode || !m_anchorNode->isShadowRoot());
}
Position::Position(PassRefPtr<Node> anchorNode, AnchorType anchorType)
@@ -89,7 +89,7 @@
, m_anchorType(anchorType)
, m_isLegacyEditingPosition(false)
{
- ASSERT(!m_anchorNode || !m_anchorNode->isShadowBoundary());
+ ASSERT(!m_anchorNode || !m_anchorNode->isShadowRoot());
ASSERT(anchorType != PositionIsOffsetInAnchor);
}
@@ -99,7 +99,7 @@
, m_anchorType(anchorType)
, m_isLegacyEditingPosition(false)
{
- ASSERT(!m_anchorNode || !editingIgnoresContent(m_anchorNode.get()) || !m_anchorNode->isShadowBoundary());
+ ASSERT(!m_anchorNode || !editingIgnoresContent(m_anchorNode.get()) || !m_anchorNode->isShadowRoot());
ASSERT(anchorType == PositionIsOffsetInAnchor);
}
Modified: trunk/Source/WebCore/dom/ShadowContentElement.h (88475 => 88476)
--- trunk/Source/WebCore/dom/ShadowContentElement.h 2011-06-09 20:05:51 UTC (rev 88475)
+++ trunk/Source/WebCore/dom/ShadowContentElement.h 2011-06-09 20:24:59 UTC (rev 88476)
@@ -49,9 +49,7 @@
virtual void attach();
private:
- // FIXME: This should be replaced with tag-name checking once <content> is ready.
- // See also http://webkit.org/b/56973
- virtual bool isShadowBoundary() const { return true; }
+ virtual bool isContentElement() const { return true; }
virtual bool rendererIsNeeded(const NodeRenderingContext&) { return false; }
virtual RenderObject* createRenderer(RenderArena*, RenderStyle*) { return 0; }
};
Modified: trunk/Source/WebCore/dom/ShadowRoot.cpp (88475 => 88476)
--- trunk/Source/WebCore/dom/ShadowRoot.cpp 2011-06-09 20:05:51 UTC (rev 88475)
+++ trunk/Source/WebCore/dom/ShadowRoot.cpp 2011-06-09 20:24:59 UTC (rev 88476)
@@ -113,9 +113,7 @@
bool ShadowRoot::hasContentElement() const
{
for (Node* n = firstChild(); n; n = n->traverseNextNode(this)) {
- // FIXME: This should be replaced with tag-name checking once <content> is ready.
- // See also http://webkit.org/b/56973
- if (n->isShadowBoundary())
+ if (n->isContentElement())
return true;
}
Modified: trunk/Source/WebCore/editing/CompositeEditCommand.cpp (88475 => 88476)
--- trunk/Source/WebCore/editing/CompositeEditCommand.cpp 2011-06-09 20:05:51 UTC (rev 88475)
+++ trunk/Source/WebCore/editing/CompositeEditCommand.cpp 2011-06-09 20:24:59 UTC (rev 88476)
@@ -146,7 +146,7 @@
ASSERT(!refChild->hasTagName(bodyTag));
ContainerNode* parent = refChild->parentNode();
ASSERT(parent);
- ASSERT(!parent->isShadowBoundary());
+ ASSERT(!parent->isShadowRoot());
if (parent->lastChild() == refChild)
appendNode(insertChild, parent);
else {
Modified: trunk/Source/WebCore/editing/htmlediting.cpp (88475 => 88476)
--- trunk/Source/WebCore/editing/htmlediting.cpp 2011-06-09 20:05:51 UTC (rev 88475)
+++ trunk/Source/WebCore/editing/htmlediting.cpp 2011-06-09 20:24:59 UTC (rev 88476)
@@ -502,7 +502,7 @@
if (node->childNodeCount())
return VisiblePosition(firstPositionInOrBeforeNode(node), DOWNSTREAM);
ASSERT(node->parentNode());
- ASSERT(!node->parentNode()->isShadowBoundary());
+ ASSERT(!node->parentNode()->isShadowRoot());
return positionInParentBeforeNode(node);
}
@@ -513,7 +513,7 @@
if (node->childNodeCount())
return VisiblePosition(lastPositionInOrAfterNode(node), DOWNSTREAM);
ASSERT(node->parentNode());
- ASSERT(!node->parentNode()->isShadowBoundary());
+ ASSERT(!node->parentNode()->isShadowRoot());
return positionInParentAfterNode(node);
}
Modified: trunk/Source/WebCore/page/DragController.cpp (88475 => 88476)
--- trunk/Source/WebCore/page/DragController.cpp 2011-06-09 20:05:51 UTC (rev 88475)
+++ trunk/Source/WebCore/page/DragController.cpp 2011-06-09 20:24:59 UTC (rev 88476)
@@ -256,7 +256,7 @@
HTMLInputElement* inputElement = node->toInputElement();
// If this is a button inside of the a file input, move up to the file input.
- if (inputElement && inputElement->isTextButton() && inputElement->treeScope()->isShadowBoundary())
+ if (inputElement && inputElement->isTextButton() && inputElement->treeScope()->isShadowRoot())
inputElement = inputElement->treeScope()->shadowHost()->toInputElement();
return inputElement && inputElement->isFileUpload() ? inputElement : 0;
Modified: trunk/Source/WebCore/rendering/RenderTreeAsText.cpp (88475 => 88476)
--- trunk/Source/WebCore/rendering/RenderTreeAsText.cpp 2011-06-09 20:05:51 UTC (rev 88475)
+++ trunk/Source/WebCore/rendering/RenderTreeAsText.cpp 2011-06-09 20:24:59 UTC (rev 88476)
@@ -723,7 +723,7 @@
result += "body";
break;
}
- if (n->isShadowBoundary())
+ if (n->isShadowRoot())
result += "{" + getTagName(n) + "}";
else
result += "child " + String::number(n->nodeIndex()) + " {" + getTagName(n) + "}";
