Changeset 96914 in webkit

Timestamp:

Oct 7, 2011 1:11:47 AM (13 years ago)

Author:

annacc@chromium.org

Message:

Change enum value names for TextTrack::readyState and TextTrack::mode
​https://bugs.webkit.org/show_bug.cgi?id=69603

Reviewed by David Levin.

No new tests. No new functionality.

• html/LoadableTextTrack.cpp:

(WebCore::LoadableTextTrack::trackLoadStarted):
(WebCore::LoadableTextTrack::trackLoadError):
(WebCore::LoadableTextTrack::trackLoadCompleted):

• html/TextTrack.cpp:

(WebCore::TextTrack::TextTrack):
(WebCore::TextTrack::setMode):

• html/TextTrack.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/LoadableTextTrack.cpp (modified) (1 diff)
• html/TextTrack.cpp (modified) (2 diffs)
• html/TextTrack.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-07  Anna Cavender  <annacc@chromium.org>
+
+        Change enum value names for TextTrack::readyState and TextTrack::mode
+        https://bugs.webkit.org/show_bug.cgi?id=69603
+
+        Reviewed by David Levin.
+
+        No new tests. No new functionality.
+
+        * html/LoadableTextTrack.cpp:
+        (WebCore::LoadableTextTrack::trackLoadStarted):
+        (WebCore::LoadableTextTrack::trackLoadError):
+        (WebCore::LoadableTextTrack::trackLoadCompleted):
+        * html/TextTrack.cpp:
+        (WebCore::TextTrack::TextTrack):
+        (WebCore::TextTrack::setMode):
+        * html/TextTrack.h:
+
 2011-10-07  Anna Cavender  <annacc@chromium.org>
 

trunk/Source/WebCore/html/LoadableTextTrack.cpp

@@ -59 +59 @@
 void LoadableTextTrack::trackLoadStarted()
 {
-    setReadyState(TextTrack::LOADING);
+    setReadyState(TextTrack::Loading);
 }
 
 void LoadableTextTrack::trackLoadError()
 {
-    setReadyState(TextTrack::ERROR);
+    setReadyState(TextTrack::Error);
 }
 
 void LoadableTextTrack::trackLoadCompleted()
 {
-    setReadyState(TextTrack::LOADED);
+    setReadyState(TextTrack::Loaded);
 }
 

trunk/Source/WebCore/html/TextTrack.cpp

@@ -43 +43 @@
     , m_label(label)
     , m_language(language)
-    , m_readyState(TextTrack::NONE)
-    , m_mode(TextTrack::SHOWING)
+    , m_readyState(TextTrack::None)
+    , m_mode(TextTrack::Showing)
 {
 }
@@ -86 +86 @@
     // 4.8.10.12.5 On setting the mode, if the new value is not either 0, 1, or 2,
     // the user agent must throw an INVALID_ACCESS_ERR exception.
-    if (mode == TextTrack::OFF || mode == TextTrack::HIDDEN || mode == TextTrack::SHOWING)
+    if (mode == TextTrack::Off || mode == TextTrack::Hidden || mode == TextTrack::Showing)
         m_mode = static_cast<Mode>(mode);
     else

trunk/Source/WebCore/html/TextTrack.h

@@ -59 +59 @@
     String language() const;
 
-    enum ReadyState { NONE, LOADING, LOADED, ERROR };
+    enum ReadyState { None, Loading, Loaded, Error };
     ReadyState readyState() const;
 
-    enum Mode { OFF = 0, HIDDEN = 1, SHOWING = 2 };
+    enum Mode { Off = 0, Hidden = 1, Showing = 2 };
     Mode mode() const;
     void setMode(unsigned short, ExceptionCode&);