Title: [118654] trunk/Source/WebCore
- Revision
- 118654
- Author
- morr...@google.com
- Date
- 2012-05-28 01:40:02 -0700 (Mon, 28 May 2012)
Log Message
[Refactoring][ShadowDOM] Some ElementShadow methods can be inlined.
https://bugs.webkit.org/show_bug.cgi?id=87617
Reviewed by Kentaro Hara.
Inlined ElementShadow::attachHost(), ElementShadow::detachHost() and
ElementShadow::reattach()
No new tests. No behavior change.
* dom/Element.cpp:
(WebCore::Element::attach):
(WebCore::Element::detach):
* dom/ElementShadow.cpp:
(WebCore::ElememtnShadow::reattachHostChildrenAndShadow):
* dom/ElementShadow.h:
(ElementShadow):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (118653 => 118654)
--- trunk/Source/WebCore/ChangeLog 2012-05-28 08:17:51 UTC (rev 118653)
+++ trunk/Source/WebCore/ChangeLog 2012-05-28 08:40:02 UTC (rev 118654)
@@ -1,3 +1,23 @@
+2012-05-27 MORITA Hajime <morr...@google.com>
+
+ [Refactoring][ShadowDOM] Some ElementShadow methods can be inlined.
+ https://bugs.webkit.org/show_bug.cgi?id=87617
+
+ Reviewed by Kentaro Hara.
+
+ Inlined ElementShadow::attachHost(), ElementShadow::detachHost() and
+ ElementShadow::reattach()
+
+ No new tests. No behavior change.
+
+ * dom/Element.cpp:
+ (WebCore::Element::attach):
+ (WebCore::Element::detach):
+ * dom/ElementShadow.cpp:
+ (WebCore::ElememtnShadow::reattachHostChildrenAndShadow):
+ * dom/ElementShadow.h:
+ (ElementShadow):
+
2012-05-28 Peter Rybin <peter.ry...@gmail.com>
Web Inspector: CodeGeneratorInspector.py: protect typed API from C++ implicit float to int cast
Modified: trunk/Source/WebCore/dom/Element.cpp (118653 => 118654)
--- trunk/Source/WebCore/dom/Element.cpp 2012-05-28 08:17:51 UTC (rev 118653)
+++ trunk/Source/WebCore/dom/Element.cpp 2012-05-28 08:40:02 UTC (rev 118654)
@@ -947,7 +947,9 @@
// When a shadow root exists, it does the work of attaching the children.
if (ElementShadow* shadow = this->shadow()) {
parentPusher.push();
- shadow->attachHost(this);
+ shadow->attach();
+ attachChildrenIfNeeded();
+ attachAsNode();
} else {
if (firstChild())
parentPusher.push();
@@ -983,9 +985,11 @@
if (hasRareData())
rareData()->resetComputedStyle();
- if (ElementShadow* shadow = this->shadow())
- shadow->detachHost(this);
- else
+ if (ElementShadow* shadow = this->shadow()) {
+ detachChildrenIfNeeded();
+ shadow->detach();
+ detachAsNode();
+ } else
ContainerNode::detach();
RenderWidget::resumeWidgetHierarchyUpdates();
Modified: trunk/Source/WebCore/dom/ElementShadow.cpp (118653 => 118654)
--- trunk/Source/WebCore/dom/ElementShadow.cpp 2012-05-28 08:17:51 UTC (rev 118653)
+++ trunk/Source/WebCore/dom/ElementShadow.cpp 2012-05-28 08:40:02 UTC (rev 118654)
@@ -123,13 +123,6 @@
distributor().didDistribute();
}
-void ElementShadow::attachHost(Element* host)
-{
- attach();
- host->attachChildrenIfNeeded();
- host->attachAsNode();
-}
-
void ElementShadow::detach()
{
for (ShadowRoot* root = youngestShadowRoot(); root; root = root->olderShadowRoot()) {
@@ -138,13 +131,6 @@
}
}
-void ElementShadow::detachHost(Element* host)
-{
- host->detachChildrenIfNeeded();
- detach();
- host->detachAsNode();
-}
-
InsertionPoint* ElementShadow::insertionPointFor(const Node* node) const
{
ASSERT(node && node->parentNode());
@@ -159,12 +145,6 @@
return distributor().findInsertionPointFor(node);
}
-void ElementShadow::reattach()
-{
- detach();
- attach();
-}
-
bool ElementShadow::childNeedsStyleRecalc()
{
ASSERT(youngestShadowRoot());
@@ -241,7 +221,8 @@
Element* hostNode = youngestShadowRoot()->host();
hostNode->detachChildrenIfNeeded();
- reattach();
+ detach();
+ attach();
hostNode->attachChildrenIfNeeded();
}
Modified: trunk/Source/WebCore/dom/ElementShadow.h (118653 => 118654)
--- trunk/Source/WebCore/dom/ElementShadow.h 2012-05-28 08:17:51 UTC (rev 118653)
+++ trunk/Source/WebCore/dom/ElementShadow.h 2012-05-28 08:40:02 UTC (rev 118654)
@@ -56,9 +56,6 @@
void attach();
void detach();
- void reattach();
- void attachHost(Element*);
- void detachHost(Element*);
bool childNeedsStyleRecalc();
bool needsStyleRecalc();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
