Title: [108209] trunk/Source/WebCore
- Revision
- 108209
- Author
- [email protected]
- Date
- 2012-02-19 22:17:31 -0800 (Sun, 19 Feb 2012)
Log Message
Use shadowRootList for ColorInputType
https://bugs.webkit.org/show_bug.cgi?id=79007
Reviewed by Kent Tamura.
* html/ColorInputType.cpp:
(WebCore::ColorInputType::createShadowSubtree): Changed shadowRoot to shadowRootList.
(WebCore::ColorInputType::shadowColorSwatch): Changed shadowRoot to shadowRootList.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (108208 => 108209)
--- trunk/Source/WebCore/ChangeLog 2012-02-20 06:06:07 UTC (rev 108208)
+++ trunk/Source/WebCore/ChangeLog 2012-02-20 06:17:31 UTC (rev 108209)
@@ -1,3 +1,14 @@
+2012-02-19 Keishi Hattori <[email protected]>
+
+ Use shadowRootList for ColorInputType
+ https://bugs.webkit.org/show_bug.cgi?id=79007
+
+ Reviewed by Kent Tamura.
+
+ * html/ColorInputType.cpp:
+ (WebCore::ColorInputType::createShadowSubtree): Changed shadowRoot to shadowRootList.
+ (WebCore::ColorInputType::shadowColorSwatch): Changed shadowRoot to shadowRootList.
+
2012-02-19 Shinya Kawanaka <[email protected]>
Introduce InsertionPoint, which will be a common base class of HTMLShadowElement and HTMLContentElement.
Modified: trunk/Source/WebCore/html/ColorInputType.cpp (108208 => 108209)
--- trunk/Source/WebCore/html/ColorInputType.cpp 2012-02-20 06:06:07 UTC (rev 108208)
+++ trunk/Source/WebCore/html/ColorInputType.cpp 2012-02-20 06:17:31 UTC (rev 108209)
@@ -106,7 +106,7 @@
void ColorInputType::createShadowSubtree()
{
- ASSERT(element()->shadowRoot());
+ ASSERT(element()->hasShadowRoot());
Document* document = element()->document();
RefPtr<HTMLDivElement> wrapperElement = HTMLDivElement::create(document);
@@ -116,7 +116,7 @@
ExceptionCode ec = 0;
wrapperElement->appendChild(colorSwatch.release(), ec);
ASSERT(!ec);
- element()->shadowRoot()->appendChild(wrapperElement.release(), ec);
+ element()->shadowRootList()->oldestShadowRoot()->appendChild(wrapperElement.release(), ec);
ASSERT(!ec);
updateColorSwatch();
@@ -185,7 +185,7 @@
HTMLElement* ColorInputType::shadowColorSwatch() const
{
- ShadowRoot* shadow = element()->shadowRoot();
+ ShadowRoot* shadow = element()->shadowRootList()->oldestShadowRoot();
return shadow ? toHTMLElement(shadow->firstChild()->firstChild()) : 0;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
