<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[189239] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/189239">189239</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-01 17:54:43 -0700 (Tue, 01 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename ShadowRoot::hostElement to shadowRoot::host to match the latest spec
https://bugs.webkit.org/show_bug.cgi?id=148694
Reviewed by Chris Dumez.
Renamed ShadowRoot::hostElement to ShadowRoot::host to match the latest shadow DOM spec.
This will help us implementing shadow DOM in near future.
* dom/ContainerNodeAlgorithms.cpp:
(WebCore::ChildNodeInsertionNotifier::notifyDescendantInsertedIntoDocument):
(WebCore::ChildNodeRemovalNotifier::notifyDescendantRemovedFromDocument):
* dom/Element.cpp:
(WebCore::Element::addShadowRoot):
(WebCore::Element::removeShadowRoot):
* dom/EventDispatcher.cpp:
(WebCore::EventRelatedNodeResolver::moveToParentOrShadowHost):
(WebCore::EventRelatedNodeResolver::findHostOfTreeScopeInTargetTreeScope):
(WebCore::shouldEventCrossShadowBoundary):
(WebCore::EventPath::EventPath):
* dom/Node.cpp:
(WebCore::Node::shadowHost):
(WebCore::Node::deprecatedShadowAncestorNode):
(WebCore::Node::parentOrShadowHostElement):
* dom/NodeRenderingTraversal.cpp:
(WebCore::NodeRenderingTraversal::traverseParent):
* dom/ShadowRoot.cpp:
(WebCore::ShadowRoot::setInnerHTML):
(WebCore::ShadowRoot::setResetStyleInheritance):
* dom/ShadowRoot.h:
(WebCore::Node::parentOrShadowHostNode):
* dom/Text.cpp:
(WebCore::isSVGShadowText):
* dom/TreeScope.cpp:
(WebCore::TreeScope::focusedElement):
* html/shadow/ContentDistributor.cpp:
(WebCore::ContentDistributor::ensureDistribution):
* html/shadow/InsertionPoint.cpp:
(WebCore::InsertionPoint::insertedInto):
(WebCore::InsertionPoint::removedFrom):
* page/DragController.cpp:
(WebCore::asFileInput):
* page/EventHandler.cpp:
(WebCore::EventHandler::handleMousePressEvent):
* page/FocusController.cpp:
(WebCore::FocusNavigationScope::owner):
* rendering/RenderLayer.cpp:
(WebCore::rendererForScrollbar):
* style/StyleResolveTree.cpp:
(WebCore::Style::attachShadowRoot):
(WebCore::Style::resolveShadowTree):
* svg/SVGElement.cpp:
(WebCore::SVGElement::correspondingUseElement):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomContainerNodeAlgorithmscpp">trunk/Source/WebCore/dom/ContainerNodeAlgorithms.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomEventDispatchercpp">trunk/Source/WebCore/dom/EventDispatcher.cpp</a></li>
<li><a href="#trunkSourceWebCoredomNodecpp">trunk/Source/WebCore/dom/Node.cpp</a></li>
<li><a href="#trunkSourceWebCoredomNodeRenderingTraversalcpp">trunk/Source/WebCore/dom/NodeRenderingTraversal.cpp</a></li>
<li><a href="#trunkSourceWebCoredomShadowRootcpp">trunk/Source/WebCore/dom/ShadowRoot.cpp</a></li>
<li><a href="#trunkSourceWebCoredomShadowRooth">trunk/Source/WebCore/dom/ShadowRoot.h</a></li>
<li><a href="#trunkSourceWebCoredomTextcpp">trunk/Source/WebCore/dom/Text.cpp</a></li>
<li><a href="#trunkSourceWebCoredomTreeScopecpp">trunk/Source/WebCore/dom/TreeScope.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowContentDistributorcpp">trunk/Source/WebCore/html/shadow/ContentDistributor.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowInsertionPointcpp">trunk/Source/WebCore/html/shadow/InsertionPoint.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDragControllercpp">trunk/Source/WebCore/page/DragController.cpp</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlercpp">trunk/Source/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFocusControllercpp">trunk/Source/WebCore/page/FocusController.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleStyleResolveTreecpp">trunk/Source/WebCore/style/StyleResolveTree.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGElementcpp">trunk/Source/WebCore/svg/SVGElement.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189238 => 189239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-02 00:29:05 UTC (rev 189238)
+++ trunk/Source/WebCore/ChangeLog 2015-09-02 00:54:43 UTC (rev 189239)
</span><span class="lines">@@ -1,3 +1,58 @@
</span><ins>+2015-09-01 Ryosuke Niwa <rniwa@webkit.org>
+
+ Rename ShadowRoot::hostElement to shadowRoot::host to match the latest spec
+ https://bugs.webkit.org/show_bug.cgi?id=148694
+
+ Reviewed by Chris Dumez.
+
+ Renamed ShadowRoot::hostElement to ShadowRoot::host to match the latest shadow DOM spec.
+ This will help us implementing shadow DOM in near future.
+
+ * dom/ContainerNodeAlgorithms.cpp:
+ (WebCore::ChildNodeInsertionNotifier::notifyDescendantInsertedIntoDocument):
+ (WebCore::ChildNodeRemovalNotifier::notifyDescendantRemovedFromDocument):
+ * dom/Element.cpp:
+ (WebCore::Element::addShadowRoot):
+ (WebCore::Element::removeShadowRoot):
+ * dom/EventDispatcher.cpp:
+ (WebCore::EventRelatedNodeResolver::moveToParentOrShadowHost):
+ (WebCore::EventRelatedNodeResolver::findHostOfTreeScopeInTargetTreeScope):
+ (WebCore::shouldEventCrossShadowBoundary):
+ (WebCore::EventPath::EventPath):
+ * dom/Node.cpp:
+ (WebCore::Node::shadowHost):
+ (WebCore::Node::deprecatedShadowAncestorNode):
+ (WebCore::Node::parentOrShadowHostElement):
+ * dom/NodeRenderingTraversal.cpp:
+ (WebCore::NodeRenderingTraversal::traverseParent):
+ * dom/ShadowRoot.cpp:
+ (WebCore::ShadowRoot::setInnerHTML):
+ (WebCore::ShadowRoot::setResetStyleInheritance):
+ * dom/ShadowRoot.h:
+ (WebCore::Node::parentOrShadowHostNode):
+ * dom/Text.cpp:
+ (WebCore::isSVGShadowText):
+ * dom/TreeScope.cpp:
+ (WebCore::TreeScope::focusedElement):
+ * html/shadow/ContentDistributor.cpp:
+ (WebCore::ContentDistributor::ensureDistribution):
+ * html/shadow/InsertionPoint.cpp:
+ (WebCore::InsertionPoint::insertedInto):
+ (WebCore::InsertionPoint::removedFrom):
+ * page/DragController.cpp:
+ (WebCore::asFileInput):
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::handleMousePressEvent):
+ * page/FocusController.cpp:
+ (WebCore::FocusNavigationScope::owner):
+ * rendering/RenderLayer.cpp:
+ (WebCore::rendererForScrollbar):
+ * style/StyleResolveTree.cpp:
+ (WebCore::Style::attachShadowRoot):
+ (WebCore::Style::resolveShadowTree):
+ * svg/SVGElement.cpp:
+ (WebCore::SVGElement::correspondingUseElement):
+
</ins><span class="cx"> 2015-09-01 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> NodeFilter should be a callback interface
</span></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodeAlgorithmscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNodeAlgorithms.cpp (189238 => 189239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNodeAlgorithms.cpp 2015-09-02 00:29:05 UTC (rev 189238)
+++ trunk/Source/WebCore/dom/ContainerNodeAlgorithms.cpp 2015-09-02 00:54:43 UTC (rev 189239)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (RefPtr<ShadowRoot> root = downcast<Element>(node).shadowRoot()) {
</span><del>- if (node.inDocument() && root->hostElement() == &node)
</del><ins>+ if (node.inDocument() && root->host() == &node)
</ins><span class="cx"> notifyNodeInsertedIntoDocument(*root, postInsertionNotificationTargets);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> node.document().setCSSTarget(0);
</span><span class="cx">
</span><span class="cx"> if (RefPtr<ShadowRoot> root = downcast<Element>(node).shadowRoot()) {
</span><del>- if (!node.inDocument() && root->hostElement() == &node)
</del><ins>+ if (!node.inDocument() && root->host() == &node)
</ins><span class="cx"> notifyNodeRemovedFromDocument(*root.get());
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (189238 => 189239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2015-09-02 00:29:05 UTC (rev 189238)
+++ trunk/Source/WebCore/dom/Element.cpp 2015-09-02 00:54:43 UTC (rev 189239)
</span><span class="lines">@@ -1631,7 +1631,7 @@
</span><span class="cx"> ShadowRoot& shadowRoot = newShadowRoot.get();
</span><span class="cx"> ensureElementRareData().setShadowRoot(WTF::move(newShadowRoot));
</span><span class="cx">
</span><del>- shadowRoot.setHostElement(this);
</del><ins>+ shadowRoot.setHost(this);
</ins><span class="cx"> shadowRoot.setParentTreeScope(&treeScope());
</span><span class="cx"> shadowRoot.distributor().didShadowBoundaryChange(this);
</span><span class="cx">
</span><span class="lines">@@ -1660,7 +1660,7 @@
</span><span class="cx">
</span><span class="cx"> elementRareData()->clearShadowRoot();
</span><span class="cx">
</span><del>- oldRoot->setHostElement(0);
</del><ins>+ oldRoot->setHost(0);
</ins><span class="cx"> oldRoot->setParentTreeScope(&document());
</span><span class="cx">
</span><span class="cx"> ChildNodeRemovalNotifier(*this).notify(*oldRoot);
</span></span></pre></div>
<a id="trunkSourceWebCoredomEventDispatchercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EventDispatcher.cpp (189238 => 189239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EventDispatcher.cpp 2015-09-02 00:29:05 UTC (rev 189238)
+++ trunk/Source/WebCore/dom/EventDispatcher.cpp 2015-09-02 00:54:43 UTC (rev 189239)
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx">
</span><span class="cx"> if (m_currentTreeScope) {
</span><span class="cx"> ASSERT(is<ShadowRoot>(m_currentTreeScope->rootNode()));
</span><del>- ASSERT(&newTarget == downcast<ShadowRoot>(m_currentTreeScope->rootNode()).hostElement());
</del><ins>+ ASSERT(&newTarget == downcast<ShadowRoot>(m_currentTreeScope->rootNode()).host());
</ins><span class="cx"> ASSERT(m_currentTreeScope->parentTreeScope() == &newTreeScope);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx"> return previousHost;
</span><span class="cx"> }
</span><span class="cx"> if (is<ShadowRoot>(scope->rootNode()))
</span><del>- previousHost = downcast<ShadowRoot>(scope->rootNode()).hostElement();
</del><ins>+ previousHost = downcast<ShadowRoot>(scope->rootNode()).host();
</ins><span class="cx"> else
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(!scope->parentTreeScope());
</span><span class="cx"> }
</span><span class="lines">@@ -385,7 +385,7 @@
</span><span class="cx"> if (Element* element = targetNode->document().webkitCurrentFullScreenElement()) {
</span><span class="cx"> // FIXME: We assume that if the full screen element is a media element that it's
</span><span class="cx"> // the video-only full screen. Both here and elsewhere. But that is probably wrong.
</span><del>- if (element->isMediaElement() && shadowRoot.hostElement() == element)
</del><ins>+ if (element->isMediaElement() && shadowRoot.host() == element)
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -444,7 +444,7 @@
</span><span class="cx"> }
</span><span class="cx"> if (!node || !shouldEventCrossShadowBoundary(event, downcast<ShadowRoot>(*node), *target))
</span><span class="cx"> return;
</span><del>- node = downcast<ShadowRoot>(*node).hostElement();
</del><ins>+ node = downcast<ShadowRoot>(*node).host();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.cpp (189238 => 189239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.cpp 2015-09-02 00:29:05 UTC (rev 189238)
+++ trunk/Source/WebCore/dom/Node.cpp 2015-09-02 00:54:43 UTC (rev 189239)
</span><span class="lines">@@ -1034,14 +1034,14 @@
</span><span class="cx"> Element* Node::shadowHost() const
</span><span class="cx"> {
</span><span class="cx"> if (ShadowRoot* root = containingShadowRoot())
</span><del>- return root->hostElement();
</del><ins>+ return root->host();
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Node* Node::deprecatedShadowAncestorNode() const
</span><span class="cx"> {
</span><span class="cx"> if (ShadowRoot* root = containingShadowRoot())
</span><del>- return root->hostElement();
</del><ins>+ return root->host();
</ins><span class="cx">
</span><span class="cx"> return const_cast<Node*>(this);
</span><span class="cx"> }
</span><span class="lines">@@ -1086,7 +1086,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> if (is<ShadowRoot>(*parent))
</span><del>- return downcast<ShadowRoot>(*parent).hostElement();
</del><ins>+ return downcast<ShadowRoot>(*parent).host();
</ins><span class="cx">
</span><span class="cx"> if (!is<Element>(*parent))
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodeRenderingTraversalcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/NodeRenderingTraversal.cpp (189238 => 189239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/NodeRenderingTraversal.cpp 2015-09-02 00:29:05 UTC (rev 189238)
+++ trunk/Source/WebCore/dom/NodeRenderingTraversal.cpp 2015-09-02 00:54:43 UTC (rev 189239)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> if (is<ShadowRoot>(*parent))
</span><del>- return shadowRootCrossing == CrossShadowRoot ? downcast<ShadowRoot>(parent)->hostElement() : parent;
</del><ins>+ return shadowRootCrossing == CrossShadowRoot ? downcast<ShadowRoot>(parent)->host() : parent;
</ins><span class="cx">
</span><span class="cx"> if (is<InsertionPoint>(*parent)) {
</span><span class="cx"> const InsertionPoint& insertionPoint = downcast<InsertionPoint>(*parent);
</span></span></pre></div>
<a id="trunkSourceWebCoredomShadowRootcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ShadowRoot.cpp (189238 => 189239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ShadowRoot.cpp 2015-09-02 00:29:05 UTC (rev 189238)
+++ trunk/Source/WebCore/dom/ShadowRoot.cpp 2015-09-02 00:54:43 UTC (rev 189239)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (RefPtr<DocumentFragment> fragment = createFragmentForInnerOuterHTML(markup, hostElement(), AllowScriptingContent, ec))
</del><ins>+ if (RefPtr<DocumentFragment> fragment = createFragmentForInnerOuterHTML(markup, host(), AllowScriptingContent, ec))
</ins><span class="cx"> replaceChildrenWithFragment(*this, fragment.release(), ec);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx">
</span><span class="cx"> if (value != m_resetStyleInheritance) {
</span><span class="cx"> m_resetStyleInheritance = value;
</span><del>- if (hostElement())
</del><ins>+ if (host())
</ins><span class="cx"> setNeedsStyleRecalc();
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomShadowRooth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ShadowRoot.h (189238 => 189239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ShadowRoot.h 2015-09-02 00:29:05 UTC (rev 189238)
+++ trunk/Source/WebCore/dom/ShadowRoot.h 2015-09-02 00:54:43 UTC (rev 189239)
</span><span class="lines">@@ -53,8 +53,8 @@
</span><span class="cx"> bool resetStyleInheritance() const { return m_resetStyleInheritance; }
</span><span class="cx"> void setResetStyleInheritance(bool);
</span><span class="cx">
</span><del>- Element* hostElement() const { return m_hostElement; }
- void setHostElement(Element* hostElement) { m_hostElement = hostElement; }
</del><ins>+ Element* host() const { return m_hostElement; }
+ void setHost(Element* hostElement) { m_hostElement = hostElement; }
</ins><span class="cx">
</span><span class="cx"> String innerHTML() const;
</span><span class="cx"> void setInnerHTML(const String&, ExceptionCode&);
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> PassRefPtr<Node> cloneNode(bool, ExceptionCode&);
</span><span class="cx">
</span><span class="cx"> ContentDistributor& distributor() { return m_distributor; }
</span><del>- void invalidateDistribution() { m_distributor.invalidateDistribution(hostElement()); }
</del><ins>+ void invalidateDistribution() { m_distributor.invalidateDistribution(m_hostElement); }
</ins><span class="cx">
</span><span class="cx"> virtual void removeAllEventListeners() override;
</span><span class="cx">
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> virtual RefPtr<Node> cloneNodeInternal(Document&, CloningOperation) override;
</span><span class="cx">
</span><span class="cx"> // FIXME: This shouldn't happen. https://bugs.webkit.org/show_bug.cgi?id=88834
</span><del>- bool isOrphan() const { return !hostElement(); }
</del><ins>+ bool isOrphan() const { return !m_hostElement; }
</ins><span class="cx">
</span><span class="cx"> unsigned m_resetStyleInheritance : 1;
</span><span class="cx"> unsigned m_type : 1;
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThreadOrGCThread());
</span><span class="cx"> if (is<ShadowRoot>(*this))
</span><del>- return downcast<ShadowRoot>(*this).hostElement();
</del><ins>+ return downcast<ShadowRoot>(*this).host();
</ins><span class="cx"> return parentNode();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Text.cpp (189238 => 189239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Text.cpp 2015-09-02 00:29:05 UTC (rev 189238)
+++ trunk/Source/WebCore/dom/Text.cpp 2015-09-02 00:54:43 UTC (rev 189239)
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> {
</span><span class="cx"> Node* parentNode = text->parentNode();
</span><span class="cx"> ASSERT(parentNode);
</span><del>- return is<ShadowRoot>(*parentNode) && downcast<ShadowRoot>(*parentNode).hostElement()->hasTagName(SVGNames::trefTag);
</del><ins>+ return is<ShadowRoot>(*parentNode) && downcast<ShadowRoot>(*parentNode).host()->hasTagName(SVGNames::trefTag);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool isSVGText(Text* text)
</span></span></pre></div>
<a id="trunkSourceWebCoredomTreeScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/TreeScope.cpp (189238 => 189239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/TreeScope.cpp 2015-09-02 00:29:05 UTC (rev 189238)
+++ trunk/Source/WebCore/dom/TreeScope.cpp 2015-09-02 00:54:43 UTC (rev 189239)
</span><span class="lines">@@ -313,7 +313,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> TreeScope* treeScope = &element->treeScope();
</span><span class="cx"> while (treeScope != this && treeScope != &document) {
</span><del>- element = downcast<ShadowRoot>(treeScope->rootNode()).hostElement();
</del><ins>+ element = downcast<ShadowRoot>(treeScope->rootNode()).host();
</ins><span class="cx"> treeScope = &element->treeScope();
</span><span class="cx"> }
</span><span class="cx"> if (this != treeScope)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowContentDistributorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/ContentDistributor.cpp (189238 => 189239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/ContentDistributor.cpp 2015-09-02 00:29:05 UTC (rev 189238)
+++ trunk/Source/WebCore/html/shadow/ContentDistributor.cpp 2015-09-02 00:54:43 UTC (rev 189239)
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> ASSERT(shadowRoot);
</span><span class="cx">
</span><span class="cx"> Vector<ShadowRoot*, 8> shadowRoots;
</span><del>- for (Element* current = shadowRoot->hostElement(); current; current = current->shadowHost()) {
</del><ins>+ for (Element* current = shadowRoot->host(); current; current = current->shadowHost()) {
</ins><span class="cx"> ShadowRoot* currentRoot = current->shadowRoot();
</span><span class="cx"> if (!currentRoot->distributor().needsDistribution())
</span><span class="cx"> break;
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (size_t i = shadowRoots.size(); i > 0; --i)
</span><del>- shadowRoots[i - 1]->distributor().distribute(shadowRoots[i - 1]->hostElement());
</del><ins>+ shadowRoots[i - 1]->distributor().distribute(shadowRoots[i - 1]->host());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ContentDistributor::invalidateDistribution(Element* host)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowInsertionPointcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/InsertionPoint.cpp (189238 => 189239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/InsertionPoint.cpp 2015-09-02 00:29:05 UTC (rev 189238)
+++ trunk/Source/WebCore/html/shadow/InsertionPoint.cpp 2015-09-02 00:54:43 UTC (rev 189239)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> HTMLElement::insertedInto(insertionPoint);
</span><span class="cx">
</span><span class="cx"> if (ShadowRoot* root = containingShadowRoot()) {
</span><del>- root->distributor().didShadowBoundaryChange(root->hostElement());
</del><ins>+ root->distributor().didShadowBoundaryChange(root->host());
</ins><span class="cx"> root->distributor().invalidateInsertionPointList();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> if (!root)
</span><span class="cx"> root = insertionPoint.containingShadowRoot();
</span><span class="cx">
</span><del>- if (root && root->hostElement()) {
</del><ins>+ if (root && root->host()) {
</ins><span class="cx"> root->invalidateDistribution();
</span><span class="cx"> root->distributor().invalidateInsertionPointList();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageDragControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DragController.cpp (189238 => 189239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DragController.cpp 2015-09-02 00:29:05 UTC (rev 189238)
+++ trunk/Source/WebCore/page/DragController.cpp 2015-09-02 00:54:43 UTC (rev 189239)
</span><span class="lines">@@ -290,7 +290,7 @@
</span><span class="cx">
</span><span class="cx"> // If this is a button inside of the a file input, move up to the file input.
</span><span class="cx"> if (inputElement && inputElement->isTextButton() && is<ShadowRoot>(inputElement->treeScope().rootNode()))
</span><del>- inputElement = downcast<ShadowRoot>(inputElement->treeScope().rootNode()).hostElement()->toInputElement();
</del><ins>+ inputElement = downcast<ShadowRoot>(inputElement->treeScope().rootNode()).host()->toInputElement();
</ins><span class="cx">
</span><span class="cx"> return inputElement && inputElement->isFileUpload() ? inputElement : 0;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (189238 => 189239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp 2015-09-02 00:29:05 UTC (rev 189238)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2015-09-02 00:54:43 UTC (rev 189239)
</span><span class="lines">@@ -1816,7 +1816,7 @@
</span><span class="cx"> // If a mouse event handler changes the input element type to one that has a widget associated,
</span><span class="cx"> // we'd like to EventHandler::handleMousePressEvent to pass the event to the widget and thus the
</span><span class="cx"> // event target node can't still be the shadow node.
</span><del>- if (is<ShadowRoot>(*mouseEvent.targetNode()) && is<HTMLInputElement>(*downcast<ShadowRoot>(*mouseEvent.targetNode()).hostElement()))
</del><ins>+ if (is<ShadowRoot>(*mouseEvent.targetNode()) && is<HTMLInputElement>(*downcast<ShadowRoot>(*mouseEvent.targetNode()).host()))
</ins><span class="cx"> mouseEvent = m_frame.document()->prepareMouseEvent(HitTestRequest(), documentPoint, platformMouseEvent);
</span><span class="cx">
</span><span class="cx"> FrameView* view = m_frame.view();
</span></span></pre></div>
<a id="trunkSourceWebCorepageFocusControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FocusController.cpp (189238 => 189239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FocusController.cpp 2015-09-02 00:29:05 UTC (rev 189238)
+++ trunk/Source/WebCore/page/FocusController.cpp 2015-09-02 00:54:43 UTC (rev 189239)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> {
</span><span class="cx"> ContainerNode* root = rootNode();
</span><span class="cx"> if (is<ShadowRoot>(*root))
</span><del>- return downcast<ShadowRoot>(*root).hostElement();
</del><ins>+ return downcast<ShadowRoot>(*root).host();
</ins><span class="cx"> if (Frame* frame = root->document().frame())
</span><span class="cx"> return frame->ownerElement();
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (189238 => 189239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-09-02 00:29:05 UTC (rev 189238)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-09-02 00:54:43 UTC (rev 189239)
</span><span class="lines">@@ -3063,7 +3063,7 @@
</span><span class="cx"> if (Element* element = renderer.element()) {
</span><span class="cx"> if (ShadowRoot* shadowRoot = element->containingShadowRoot()) {
</span><span class="cx"> if (shadowRoot->type() == ShadowRoot::UserAgentShadowRoot)
</span><del>- return shadowRoot->hostElement()->renderer();
</del><ins>+ return shadowRoot->host()->renderer();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleResolveTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleResolveTree.cpp (189238 => 189239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleResolveTree.cpp 2015-09-02 00:29:05 UTC (rev 189238)
+++ trunk/Source/WebCore/style/StyleResolveTree.cpp 2015-09-02 00:54:43 UTC (rev 189239)
</span><span class="lines">@@ -385,10 +385,10 @@
</span><span class="cx">
</span><span class="cx"> static void attachShadowRoot(ShadowRoot& shadowRoot)
</span><span class="cx"> {
</span><del>- ASSERT(shadowRoot.hostElement());
- ASSERT(shadowRoot.hostElement()->renderer());
</del><ins>+ ASSERT(shadowRoot.host());
+ ASSERT(shadowRoot.host()->renderer());
</ins><span class="cx">
</span><del>- auto& renderer = *shadowRoot.hostElement()->renderer();
</del><ins>+ auto& renderer = *shadowRoot.host()->renderer();
</ins><span class="cx"> RenderTreePosition renderTreePosition(renderer);
</span><span class="cx"> attachChildren(shadowRoot, renderer.style(), renderTreePosition);
</span><span class="cx">
</span><span class="lines">@@ -678,7 +678,7 @@
</span><span class="cx">
</span><span class="cx"> static void resolveShadowTree(ShadowRoot& shadowRoot, Element& host, Style::Change change)
</span><span class="cx"> {
</span><del>- ASSERT(shadowRoot.hostElement() == &host);
</del><ins>+ ASSERT(shadowRoot.host() == &host);
</ins><span class="cx"> ASSERT(host.renderer());
</span><span class="cx"> RenderTreePosition renderTreePosition(*host.renderer());
</span><span class="cx"> for (Node* child = shadowRoot.firstChild(); child; child = child->nextSibling()) {
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGElement.cpp (189238 => 189239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGElement.cpp 2015-09-02 00:29:05 UTC (rev 189238)
+++ trunk/Source/WebCore/svg/SVGElement.cpp 2015-09-02 00:54:43 UTC (rev 189239)
</span><span class="lines">@@ -490,7 +490,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> if (root->type() != ShadowRoot::UserAgentShadowRoot)
</span><span class="cx"> return nullptr;
</span><del>- auto* host = root->hostElement();
</del><ins>+ auto* host = root->host();
</ins><span class="cx"> if (!is<SVGUseElement>(host))
</span><span class="cx"> return nullptr;
</span><span class="cx"> return &downcast<SVGUseElement>(*host);
</span></span></pre>
</div>
</div>
</body>
</html>