[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [75287] trunk/WebCore
From: commit-queue () webkit ! org
Date: 2011-01-07 23:48:58
Message-ID: 20110107234859.987F4626D2C8 () beta ! macosforge ! org
[Download RAW message or body]
[Attachment #2 (text/html)]
<!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>[75287] trunk/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/75287">75287</a></dd> \
<dt>Author</dt> <dd>commit-queue@webkit.org</dd> <dt>Date</dt> <dd>2011-01-07 \
15:48:52 -0800 (Fri, 07 Jan 2011)</dd> </dl>
<h3>Log Message</h3>
<pre>2011-01-07 Rafael Weinstein <rafaelw@chromium.org>
Reviewed by Eric Seidel.
Cleanup: Fold shadowParentNode into shadowHost
https://bugs.webkit.org/show_bug.cgi?id=51059
Replaces all uses of shadowParentNode.
No new tests because no behavior has changed.
* css/CSSStyleSelector.cpp:
(WebCore::CSSStyleSelector::initForStyleResolve):
* dom/Node.cpp:
(WebCore::Node::shadowHost):
(WebCore::Node::shadowAncestorNode):
(WebCore::eventTargetRespectingSVGTargetRules):
(WebCore::Node::getEventAncestors):
* dom/Node.h:
* editing/Editor.cpp:
(WebCore::Editor::findString):
* page/DragController.cpp:
(WebCore::asFileInput):
* page/EventHandler.cpp:
(WebCore::EventHandler::handleMousePressEvent):
(WebCore::instanceAssociatedWithShadowTreeElement):
(WebCore::EventHandler::dispatchMouseEvent):
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::hasLineIfEmpty):
* rendering/RenderSVGShadowTreeRootContainer.cpp:
(WebCore::RenderSVGShadowTreeRootContainer::updateFromElement):
* svg/SVGStyledElement.cpp:
(WebCore::SVGStyledElement::title):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorecssCSSStyleSelectorcpp">trunk/WebCore/css/CSSStyleSelector.cpp</a></li>
<li><a href="#trunkWebCoredomNodecpp">trunk/WebCore/dom/Node.cpp</a></li>
<li><a href="#trunkWebCoredomNodeh">trunk/WebCore/dom/Node.h</a></li>
<li><a href="#trunkWebCoreeditingEditorcpp">trunk/WebCore/editing/Editor.cpp</a></li>
<li><a href="#trunkWebCorepageDragControllercpp">trunk/WebCore/page/DragController.cpp</a></li>
<li><a href="#trunkWebCorepageEventHandlercpp">trunk/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#trunkWebCorerenderingRenderBlockcpp">trunk/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkWebCorerenderingRenderSVGShadowTreeRootContainercpp">trunk/WebCore/rendering/RenderSVGShadowTreeRootContainer.cpp</a></li>
<li><a href="#trunkWebCoresvgSVGStyledElementcpp">trunk/WebCore/svg/SVGStyledElement.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (75286 => 75287)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog 2011-01-07 23:39:19 UTC (rev 75286)
+++ trunk/WebCore/ChangeLog 2011-01-07 23:48:52 UTC (rev 75287)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2011-01-07 Rafael Weinstein <rafaelw@chromium.org>
+
+ Reviewed by Eric Seidel.
+
+ Cleanup: Fold shadowParentNode into shadowHost
+ https://bugs.webkit.org/show_bug.cgi?id=51059
+
+ Replaces all uses of shadowParentNode.
+
+ No new tests because no behavior has changed.
+
+ * css/CSSStyleSelector.cpp:
+ (WebCore::CSSStyleSelector::initForStyleResolve):
+ * dom/Node.cpp:
+ (WebCore::Node::shadowHost):
+ (WebCore::Node::shadowAncestorNode):
+ (WebCore::eventTargetRespectingSVGTargetRules):
+ (WebCore::Node::getEventAncestors):
+ * dom/Node.h:
+ * editing/Editor.cpp:
+ (WebCore::Editor::findString):
+ * page/DragController.cpp:
+ (WebCore::asFileInput):
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::handleMousePressEvent):
+ (WebCore::instanceAssociatedWithShadowTreeElement):
+ (WebCore::EventHandler::dispatchMouseEvent):
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::hasLineIfEmpty):
+ * rendering/RenderSVGShadowTreeRootContainer.cpp:
+ (WebCore::RenderSVGShadowTreeRootContainer::updateFromElement):
+ * svg/SVGStyledElement.cpp:
+ (WebCore::SVGStyledElement::title):
+
</ins><span class="cx"> 2011-01-07 Chris Marrin <cmarrin@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed.
</span></span></pre></div>
<a id="trunkWebCorecssCSSStyleSelectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/css/CSSStyleSelector.cpp (75286 => \
75287)</h4> <pre class="diff"><span>
<span class="info">--- trunk/WebCore/css/CSSStyleSelector.cpp 2011-01-07 23:39:19 UTC \
(rev 75286)
+++ trunk/WebCore/css/CSSStyleSelector.cpp 2011-01-07 23:48:52 UTC (rev 75287)
</span><span class="lines">@@ -820,7 +820,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SVG)
</span><span class="cx"> if (!m_parentNode && e && \
e->isSVGElement() && e->isShadowRoot()) </span><del>- \
m_parentNode = e->shadowParentNode(); </del><ins>+ m_parentNode = \
e->shadowHost(); </ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (parentStyle)
</span></span></pre></div>
<a id="trunkWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/dom/Node.cpp (75286 => 75287)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/dom/Node.cpp 2011-01-07 23:39:19 UTC (rev 75286)
+++ trunk/WebCore/dom/Node.cpp 2011-01-07 23:48:52 UTC (rev 75287)
</span><span class="lines">@@ -487,7 +487,7 @@
</span><span class="cx">
</span><span class="cx"> Element* Node::shadowHost() const
</span><span class="cx"> {
</span><del>- return toElement(shadowParentNode());
</del><ins>+ return toElement(getFlag(IsShadowRootFlag) ? parent() : 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Node::setShadowHost(Element* host)
</span><span class="lines">@@ -1467,7 +1467,7 @@
</span><span class="cx">
</span><span class="cx"> Node* root = shadowTreeRootNode();
</span><span class="cx"> if (root)
</span><del>- return root->shadowParentNode();
</del><ins>+ return root->shadowHost();
</ins><span class="cx"> return this;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2543,7 +2543,7 @@
</span><span class="cx"> if (!n->isShadowRoot() || !n->isSVGElement())
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- ContainerNode* shadowTreeParentElement = \
n->shadowParentNode(); </del><ins>+ Element* shadowTreeParentElement = \
n->shadowHost(); </ins><span class="cx"> \
ASSERT(shadowTreeParentElement->hasTagName(SVGNames::useTag)); </span><span \
class="cx"> </span><span class="cx"> if (SVGElementInstance* instance = \
static_cast<SVGUseElement*>(shadowTreeParentElement)->instanceForShadowTreeElement(referenceNode))
</span><span class="lines">@@ -2566,7 +2566,7 @@
</span><span class="cx"> if (ancestor->isShadowRoot()) {
</span><span class="cx"> if (behavior == StayInsideShadowDOM)
</span><span class="cx"> return;
</span><del>- ancestor = ancestor->shadowParentNode();
</del><ins>+ ancestor = ancestor->shadowHost();
</ins><span class="cx"> if (!shouldSkipNextAncestor)
</span><span class="cx"> target = ancestor;
</span><span class="cx"> } else
</span></span></pre></div>
<a id="trunkWebCoredomNodeh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/dom/Node.h (75286 => 75287)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/dom/Node.h 2011-01-07 23:39:19 UTC (rev 75286)
+++ trunk/WebCore/dom/Node.h 2011-01-07 23:48:52 UTC (rev 75287)
</span><span class="lines">@@ -206,14 +206,12 @@
</span><span class="cx"> virtual bool isCharacterDataNode() const { return false; \
} </span><span class="cx"> bool isDocumentNode() const;
</span><span class="cx"> bool isShadowRoot() const { return \
getFlag(IsShadowRootFlag); } </span><del>- // FIXME: Eliminate all uses, fold into \
shadowHost.
- ContainerNode* shadowParentNode() const;
</del><span class="cx"> Node* shadowAncestorNode();
</span><span class="cx"> Node* shadowTreeRootNode();
</span><span class="cx"> bool isInShadowTree();
</span><span class="cx"> // Node's parent or shadow tree host.
</span><span class="cx"> ContainerNode* parentOrHostNode() const;
</span><del>- // Use when it's guaranteed to that shadowParentNode is 0.
</del><ins>+ // Use when it's guaranteed to that shadowHost is 0.
</ins><span class="cx"> ContainerNode* parentNodeGuaranteedHostFree() const;
</span><span class="cx">
</span><span class="cx"> Element* shadowHost() const;
</span><span class="lines">@@ -728,11 +726,6 @@
</span><span class="cx"> return parentOrHostNode();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline ContainerNode* Node::shadowParentNode() const
-{
- return getFlag(IsShadowRootFlag) ? parent() : 0;
-}
-
</del><span class="cx"> } //namespace
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span></span></pre></div>
<a id="trunkWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/editing/Editor.cpp (75286 => \
75287)</h4> <pre class="diff"><span>
<span class="info">--- trunk/WebCore/editing/Editor.cpp 2011-01-07 23:39:19 UTC (rev \
75286)
+++ trunk/WebCore/editing/Editor.cpp 2011-01-07 23:48:52 UTC (rev 75287)
</span><span class="lines">@@ -3309,9 +3309,9 @@
</span><span class="cx"> if (resultRange->collapsed(exception) && \
shadowTreeRoot) { </span><span class="cx"> searchRange = \
rangeOfContents(m_frame->document()); </span><span class="cx"> if \
(forward) </span><del>- \
searchRange->setStartAfter(shadowTreeRoot->shadowParentNode(), exception); \
</del><ins>+ \
searchRange->setStartAfter(shadowTreeRoot->shadowHost(), exception); \
</ins><span class="cx"> else </span><del>- \
searchRange->setEndBefore(shadowTreeRoot->shadowParentNode(), exception); \
</del><ins>+ searchRange->setEndBefore(shadowTreeRoot->shadowHost(), \
exception); </ins><span class="cx">
</span><span class="cx"> resultRange = findPlainText(searchRange.get(), \
target, options); </span><span class="cx"> }
</span></span></pre></div>
<a id="trunkWebCorepageDragControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/DragController.cpp (75286 => \
75287)</h4> <pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/DragController.cpp 2011-01-07 23:39:19 UTC \
(rev 75286)
+++ trunk/WebCore/page/DragController.cpp 2011-01-07 23:48:52 UTC (rev 75287)
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx"> // In order to get around this problem we assume any \
non-FILE input element </span><span class="cx"> // is this internal button, and \
try querying the shadow parent node. </span><span class="cx"> if \
(node->hasTagName(HTMLNames::inputTag) && node->isShadowRoot() \
&& !static_cast<HTMLInputElement*>(node)->isFileUpload()) \
</span><del>- node = node->shadowParentNode(); </del><ins>+ node = \
node->shadowHost(); </ins><span class="cx">
</span><span class="cx"> if (!node || !node->hasTagName(HTMLNames::inputTag))
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/EventHandler.cpp (75286 => \
75287)</h4> <pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/EventHandler.cpp 2011-01-07 23:39:19 UTC \
(rev 75286)
+++ trunk/WebCore/page/EventHandler.cpp 2011-01-07 23:48:52 UTC (rev 75287)
</span><span class="lines">@@ -1383,7 +1383,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 (mev.targetNode()->isShadowRoot() && \
mev.targetNode()->shadowParentNode()->hasTagName(inputTag)) { </del><ins>+ \
if (mev.targetNode()->isShadowRoot() && \
mev.targetNode()->shadowHost()->hasTagName(inputTag)) { </ins><span class="cx"> \
HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active); \
</span><span class="cx"> mev = \
m_frame->document()->prepareMouseEvent(request, documentPoint, mouseEvent); \
</span><span class="cx"> } </span><span class="lines">@@ -1795,7 +1795,7 @@
</span><span class="cx"> if (!shadowTreeElement)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- Node* shadowTreeParentElement = \
shadowTreeElement->shadowParentNode(); </del><ins>+ Element* \
shadowTreeParentElement = shadowTreeElement->shadowHost(); </ins><span class="cx"> \
if (!shadowTreeParentElement) </span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="lines">@@ -1913,7 +1913,7 @@
</span><span class="cx"> // focused if the user does a mouseup over \
it, however, because the mouseup </span><span class="cx"> // will set \
a selection inside it, which will call setFocuseNodeIfNeeded. </span><span \
class="cx"> ExceptionCode ec = 0; </span><del>- Node* \
n = node->isShadowRoot() ? node->shadowParentNode() : node; </del><ins>+ \
Node* n = node->isShadowRoot() ? node->shadowHost() : node; </ins><span \
class="cx"> if (m_frame->selection()->isRange() </span><span \
class="cx"> && \
m_frame->selection()->toNormalizedRange()->compareNode(n, ec) == \
Range::NODE_INSIDE </span><span class="cx"> && \
n->isDescendantOf(m_frame->document()->focusedNode())) \
</span></span></pre></div> <a id="trunkWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderBlock.cpp (75286 => \
75287)</h4> <pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderBlock.cpp 2011-01-07 23:39:19 \
UTC (rev 75286)
+++ trunk/WebCore/rendering/RenderBlock.cpp 2011-01-07 23:48:52 UTC (rev 75287)
</span><span class="lines">@@ -4927,7 +4927,7 @@
</span><span class="cx"> if (node()->isContentEditable() && \
node()->rootEditableElement() == node()) </span><span class="cx"> return \
true; </span><span class="cx">
</span><del>- if (node()->isShadowRoot() && \
(node()->shadowParentNode()->hasTagName(inputTag))) </del><ins>+ if \
(node()->isShadowRoot() && \
(node()->shadowHost()->hasTagName(inputTag))) </ins><span class="cx"> \
return true; </span><span class="cx">
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderSVGShadowTreeRootContainercpp"></a>
<div class="modfile"><h4>Modified: \
trunk/WebCore/rendering/RenderSVGShadowTreeRootContainer.cpp (75286 => 75287)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/WebCore/rendering/RenderSVGShadowTreeRootContainer.cpp 2011-01-07 23:39:19 UTC \
(rev 75286)
+++ trunk/WebCore/rendering/RenderSVGShadowTreeRootContainer.cpp 2011-01-07 23:48:52 \
UTC (rev 75287) </span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> useElement->buildPendingResource();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ASSERT(m_shadowRoot->shadowParentNode() == useElement);
</del><ins>+ ASSERT(m_shadowRoot->shadowHost() == useElement);
</ins><span class="cx">
</span><span class="cx"> bool shouldRecreateTree = m_recreateTree;
</span><span class="cx"> if (m_recreateTree) {
</span></span></pre></div>
<a id="trunkWebCoresvgSVGStyledElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/svg/SVGStyledElement.cpp (75286 => \
75287)</h4> <pre class="diff"><span>
<span class="info">--- trunk/WebCore/svg/SVGStyledElement.cpp 2011-01-07 23:39:19 UTC \
(rev 75286)
+++ trunk/WebCore/svg/SVGStyledElement.cpp 2011-01-07 23:48:52 UTC (rev 75287)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Get the <use> element.
</span><del>- ContainerNode* shadowParent = parent->shadowParentNode();
</del><ins>+ Element* shadowParent = parent->shadowHost();
</ins><span class="cx"> if (shadowParent && \
shadowParent->isSVGElement() && \
shadowParent->hasTagName(SVGNames::useTag)) { </span><span class="cx"> \
SVGUseElement* useElement = static_cast<SVGUseElement*>(shadowParent); \
</span><span class="cx"> // If the <use> title is not empty we \
found the title to use. </span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic