Changeset 141235 in webkit

Timestamp:

Jan 30, 2013 1:41:34 AM (11 years ago)

Author:

esprehn@chromium.org

Message:

getDecorationRootAndDecoratedRoot should add new user agent shadow roots
​https://bugs.webkit.org/show_bug.cgi?id=108301

Reviewed by Hajime Morita.

getDecorationRootAndDecoratedRoot intended to add a second UserAgentShadowRoot
to the input, not just reuse the existing one so it could insert icons into
the inputs. Add back in this behavior for now so we can sort out the right thing
to do.

This behavior is wrong in the current architecture since it means if you had an
input type=submit, add an author shadow root, and then change the type to text
and then the browser decorates it your shadow magically becomes inaccessible since
input.shadowRoot is no longer available. This feature is currently only used for
decorating type=password fields in Chromium with an icon for password generation.

No new tests, there's no way to test this because it's only used in Chromium
by way of the ChromeClient.

• html/shadow/TextFieldDecorationElement.cpp:

(WebCore::getDecorationRootAndDecoratedRoot):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/shadow/TextFieldDecorationElement.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-30  Elliott Sprehn  <esprehn@chromium.org>
+
+        getDecorationRootAndDecoratedRoot should add new user agent shadow roots
+        https://bugs.webkit.org/show_bug.cgi?id=108301
+
+        Reviewed by Hajime Morita.
+
+        getDecorationRootAndDecoratedRoot intended to add a second UserAgentShadowRoot
+        to the input, not just reuse the existing one so it could insert icons into
+        the inputs. Add back in this behavior for now so we can sort out the right thing
+        to do.
+
+        This behavior is wrong in the current architecture since it means if you had an
+        input type=submit, add an author shadow root, and then change the type to text
+        and then the browser decorates it your shadow magically becomes inaccessible since
+        input.shadowRoot is no longer available. This feature is currently only used for
+        decorating type=password fields in Chromium with an icon for password generation.
+
+        No new tests, there's no way to test this because it's only used in Chromium
+        by way of the ChromeClient.
+
+        * html/shadow/TextFieldDecorationElement.cpp:
+        (WebCore::getDecorationRootAndDecoratedRoot):
+
 2013-01-30  Huang Dongsung  <luxtella@company100.net>
 

trunk/Source/WebCore/html/shadow/TextFieldDecorationElement.cpp

@@ -55 +55 @@
 // TextFieldDecorationElement ----------------------------------------------------------------
 
+// FIXME: This class is only used in Chromium, and has no layout tests!!
+
 TextFieldDecorationElement::TextFieldDecorationElement(Document* document, TextFieldDecorator* decorator)
     : HTMLDivElement(HTMLNames::divTag, document)
@@ -90 +92 @@
     if (newRoot)
         newRoot->removeChild(newRoot->firstChild());
-    else
-        newRoot = input->ensureUserAgentShadowRoot();
+    else {
+        // FIXME: This interacts really badly with author shadow roots because now
+        // we can interleave user agent and author shadow roots on the element meaning
+        // input.shadowRoot may be inaccessible if the browser has decided to decorate
+        // the input.
+        newRoot = input->ensureShadow()->addShadowRoot(input, ShadowRoot::UserAgentShadowRoot);
+    }
     decorationRoot = newRoot;
     decoratedRoot = existingRoot;