Changeset 141005 in webkit

Timestamp:

Jan 28, 2013, 1:45:11 PM (13 years ago)

Author:

esprehn@chromium.org

Message:

Move hasAuthorShadowRoot to Element
​https://bugs.webkit.org/show_bug.cgi?id=108071

Reviewed by Dimitri Glazkov.

Move hasAuthorShadowRoot to Element and get rid of unneccesary booleans
in HTMLProgressElement and HTMLMeterElement. Also get rid of
ShadowRoot::isAccessible since it obfuscates what's actually happening
inside of Element::shadowRoot().

No new tests, just refactoring.

• dom/Element.cpp:

(WebCore::Element::shadowRoot):
(WebCore::Element::hasAuthorShadowRoot):

• dom/Element.h:

(Element):

• dom/ShadowRoot.h:
• html/HTMLMeterElement.cpp:

(WebCore::HTMLMeterElement::HTMLMeterElement):

• html/HTMLMeterElement.h:

(HTMLMeterElement):

• html/HTMLProgressElement.cpp:

(WebCore::HTMLProgressElement::HTMLProgressElement):

• html/HTMLProgressElement.h:

(HTMLProgressElement):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Element.cpp (modified) (1 diff)
• dom/Element.h (modified) (1 diff)
• dom/ShadowRoot.h (modified) (1 diff)
• html/HTMLMeterElement.cpp (modified) (2 diffs)
• html/HTMLMeterElement.h (modified) (3 diffs)
• html/HTMLProgressElement.cpp (modified) (2 diffs)
• html/HTMLProgressElement.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-28  Elliott Sprehn  <esprehn@chromium.org>
+
+        Move hasAuthorShadowRoot to Element
+        https://bugs.webkit.org/show_bug.cgi?id=108071
+
+        Reviewed by Dimitri Glazkov.
+
+        Move hasAuthorShadowRoot to Element and get rid of unneccesary booleans
+        in HTMLProgressElement and HTMLMeterElement. Also get rid of
+        ShadowRoot::isAccessible since it obfuscates what's actually happening
+        inside of Element::shadowRoot().
+
+        No new tests, just refactoring.
+
+        * dom/Element.cpp:
+        (WebCore::Element::shadowRoot):
+        (WebCore::Element::hasAuthorShadowRoot):
+        * dom/Element.h:
+        (Element):
+        * dom/ShadowRoot.h:
+        * html/HTMLMeterElement.cpp:
+        (WebCore::HTMLMeterElement::HTMLMeterElement):
+        * html/HTMLMeterElement.h:
+        (HTMLMeterElement):
+        * html/HTMLProgressElement.cpp:
+        (WebCore::HTMLProgressElement::HTMLProgressElement):
+        * html/HTMLProgressElement.h:
+        (HTMLProgressElement):
+
 2013-01-28  Elliott Sprehn  <esprehn@chromium.org>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -1472 +1472 @@
         return 0;
     ShadowRoot* shadowRoot = elementShadow->youngestShadowRoot();
-    if (!shadowRoot->isAccessible())
-        return 0;
-    return shadowRoot;
+    if (shadowRoot->type() == ShadowRoot::AuthorShadowRoot)
+        return shadowRoot;
+    return 0;
 }
 

trunk/Source/WebCore/dom/Element.h

@@ -294 +294 @@
     ShadowRoot* shadowRoot() const;
 
+    bool hasAuthorShadowRoot() const { return shadowRoot(); }
     virtual void willAddAuthorShadowRoot() { }
     virtual bool areAuthorShadowsAllowed() const { return true; }

trunk/Source/WebCore/dom/ShadowRoot.h

@@ -94 +94 @@
 
     ShadowRootType type() const { return m_isAuthorShadowRoot ? AuthorShadowRoot : UserAgentShadowRoot; }
-    bool isAccessible() const { return type() == AuthorShadowRoot; }
 
     PassRefPtr<Node> cloneNode(bool, ExceptionCode&);

trunk/Source/WebCore/html/HTMLMeterElement.cpp

@@ -44 +44 @@
 HTMLMeterElement::HTMLMeterElement(const QualifiedName& tagName, Document* document)
     : LabelableElement(tagName, document)
-    , m_hasAuthorShadowRoot(false)
 {
     ASSERT(hasTagName(meterTag));
@@ -226 +225 @@
 }
 
-void HTMLMeterElement::willAddAuthorShadowRoot()
-{
-    m_hasAuthorShadowRoot = true;
-}
-
 RenderMeter* HTMLMeterElement::renderMeter() const
 {

trunk/Source/WebCore/html/HTMLMeterElement.h

@@ -40 +40 @@
     };
 
-    bool hasAuthorShadowRoot() const { return m_hasAuthorShadowRoot; }
-
     double min() const;
     void setMin(double, ExceptionCode&);
@@ -69 +67 @@
     virtual ~HTMLMeterElement();
 
-    virtual void willAddAuthorShadowRoot() OVERRIDE;
     virtual bool areAuthorShadowsAllowed() const OVERRIDE { return false; }
     RenderMeter* renderMeter() const;
@@ -86 +83 @@
 
     RefPtr<MeterValueElement> m_value;
-    bool m_hasAuthorShadowRoot;
 };
 

trunk/Source/WebCore/html/HTMLProgressElement.cpp

@@ -45 +45 @@
     : LabelableElement(tagName, document)
     , m_value(0)
-    , m_hasAuthorShadowRoot(false)
 {
     ASSERT(hasTagName(progressTag));
@@ -82 +81 @@
     ASSERT(!renderObject || renderObject->isProgress());
     return static_cast<RenderProgress*>(renderObject);
-}
-
-void HTMLProgressElement::willAddAuthorShadowRoot()
-{
-    m_hasAuthorShadowRoot = true;
 }
 

trunk/Source/WebCore/html/HTMLProgressElement.h

@@ -37 +37 @@
     static PassRefPtr<HTMLProgressElement> create(const QualifiedName&, Document*);
 
-    bool hasAuthorShadowRoot() const { return m_hasAuthorShadowRoot; }
-
     double value() const;
     void setValue(double, ExceptionCode&);
@@ -55 +53 @@
     virtual ~HTMLProgressElement();
 
-    virtual void willAddAuthorShadowRoot() OVERRIDE;
     virtual bool areAuthorShadowsAllowed() const OVERRIDE { return false; }
 
@@ -74 +71 @@
 
     ProgressValueElement* m_value;
-    bool m_hasAuthorShadowRoot;
 };