Diff
Modified: trunk/Source/WebCore/ChangeLog (123081 => 123082)
--- trunk/Source/WebCore/ChangeLog 2012-07-19 08:55:06 UTC (rev 123081)
+++ trunk/Source/WebCore/ChangeLog 2012-07-19 08:56:12 UTC (rev 123082)
@@ -1,3 +1,47 @@
+2012-07-19 Shinya Kawanaka <shin...@chromium.org>
+
+ [Refactoring] Use userAgentShadowRoot() to take user agent shadow root.
+ https://bugs.webkit.org/show_bug.cgi?id=91716
+
+ Reviewed by Hajime Morita.
+
+ We have introduced Element::userAgentShadowRoot in r123071 to take user agent shadow root.
+ We have used shadow()->oldestShadowRoot() to take the user agent shadow root, however its code intention was
+ not so clear. Using userAgentShadowRoot() will make it clearer.
+
+ No new tests, simple refactoring.
+
+ * html/ColorInputType.cpp:
+ (WebCore::ColorInputType::createShadowSubtree):
+ (WebCore::ColorInputType::shadowColorSwatch):
+ * html/FileInputType.cpp:
+ (WebCore::FileInputType::createShadowSubtree):
+ (WebCore::FileInputType::multipleAttributeChanged):
+ * html/HTMLDetailsElement.cpp:
+ (WebCore::HTMLDetailsElement::findMainSummary):
+ * html/HTMLImageElement.cpp:
+ (WebCore::HTMLImageElement::willAddAuthorShadowRoot):
+ (WebCore::HTMLImageElement::imageElement):
+ (WebCore::HTMLImageElement::innerElement):
+ * html/HTMLKeygenElement.cpp:
+ (WebCore::HTMLKeygenElement::shadowSelect):
+ * html/HTMLTextAreaElement.cpp:
+ (WebCore::HTMLTextAreaElement::innerTextElement):
+ (WebCore::HTMLTextAreaElement::updatePlaceholderText):
+ * html/InputType.cpp:
+ (WebCore::InputType::destroyShadowSubtree):
+ * html/RangeInputType.cpp:
+ (WebCore::RangeInputType::handleMouseDownEvent):
+ (WebCore::RangeInputType::createShadowSubtree):
+ * html/TextFieldInputType.cpp:
+ (WebCore::TextFieldInputType::createShadowSubtree):
+ (WebCore::TextFieldInputType::updatePlaceholderText):
+ * html/ValidationMessage.cpp:
+ (WebCore::ValidationMessage::deleteBubbleTree):
+ * html/shadow/SliderThumbElement.cpp:
+ (WebCore::sliderThumbElementOf):
+ (WebCore::trackLimiterElementOf):
+
2012-07-19 Keishi Hattori <kei...@webkit.org>
Redraw slider tick marks when datalist changes.
Modified: trunk/Source/WebCore/html/ColorInputType.cpp (123081 => 123082)
--- trunk/Source/WebCore/html/ColorInputType.cpp 2012-07-19 08:55:06 UTC (rev 123081)
+++ trunk/Source/WebCore/html/ColorInputType.cpp 2012-07-19 08:56:12 UTC (rev 123082)
@@ -117,7 +117,7 @@
ExceptionCode ec = 0;
wrapperElement->appendChild(colorSwatch.release(), ec);
ASSERT(!ec);
- element()->shadow()->oldestShadowRoot()->appendChild(wrapperElement.release(), ec);
+ element()->userAgentShadowRoot()->appendChild(wrapperElement.release(), ec);
ASSERT(!ec);
updateColorSwatch();
@@ -191,7 +191,7 @@
HTMLElement* ColorInputType::shadowColorSwatch() const
{
- ShadowRoot* shadow = element()->shadow()->oldestShadowRoot();
+ ShadowRoot* shadow = element()->userAgentShadowRoot();
return shadow ? toHTMLElement(shadow->firstChild()->firstChild()) : 0;
}
Modified: trunk/Source/WebCore/html/FileInputType.cpp (123081 => 123082)
--- trunk/Source/WebCore/html/FileInputType.cpp 2012-07-19 08:55:06 UTC (rev 123081)
+++ trunk/Source/WebCore/html/FileInputType.cpp 2012-07-19 08:56:12 UTC (rev 123082)
@@ -297,13 +297,13 @@
{
ASSERT(element()->shadow());
ExceptionCode ec = 0;
- element()->shadow()->oldestShadowRoot()->appendChild(element()->multiple() ? UploadButtonElement::createForMultiple(element()->document()): UploadButtonElement::create(element()->document()), ec);
+ element()->userAgentShadowRoot()->appendChild(element()->multiple() ? UploadButtonElement::createForMultiple(element()->document()): UploadButtonElement::create(element()->document()), ec);
}
void FileInputType::multipleAttributeChanged()
{
ASSERT(element()->shadow());
- UploadButtonElement* button = static_cast<UploadButtonElement*>(element()->shadow()->oldestShadowRoot()->firstChild());
+ UploadButtonElement* button = static_cast<UploadButtonElement*>(element()->userAgentShadowRoot()->firstChild());
if (button)
button->setValue(element()->multiple() ? fileButtonChooseMultipleFilesLabel() : fileButtonChooseFileLabel());
}
Modified: trunk/Source/WebCore/html/HTMLDetailsElement.cpp (123081 => 123082)
--- trunk/Source/WebCore/html/HTMLDetailsElement.cpp 2012-07-19 08:55:06 UTC (rev 123081)
+++ trunk/Source/WebCore/html/HTMLDetailsElement.cpp 2012-07-19 08:56:12 UTC (rev 123082)
@@ -124,7 +124,7 @@
return toElement(child);
}
- return static_cast<DetailsSummaryElement*>(shadow()->oldestShadowRoot()->firstChild())->fallbackSummary();
+ return static_cast<DetailsSummaryElement*>(userAgentShadowRoot()->firstChild())->fallbackSummary();
}
void HTMLDetailsElement::parseAttribute(const Attribute& attribute)
Modified: trunk/Source/WebCore/html/HTMLImageElement.cpp (123081 => 123082)
--- trunk/Source/WebCore/html/HTMLImageElement.cpp 2012-07-19 08:55:06 UTC (rev 123081)
+++ trunk/Source/WebCore/html/HTMLImageElement.cpp 2012-07-19 08:56:12 UTC (rev 123082)
@@ -96,7 +96,7 @@
void HTMLImageElement::willAddAuthorShadowRoot()
{
- if (shadow()->oldestShadowRoot())
+ if (userAgentShadowRoot())
return;
createShadowSubtree();
@@ -112,9 +112,9 @@
Element* HTMLImageElement::imageElement()
{
- if (ElementShadow* elementShadow = shadow()) {
- ASSERT(elementShadow->oldestShadowRoot()->firstChild()->hasTagName(webkitInnerImageTag));
- return toElement(elementShadow->oldestShadowRoot()->firstChild());
+ if (ShadowRoot* root = userAgentShadowRoot()) {
+ ASSERT(root->firstChild()->hasTagName(webkitInnerImageTag));
+ return toElement(root->firstChild());
}
return this;
@@ -409,8 +409,8 @@
inline ImageInnerElement* HTMLImageElement::innerElement() const
{
- ASSERT(shadow());
- return toImageInnerElement(shadow()->oldestShadowRoot()->firstChild());
+ ASSERT(userAgentShadowRoot());
+ return toImageInnerElement(userAgentShadowRoot()->firstChild());
}
}
Modified: trunk/Source/WebCore/html/HTMLKeygenElement.cpp (123081 => 123082)
--- trunk/Source/WebCore/html/HTMLKeygenElement.cpp 2012-07-19 08:55:06 UTC (rev 123081)
+++ trunk/Source/WebCore/html/HTMLKeygenElement.cpp 2012-07-19 08:56:12 UTC (rev 123082)
@@ -136,7 +136,7 @@
HTMLSelectElement* HTMLKeygenElement::shadowSelect() const
{
- ShadowRoot* root = this->shadow()->oldestShadowRoot();
+ ShadowRoot* root = userAgentShadowRoot();
return root ? toHTMLSelectElement(root->firstChild()) : 0;
}
Modified: trunk/Source/WebCore/html/HTMLTextAreaElement.cpp (123081 => 123082)
--- trunk/Source/WebCore/html/HTMLTextAreaElement.cpp 2012-07-19 08:55:06 UTC (rev 123081)
+++ trunk/Source/WebCore/html/HTMLTextAreaElement.cpp 2012-07-19 08:56:12 UTC (rev 123082)
@@ -294,7 +294,7 @@
HTMLElement* HTMLTextAreaElement::innerTextElement() const
{
- Node* node = shadow()->oldestShadowRoot()->firstChild();
+ Node* node = userAgentShadowRoot()->firstChild();
ASSERT(!node || node->hasTagName(divTag));
return toHTMLElement(node);
}
@@ -505,7 +505,7 @@
String placeholderText = strippedPlaceholder();
if (placeholderText.isEmpty()) {
if (m_placeholder) {
- shadow()->oldestShadowRoot()->removeChild(m_placeholder.get(), ec);
+ userAgentShadowRoot()->removeChild(m_placeholder.get(), ec);
ASSERT(!ec);
m_placeholder.clear();
}
@@ -514,7 +514,7 @@
if (!m_placeholder) {
m_placeholder = HTMLDivElement::create(document());
m_placeholder->setShadowPseudoId("-webkit-input-placeholder");
- shadow()->oldestShadowRoot()->insertBefore(m_placeholder, innerTextElement()->nextSibling(), ec);
+ userAgentShadowRoot()->insertBefore(m_placeholder, innerTextElement()->nextSibling(), ec);
ASSERT(!ec);
}
m_placeholder->setInnerText(placeholderText, ec);
Modified: trunk/Source/WebCore/html/InputType.cpp (123081 => 123082)
--- trunk/Source/WebCore/html/InputType.cpp 2012-07-19 08:55:06 UTC (rev 123081)
+++ trunk/Source/WebCore/html/InputType.cpp 2012-07-19 08:56:12 UTC (rev 123082)
@@ -453,12 +453,10 @@
void InputType::destroyShadowSubtree()
{
- ElementShadow* shadow = element()->shadow();
- if (!shadow)
+ ShadowRoot* root = element()->userAgentShadowRoot();
+ if (!root)
return;
- ShadowRoot* root = shadow->oldestShadowRoot();
- ASSERT(root->type() == ShadowRoot::UserAgentShadowRoot);
root->removeAllChildren();
// It's ok to clear contents of all other ShadowRoots because they must have
Modified: trunk/Source/WebCore/html/RangeInputType.cpp (123081 => 123082)
--- trunk/Source/WebCore/html/RangeInputType.cpp 2012-07-19 08:55:06 UTC (rev 123081)
+++ trunk/Source/WebCore/html/RangeInputType.cpp 2012-07-19 08:56:12 UTC (rev 123082)
@@ -137,7 +137,7 @@
if (event->button() != LeftButton || !targetNode)
return;
ASSERT(element()->shadow());
- if (targetNode != element() && !targetNode->isDescendantOf(element()->shadow()->oldestShadowRoot()))
+ if (targetNode != element() && !targetNode->isDescendantOf(element()->userAgentShadowRoot()))
return;
SliderThumbElement* thumb = sliderThumbElementOf(element());
if (targetNode == thumb)
@@ -244,7 +244,7 @@
RefPtr<HTMLElement> container = SliderContainerElement::create(document);
container->appendChild(track.release(), ec);
container->appendChild(TrackLimiterElement::create(document), ec);
- element()->shadow()->oldestShadowRoot()->appendChild(container.release(), ec);
+ element()->userAgentShadowRoot()->appendChild(container.release(), ec);
}
RenderObject* RangeInputType::createRenderer(RenderArena* arena, RenderStyle*) const
Modified: trunk/Source/WebCore/html/TextFieldInputType.cpp (123081 => 123082)
--- trunk/Source/WebCore/html/TextFieldInputType.cpp 2012-07-19 08:55:06 UTC (rev 123081)
+++ trunk/Source/WebCore/html/TextFieldInputType.cpp 2012-07-19 08:56:12 UTC (rev 123082)
@@ -246,11 +246,11 @@
ExceptionCode ec = 0;
m_innerText = TextControlInnerTextElement::create(document);
if (!createsContainer) {
- element()->shadow()->oldestShadowRoot()->appendChild(m_innerText, ec);
+ element()->userAgentShadowRoot()->appendChild(m_innerText, ec);
return;
}
- ShadowRoot* shadowRoot = element()->shadow()->oldestShadowRoot();
+ ShadowRoot* shadowRoot = element()->userAgentShadowRoot();
m_container = HTMLDivElement::create(document);
m_container->setShadowPseudoId("-webkit-textfield-decoration-container");
shadowRoot->appendChild(m_container, ec);
@@ -417,7 +417,7 @@
if (!m_placeholder) {
m_placeholder = HTMLDivElement::create(element()->document());
m_placeholder->setShadowPseudoId("-webkit-input-placeholder");
- element()->shadow()->oldestShadowRoot()->insertBefore(m_placeholder, m_container ? m_container->nextSibling() : innerTextElement()->nextSibling(), ec);
+ element()->userAgentShadowRoot()->insertBefore(m_placeholder, m_container ? m_container->nextSibling() : innerTextElement()->nextSibling(), ec);
ASSERT(!ec);
}
m_placeholder->setInnerText(placeholderText, ec);
Modified: trunk/Source/WebCore/html/ValidationMessage.cpp (123081 => 123082)
--- trunk/Source/WebCore/html/ValidationMessage.cpp 2012-07-19 08:55:06 UTC (rev 123081)
+++ trunk/Source/WebCore/html/ValidationMessage.cpp 2012-07-19 08:56:12 UTC (rev 123082)
@@ -196,7 +196,7 @@
m_messageBody = 0;
HTMLElement* host = toHTMLElement(m_element);
ExceptionCode ec;
- host->shadow()->oldestShadowRoot()->removeChild(m_bubble.get(), ec);
+ host->userAgentShadowRoot()->removeChild(m_bubble.get(), ec);
m_bubble = 0;
}
m_message = String();
Modified: trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp (123081 => 123082)
--- trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp 2012-07-19 08:55:06 UTC (rev 123081)
+++ trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp 2012-07-19 08:56:12 UTC (rev 123082)
@@ -74,7 +74,7 @@
SliderThumbElement* sliderThumbElementOf(Node* node)
{
ASSERT(node);
- ShadowRoot* shadow = node->toInputElement()->shadow()->oldestShadowRoot();
+ ShadowRoot* shadow = node->toInputElement()->userAgentShadowRoot();
ASSERT(shadow);
Node* thumb = shadow->firstChild()->firstChild()->firstChild();
ASSERT(thumb);
@@ -424,8 +424,7 @@
TrackLimiterElement* trackLimiterElementOf(Node* node)
{
ASSERT(node);
- ASSERT(node->toInputElement()->shadow());
- ShadowRoot* shadow = node->toInputElement()->shadow()->oldestShadowRoot();
+ ShadowRoot* shadow = node->toInputElement()->userAgentShadowRoot();
ASSERT(shadow);
Node* limiter = shadow->firstChild()->lastChild();
ASSERT(limiter);
