Title: [96914] trunk/Source/WebCore
- Revision
- 96914
- Author
- ann...@chromium.org
- Date
- 2011-10-07 01:11:47 -0700 (Fri, 07 Oct 2011)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (96913 => 96914)
--- trunk/Source/WebCore/ChangeLog 2011-10-07 07:59:47 UTC (rev 96913)
+++ trunk/Source/WebCore/ChangeLog 2011-10-07 08:11:47 UTC (rev 96914)
@@ -1,5 +1,23 @@
2011-10-07 Anna Cavender <ann...@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 <ann...@chromium.org>
+
Adding parens in WebVTTParser.cpp to appease compiler preferences.
https://bugs.webkit.org/show_bug.cgi?id=69602
Modified: trunk/Source/WebCore/html/LoadableTextTrack.cpp (96913 => 96914)
--- trunk/Source/WebCore/html/LoadableTextTrack.cpp 2011-10-07 07:59:47 UTC (rev 96913)
+++ trunk/Source/WebCore/html/LoadableTextTrack.cpp 2011-10-07 08:11:47 UTC (rev 96914)
@@ -58,17 +58,17 @@
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);
}
void LoadableTextTrack::newCuesLoaded()
Modified: trunk/Source/WebCore/html/TextTrack.cpp (96913 => 96914)
--- trunk/Source/WebCore/html/TextTrack.cpp 2011-10-07 07:59:47 UTC (rev 96913)
+++ trunk/Source/WebCore/html/TextTrack.cpp 2011-10-07 08:11:47 UTC (rev 96914)
@@ -42,8 +42,8 @@
: m_kind(kind)
, m_label(label)
, m_language(language)
- , m_readyState(TextTrack::NONE)
- , m_mode(TextTrack::SHOWING)
+ , m_readyState(TextTrack::None)
+ , m_mode(TextTrack::Showing)
{
}
@@ -85,7 +85,7 @@
{
// 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
ec = INVALID_ACCESS_ERR;
Modified: trunk/Source/WebCore/html/TextTrack.h (96913 => 96914)
--- trunk/Source/WebCore/html/TextTrack.h 2011-10-07 07:59:47 UTC (rev 96913)
+++ trunk/Source/WebCore/html/TextTrack.h 2011-10-07 08:11:47 UTC (rev 96914)
@@ -58,10 +58,10 @@
String label() const;
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&);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
