[webkit-changes] [115393] trunk/Source/WebKit/chromium

Thu, 26 Apr 2012 18:05:58 -0700

Title: [115393] trunk/Source/WebKit/chromium
Revision
115393
Author
[email protected]
Date
2012-04-26 18:06:50 -0700 (Thu, 26 Apr 2012)

Log Message

Cleanup WebMediaPlayer enum values that didn't match Chromium style guidelines
https://bugs.webkit.org/show_bug.cgi?id=84998

Patch by Aaron Colwell <[email protected]> on 2012-04-26
Reviewed by Darin Fisher.

* public/WebMediaPlayer.h:
(WebKit::WebMediaPlayer::generateKeyRequest):
(WebKit::WebMediaPlayer::addKey):
(WebKit::WebMediaPlayer::cancelKeyRequest):

Modified Paths

Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (115392 => 115393)


--- trunk/Source/WebKit/chromium/ChangeLog	2012-04-27 01:03:26 UTC (rev 115392)
+++ trunk/Source/WebKit/chromium/ChangeLog	2012-04-27 01:06:50 UTC (rev 115393)
@@ -1,3 +1,15 @@
+2012-04-26  Aaron Colwell  <[email protected]>
+
+        Cleanup WebMediaPlayer enum values that didn't match Chromium style guidelines
+        https://bugs.webkit.org/show_bug.cgi?id=84998
+
+        Reviewed by Darin Fisher.
+
+        * public/WebMediaPlayer.h:
+        (WebKit::WebMediaPlayer::generateKeyRequest):
+        (WebKit::WebMediaPlayer::addKey):
+        (WebKit::WebMediaPlayer::cancelKeyRequest):
+
 2012-04-26  Shawn Singh  <[email protected]>
 
         [chromium] re-implement backFaceVisibility to avoid dealing with perspective w<0 problem

Modified: trunk/Source/WebKit/chromium/public/WebMediaPlayer.h (115392 => 115393)


--- trunk/Source/WebKit/chromium/public/WebMediaPlayer.h	2012-04-27 01:03:26 UTC (rev 115392)
+++ trunk/Source/WebKit/chromium/public/WebMediaPlayer.h	2012-04-27 01:06:50 UTC (rev 115393)
@@ -57,13 +57,6 @@
         NetworkStateFormatError,
         NetworkStateNetworkError,
         NetworkStateDecodeError,
-        Empty = NetworkStateEmpty,
-        Idle = NetworkStateIdle,
-        Loading = NetworkStateLoading,
-        Loaded = NetworkStateLoaded,
-        FormatError = NetworkStateFormatError,
-        NetworkError = NetworkStateNetworkError,
-        DecodeError = NetworkStateDecodeError,
     };
 
     enum ReadyState {
@@ -72,11 +65,6 @@
         ReadyStateHaveCurrentData,
         ReadyStateHaveFutureData,
         ReadyStateHaveEnoughData,
-        HaveNothing = ReadyStateHaveNothing,
-        HaveMetadata = ReadyStateHaveMetadata,
-        HaveCurrentData = ReadyStateHaveCurrentData,
-        HaveFutureData = ReadyStateHaveFutureData,
-        HaveEnoughData = ReadyStateHaveEnoughData,
     };
 
     enum MovieLoadType {
@@ -84,19 +72,12 @@
         MovieLoadTypeDownload,
         MovieLoadTypeStoredStream,
         MovieLoadTypeLiveStream,
-        Unknown = MovieLoadTypeUnknown,
-        Download = MovieLoadTypeDownload,
-        StoredStream = MovieLoadTypeStoredStream,
-        LiveStream = MovieLoadTypeLiveStream,
     };
 
     enum Preload {
         PreloadNone,
         PreloadMetaData,
         PreloadAuto,
-        None = PreloadNone,
-        MetaData = PreloadMetaData,
-        Auto = PreloadAuto,
     };
 
     enum AddIdStatus {
@@ -109,9 +90,6 @@
         EndOfStreamStatusNoError,
         EndOfStreamStatusNetworkError,
         EndOfStreamStatusDecodeError,
-        EosNoError = EndOfStreamStatusNoError,
-        EosNetworkError = EndOfStreamStatusNetworkError,
-        EosDecodeError = EndOfStreamStatusDecodeError,
     };
 
     // Represents synchronous exceptions that can be thrown from the Encrypted
@@ -120,9 +98,6 @@
         MediaKeyExceptionNoError,
         MediaKeyExceptionInvalidPlayerState,
         MediaKeyExceptionKeySystemNotSupported,
-        NoError = MediaKeyExceptionNoError,
-        InvalidPlayerState = MediaKeyExceptionInvalidPlayerState,
-        KeySystemNotSupported = MediaKeyExceptionKeySystemNotSupported,
     };
 
     virtual ~WebMediaPlayer() {}
@@ -205,9 +180,9 @@
 
     // Returns whether keySystem is supported. If true, the result will be
     // reported by an event.
-    virtual MediaKeyException generateKeyRequest(const WebString& keySystem, const unsigned char* initData, unsigned initDataLength) { return KeySystemNotSupported; }
-    virtual MediaKeyException addKey(const WebString& keySystem, const unsigned char* key, unsigned keyLength, const unsigned char* initData, unsigned initDataLength, const WebString& sessionId) { return KeySystemNotSupported; }
-    virtual MediaKeyException cancelKeyRequest(const WebString& keySystem, const WebString& sessionId) { return KeySystemNotSupported; }
+    virtual MediaKeyException generateKeyRequest(const WebString& keySystem, const unsigned char* initData, unsigned initDataLength) { return MediaKeyExceptionKeySystemNotSupported; }
+    virtual MediaKeyException addKey(const WebString& keySystem, const unsigned char* key, unsigned keyLength, const unsigned char* initData, unsigned initDataLength, const WebString& sessionId) { return MediaKeyExceptionKeySystemNotSupported; }
+    virtual MediaKeyException cancelKeyRequest(const WebString& keySystem, const WebString& sessionId) { return MediaKeyExceptionKeySystemNotSupported; }
 };
 
 } // namespace WebKit

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to