Changeset 91982 in webkit

Timestamp:

Jul 29, 2011 3:26:13 AM (13 years ago)

Author:

tkent@chromium.org

Message:

Make the ExceptionCode argument of Element::setShadowPseudoId() ASSERT_NO_EXCEPTION by default
​https://bugs.webkit.org/show_bug.cgi?id=65363

Reviewed by Hajime Morita.

No new tests. Cleanup-only.

• dom/Element.h: Make the ExceptionCode argument ASSERT_NO_EXCEPTION by default.
• html/ColorInputType.cpp:

(WebCore::ColorInputType::createShadowSubtree): Remove the ExceptionCode argument and ASSERT(!ec).

• html/HTMLTextAreaElement.cpp:

(WebCore::HTMLTextAreaElement::updatePlaceholderText): ditto.

• html/RangeInputType.cpp:

(WebCore::RangeInputType::createShadowSubtree): ditto.

• html/TextFieldInputType.cpp:

(WebCore::TextFieldInputType::createShadowSubtree): ditto.
(WebCore::TextFieldInputType::updatePlaceholderText): ditto.

• html/ValidationMessage.cpp:

(WebCore::ValidationMessage::buildBubbleTree): ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Element.h (modified) (2 diffs)
• html/ColorInputType.cpp (modified) (1 diff)
• html/HTMLTextAreaElement.cpp (modified) (1 diff)
• html/RangeInputType.cpp (modified) (1 diff)
• html/TextFieldInputType.cpp (modified) (2 diffs)
• html/ValidationMessage.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-29  Kent Tamura  <tkent@chromium.org>
+
+        Make the ExceptionCode argument of Element::setShadowPseudoId() ASSERT_NO_EXCEPTION by default
+        https://bugs.webkit.org/show_bug.cgi?id=65363
+
+        Reviewed by Hajime Morita.
+
+        No new tests. Cleanup-only.
+
+        * dom/Element.h: Make the ExceptionCode argument ASSERT_NO_EXCEPTION by default.
+        * html/ColorInputType.cpp:
+        (WebCore::ColorInputType::createShadowSubtree): Remove the ExceptionCode argument and ASSERT(!ec).
+        * html/HTMLTextAreaElement.cpp:
+        (WebCore::HTMLTextAreaElement::updatePlaceholderText): ditto.
+        * html/RangeInputType.cpp:
+        (WebCore::RangeInputType::createShadowSubtree): ditto.
+        * html/TextFieldInputType.cpp:
+        (WebCore::TextFieldInputType::createShadowSubtree): ditto.
+        (WebCore::TextFieldInputType::updatePlaceholderText): ditto.
+        * html/ValidationMessage.cpp:
+        (WebCore::ValidationMessage::buildBubbleTree): ditto.
+
 2011-07-28  Luke Macpherson   <macpherson@chromium.org>
 

trunk/Source/WebCore/dom/Element.h

@@ -27 +27 @@
 
 #include "Document.h"
+#include "ExceptionCodePlaceholder.h"
 #include "FragmentScriptingPermission.h"
 #include "NamedNodeMap.h"
@@ -237 +238 @@
 
     virtual const AtomicString& shadowPseudoId() const;
-    void setShadowPseudoId(const AtomicString&, ExceptionCode&);
+    void setShadowPseudoId(const AtomicString&, ExceptionCode& = ASSERT_NO_EXCEPTION);
 
     RenderStyle* computedStyle(PseudoId = NOPSEUDO);

trunk/Source/WebCore/html/ColorInputType.cpp

@@ -97 +97 @@
     Document* document = element()->document();
     RefPtr<HTMLDivElement> wrapperElement = HTMLDivElement::create(document);
+    wrapperElement->setShadowPseudoId("-webkit-color-swatch-wrapper");
+    RefPtr<HTMLDivElement> colorSwatch = HTMLDivElement::create(document);
+    colorSwatch->setShadowPseudoId("-webkit-color-swatch");
     ExceptionCode ec = 0;
-    wrapperElement->setShadowPseudoId("-webkit-color-swatch-wrapper", ec);
-    ASSERT(!ec);
-    RefPtr<HTMLDivElement> colorSwatch = HTMLDivElement::create(document);
-    colorSwatch->setShadowPseudoId("-webkit-color-swatch", ec);
-    ASSERT(!ec);
     wrapperElement->appendChild(colorSwatch.release(), ec);
     ASSERT(!ec);

