Changeset 90026 in webkit

Timestamp:

Jun 29, 2011 10:46:56 AM (13 years ago)

Author:

Dimitri Glazkov

Message:

2011-06-29 Dimitri Glazkov <Dimitri Glazkov>

Reviewed by Adam Barth.

Extract setShadowRoot function, harden it in preparation to be exposed to script.
​https://bugs.webkit.org/show_bug.cgi?id=63596

Refactoring, covered by existing tests.

• dom/Element.cpp: (WebCore::validateShadowRoot): Added. (WebCore::Element::setShadowRoot): Extracted from ensureShadowRoot. (WebCore::Element::ensureShadowRoot): Changed to use setShadowRoot.
• dom/Element.h: Added decl.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Element.cpp (modified) (2 diffs)
• dom/Element.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-29  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Extract setShadowRoot function, harden it in preparation to be exposed to script.
+        https://bugs.webkit.org/show_bug.cgi?id=63596
+
+        Refactoring, covered by existing tests.
+
+        * dom/Element.cpp:
+        (WebCore::validateShadowRoot): Added.
+        (WebCore::Element::setShadowRoot): Extracted from ensureShadowRoot.
+        (WebCore::Element::ensureShadowRoot): Changed to use setShadowRoot.
+        * dom/Element.h: Added decl.
+
 2011-06-29  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -1197 +1197 @@
 }
 
+static bool validateShadowRoot(Document* document, ShadowRoot* shadowRoot, ExceptionCode& ec)
+{
+    if (!shadowRoot)
+        return true;
+
+    if (shadowRoot->shadowHost()) {
+        ec = HIERARCHY_REQUEST_ERR;
+        return false;
+    }
+
+    if (shadowRoot->document() != document) {
+        ec = WRONG_DOCUMENT_ERR;
+        return false;
+    }
+
+    return true;
+}
+
+void Element::setShadowRoot(PassRefPtr<ShadowRoot> prpShadowRoot, ExceptionCode& ec)
+{
+    RefPtr<ShadowRoot> shadowRoot = prpShadowRoot;
+    if (!validateShadowRoot(document(), shadowRoot.get(), ec))
+        return;
+
+    removeShadowRoot();
+
+    ensureRareData()->m_shadowRoot = shadowRoot.get();
+    shadowRoot->setShadowHost(this);
+    if (inDocument())
+        shadowRoot->insertedIntoDocument();
+    if (attached())
+        shadowRoot->lazyAttach();
+}
+
 ShadowRoot* Element::ensureShadowRoot()
 {
@@ -1202 +1236 @@
         return existingRoot;
 
-    RefPtr<ShadowRoot> newRoot = ShadowRoot::create(document());
-    ensureRareData()->m_shadowRoot = newRoot.get();
-    newRoot->setShadowHost(this);
-    if (inDocument())
-        newRoot->insertedIntoDocument();
-    if (attached())
-        newRoot->lazyAttach();
-    return newRoot.get();
+    ExceptionCode ec = 0;
+    setShadowRoot(ShadowRoot::create(document()), ec);
+    ASSERT(!ec);
+    return shadowRoot();
 }
 

trunk/Source/WebCore/dom/Element.h

@@ -232 +232 @@
 
     ShadowRoot* shadowRoot() const;
+    void setShadowRoot(PassRefPtr<ShadowRoot>, ExceptionCode&);
     ShadowRoot* ensureShadowRoot();
     void removeShadowRoot();