Changeset 139639 in webkit

Timestamp:

Jan 14, 2013 12:17:58 PM (11 years ago)

Author:

esprehn@chromium.org

Message:

Clean up WebVTTNodeType code
​https://bugs.webkit.org/show_bug.cgi?id=106714

Reviewed by Tony Chang.

There's no reason for so many methods just to compare some enums.
The existing code can also be simplified quite a bit.

No new tests, just refactoring.

• css/SelectorChecker.cpp:

(WebCore::SelectorChecker::checkOne):

• css/StyleResolver.cpp:

(WebCore::StyleResolver::collectMatchingRules):
(WebCore::StyleResolver::canShareStyleWithElement):

• dom/Element.cpp:

(WebCore::Element::webVTTNodeType):
(WebCore::Element::setWebVTTNodeType):

• dom/Element.h:

(Element):

• dom/ElementRareData.h:

(WebCore::ElementRareData::setWebVTTNodeType):
(WebCore::ElementRareData::webVTTNodeType):
(ElementRareData):

• dom/NodeRareData.h:

(WebCore::NodeRareData::NodeRareData):
(NodeRareData):

• html/track/TextTrack.h:
• html/track/TextTrackCue.cpp:

(WebCore::TextTrackCue::markFutureAndPastNodes):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/SelectorChecker.cpp (modified) (1 diff)
• css/StyleResolver.cpp (modified) (2 diffs)
• dom/Element.cpp (modified) (1 diff)
• dom/Element.h (modified) (2 diffs)
• dom/ElementRareData.h (modified) (1 diff)
• dom/NodeRareData.h (modified) (3 diffs)
• html/track/TextTrack.h (modified) (2 diffs)
• html/track/TextTrackCue.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-14  Elliott Sprehn  <esprehn@chromium.org>
+
+        Clean up WebVTTNodeType code
+        https://bugs.webkit.org/show_bug.cgi?id=106714
+
+        Reviewed by Tony Chang.
+
+        There's no reason for so many methods just to compare some enums.
+        The existing code can also be simplified quite a bit.
+
+        No new tests, just refactoring.
+
+        * css/SelectorChecker.cpp:
+        (WebCore::SelectorChecker::checkOne):
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::collectMatchingRules):
+        (WebCore::StyleResolver::canShareStyleWithElement):
+        * dom/Element.cpp:
+        (WebCore::Element::webVTTNodeType):
+        (WebCore::Element::setWebVTTNodeType):
+        * dom/Element.h:
+        (Element):
+        * dom/ElementRareData.h:
+        (WebCore::ElementRareData::setWebVTTNodeType):
+        (WebCore::ElementRareData::webVTTNodeType):
+        (ElementRareData):
+        * dom/NodeRareData.h:
+        (WebCore::NodeRareData::NodeRareData):
+        (NodeRareData):
+        * html/track/TextTrack.h:
+        * html/track/TextTrackCue.cpp:
+        (WebCore::TextTrackCue::markFutureAndPastNodes):
+
 2013-01-14  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/css/SelectorChecker.cpp

@@ -942 +942 @@
 #if ENABLE(VIDEO_TRACK)
         case CSSSelector::PseudoFutureCue:
-            if (element->isWebVTTFutureNode())
-                return true;
-            return false;
+            return element->webVTTNodeType() == WebVTTNodeTypeFuture;
 #endif
 

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -655 +655 @@
 
 #if ENABLE(VIDEO_TRACK)
-    if (m_element->isWebVTTNode())
+    if (m_element->webVTTNodeType())
         collectMatchingRulesForList(rules->cuePseudoRules(), firstRuleIndex, lastRuleIndex, options);
 #endif
@@ -1242 +1242 @@
 
 #if ENABLE(VIDEO_TRACK)
-    if (element->isWebVTTNode() && m_element->isWebVTTNode() && element->isWebVTTFutureNode() != m_element->isWebVTTFutureNode())
-        return false;
-    // Deny sharing styles between WebVTT nodes and non-WebVTT nodes.
-    if (element->isWebVTTNode() != m_element->isWebVTTNode())
+    if (element->webVTTNodeType() != m_element->webVTTNodeType())
         return false;
 #endif

trunk/Source/WebCore/dom/Element.cpp

@@ -2309 +2309 @@
 
 #if ENABLE(VIDEO_TRACK)