trunk/Source/WebCore/html/HTMLTextAreaElement.cpp

@@ -477 +477 @@
     if (!m_placeholder) {
         m_placeholder = HTMLDivElement::create(document());
-        m_placeholder->setShadowPseudoId("-webkit-input-placeholder", ec);
-        ASSERT(!ec);
+        m_placeholder->setShadowPseudoId("-webkit-input-placeholder");
         shadowRoot()->insertBefore(m_placeholder, shadowRoot()->firstChild()->nextSibling(), ec);
         ASSERT(!ec);

trunk/Source/WebCore/html/RangeInputType.cpp

@@ -233 +233 @@
 void RangeInputType::createShadowSubtree()
 {
-    ExceptionCode ec = 0;
     Document* document = element()->document();
     RefPtr<HTMLDivElement> track = HTMLDivElement::create(document);
-    track->setShadowPseudoId("-webkit-slider-runnable-track", ec);
-    ASSERT(!ec);
+    track->setShadowPseudoId("-webkit-slider-runnable-track");
+    ExceptionCode ec = 0;
     track->appendChild(SliderThumbElement::create(document), ec);
     RefPtr<HTMLElement> container = SliderContainerElement::create(document);

trunk/Source/WebCore/html/TextFieldInputType.cpp

@@ -172 +172 @@
     ShadowRoot* shadowRoot = element()->ensureShadowRoot();
     m_container = HTMLDivElement::create(document);
-    m_container->setShadowPseudoId("-webkit-textfield-decoration-container", ec);
+    m_container->setShadowPseudoId("-webkit-textfield-decoration-container");
     shadowRoot->appendChild(m_container, ec);
 
@@ -351 +351 @@
     if (!m_placeholder) {
         m_placeholder = HTMLDivElement::create(element()->document());
-        m_placeholder->setShadowPseudoId("-webkit-input-placeholder", ec);
-        ASSERT(!ec);
+        m_placeholder->setShadowPseudoId("-webkit-input-placeholder");
         element()->shadowRoot()->insertBefore(m_placeholder, m_container ? m_container->nextSibling() : innerTextElement()->nextSibling(), ec);
         ASSERT(!ec);

trunk/Source/WebCore/html/ValidationMessage.cpp

@@ -133 +133 @@
     Document* doc = host->document();
     m_bubble = HTMLDivElement::create(doc);
-    ExceptionCode ec = 0;
-    m_bubble->setShadowPseudoId("-webkit-validation-bubble", ec);
-    ASSERT(!ec);
+    m_bubble->setShadowPseudoId("-webkit-validation-bubble");
     // Need to force position:absolute because RenderMenuList doesn't assume it
     // contains non-absolute or non-fixed renderers as children.
     m_bubble->getInlineStyleDecl()->setProperty(CSSPropertyPosition, CSSValueAbsolute);
+    ExceptionCode ec = 0;
     host->ensureShadowRoot()->appendChild(m_bubble.get(), ec);
     ASSERT(!ec);
@@ -144 +143 @@
 
     RefPtr<HTMLDivElement> clipper = HTMLDivElement::create(doc);
-    clipper->setShadowPseudoId("-webkit-validation-bubble-arrow-clipper", ec);
-    ASSERT(!ec);
+    clipper->setShadowPseudoId("-webkit-validation-bubble-arrow-clipper");
     RefPtr<HTMLDivElement> bubbleArrow = HTMLDivElement::create(doc);
-    bubbleArrow->setShadowPseudoId("-webkit-validation-bubble-arrow", ec);
-    ASSERT(!ec);
+    bubbleArrow->setShadowPseudoId("-webkit-validation-bubble-arrow");
     clipper->appendChild(bubbleArrow.release(), ec);
     ASSERT(!ec);
@@ -154 +151 @@
     ASSERT(!ec);
     m_bubbleMessage = HTMLDivElement::create(doc);
-    m_bubbleMessage->setShadowPseudoId("-webkit-validation-bubble-message", ec);
-    ASSERT(!ec);
+    m_bubbleMessage->setShadowPseudoId("-webkit-validation-bubble-message");
     m_bubble->appendChild(m_bubbleMessage, ec);
     ASSERT(!ec);