-bool Element::isWebVTTNode() const
-{
-    return hasRareData() && elementRareData()->isWebVTTNode();
-}
-
-void Element::setIsWebVTTNode()
-{
-    ensureElementRareData()->setIsWebVTTNode();
-}
-
-bool Element::isWebVTTFutureNode() const
-{
-    return hasRareData() && elementRareData()->isWebVTTFutureNode();
-}
-
-void Element::setIsWebVTTFutureNode()
-{
-    ensureElementRareData()->setIsWebVTTFutureNode();
+WebVTTNodeType Element::webVTTNodeType() const
+{
+    return hasRareData() ? elementRareData()->webVTTNodeType() : WebVTTNodeTypeNone;
+}
+
+void Element::setWebVTTNodeType(WebVTTNodeType type)
+{
+    ensureElementRareData()->setWebVTTNodeType(type);
 }
 #endif

trunk/Source/WebCore/dom/Element.h

@@ -32 +32 @@
 #include "HTMLNames.h"
 #include "ScrollTypes.h"
+#if ENABLE(VIDEO_TRACK)
+#include "TextTrack.h"
+#endif
 
 namespace WebCore {
@@ -448 +451 @@
 
 #if ENABLE(VIDEO_TRACK)
-    bool isWebVTTNode() const;
-    void setIsWebVTTNode();
-    bool isWebVTTFutureNode() const;
-    void setIsWebVTTFutureNode();
-#endif
-    
+    WebVTTNodeType webVTTNodeType() const;
+    void setWebVTTNodeType(WebVTTNodeType);
+#endif
+
 #if ENABLE(FULLSCREEN_API)
     enum {

trunk/Source/WebCore/dom/ElementRareData.h

@@ -56 +56 @@
 
 #if ENABLE(VIDEO_TRACK)
-    using NodeRareData::isWebVTTNode;
-    using NodeRareData::setIsWebVTTNode;
-    using NodeRareData::isWebVTTFutureNode;
-    using NodeRareData::setIsWebVTTFutureNode;
-#endif
+    void setWebVTTNodeType(WebVTTNodeType type) { m_webVTTNodeType = type; }
+    WebVTTNodeType webVTTNodeType() const { return static_cast<WebVTTNodeType>(m_webVTTNodeType); }
+#endif
+
 #if ENABLE(FULLSCREEN_API)
     bool containsFullScreenElement() { return m_containsFullScreenElement; }

trunk/Source/WebCore/dom/NodeRareData.h

@@ -273 +273 @@
         , m_childrenAffectedByBackwardPositionalRules(false)
 #if ENABLE(VIDEO_TRACK)
-        , m_WebVTTNodeType(TextTrack::WebVTTNodeTypeNone)
+        , m_webVTTNodeType(WebVTTNodeTypeNone)
 #endif
     {
@@ -372 +372 @@
 
 protected:
-#if ENABLE(VIDEO_TRACK)
-    bool isWebVTTNode() { return static_cast<TextTrack::WebVTTNodeType>(m_WebVTTNodeType) != TextTrack::WebVTTNodeTypeNone; }
-    void setIsWebVTTNode() { m_WebVTTNodeType = TextTrack::WebVTTNodeTypePast; }
-    bool isWebVTTFutureNode() { return static_cast<TextTrack::WebVTTNodeType>(m_WebVTTNodeType) == TextTrack::WebVTTNodeTypeFuture; }
-    void setIsWebVTTFutureNode() { m_WebVTTNodeType = TextTrack::WebVTTNodeTypeFuture; }
-#endif
     short m_tabIndex;
     unsigned short m_childIndex;
@@ -405 +399 @@
     unsigned m_childrenAffectedByBackwardPositionalRules : 1;
 #if ENABLE(VIDEO_TRACK)
-    unsigned m_WebVTTNodeType : 2;
+    unsigned m_webVTTNodeType : 2; // WebVTTNodeType
 #endif
 

trunk/Source/WebCore/html/track/TextTrack.h

@@ -52 +52 @@
     virtual void textTrackAddCue(TextTrack*, PassRefPtr<TextTrackCue>) = 0;
     virtual void textTrackRemoveCue(TextTrack*, PassRefPtr<TextTrackCue>) = 0;
+};
+
+enum WebVTTNodeType {
+    WebVTTNodeTypeNone = 0,
+    WebVTTNodeTypeFuture,
+    WebVTTNodeTypePast
 };
 
@@ -108 +114 @@
     enum TextTrackType { TrackElement, AddTrack, InBand };
     TextTrackType trackType() const { return m_trackType; }
-    
-    enum WebVTTNodeType {WebVTTNodeTypeNone, WebVTTNodeTypeFuture, WebVTTNodeTypePast};
 
     int trackIndex();

trunk/Source/WebCore/html/track/TextTrackCue.cpp

@@ -678 +678 @@
                 isPastNode = false;
         }
-        
-        if (child->isElementNode()) {
-            if (!isPastNode)
-                toElement(child)->setIsWebVTTFutureNode();
-            else
-                toElement(child)->setIsWebVTTNode();
-        }
+
+        if (child->isElementNode())
+            toElement(child)->setWebVTTNodeType(isPastNode ? WebVTTNodeTypePast : WebVTTNodeTypeFuture);
     }
 }