| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights 
     reserved. | 2  * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights 
     reserved. | 
| 3  * | 3  * | 
| 4  * Redistribution and use in source and binary forms, with or without | 4  * Redistribution and use in source and binary forms, with or without | 
| 5  * modification, are permitted provided that the following conditions | 5  * modification, are permitted provided that the following conditions | 
| 6  * are met: | 6  * are met: | 
| 7  * 1. Redistributions of source code must retain the above copyright | 7  * 1. Redistributions of source code must retain the above copyright | 
| 8  *    notice, this list of conditions and the following disclaimer. | 8  *    notice, this list of conditions and the following disclaimer. | 
| 9  * 2. Redistributions in binary form must reproduce the above copyright | 9  * 2. Redistributions in binary form must reproduce the above copyright | 
| 10  *    notice, this list of conditions and the following disclaimer in the | 10  *    notice, this list of conditions and the following disclaimer in the | 
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 78     virtual void mediaPlayerRepaint() = 0; | 78     virtual void mediaPlayerRepaint() = 0; | 
| 79 | 79 | 
| 80     // the movie size has changed | 80     // the movie size has changed | 
| 81     virtual void mediaPlayerSizeChanged() = 0; | 81     virtual void mediaPlayerSizeChanged() = 0; | 
| 82 | 82 | 
| 83     enum MediaKeyErrorCode { UnknownError = 1, ClientError, ServiceError, Output
     Error, HardwareChangeError, DomainError }; | 83     enum MediaKeyErrorCode { UnknownError = 1, ClientError, ServiceError, Output
     Error, HardwareChangeError, DomainError }; | 
| 84     virtual void mediaPlayerKeyAdded(const String& /* keySystem */, const String
     & /* sessionId */) = 0; | 84     virtual void mediaPlayerKeyAdded(const String& /* keySystem */, const String
     & /* sessionId */) = 0; | 
| 85     virtual void mediaPlayerKeyError(const String& /* keySystem */, const String
     & /* sessionId */, MediaKeyErrorCode, unsigned short /* systemCode */) = 0; | 85     virtual void mediaPlayerKeyError(const String& /* keySystem */, const String
     & /* sessionId */, MediaKeyErrorCode, unsigned short /* systemCode */) = 0; | 
| 86     virtual void mediaPlayerKeyMessage(const String& /* keySystem */, const Stri
     ng& /* sessionId */, const unsigned char* /* message */, unsigned /* messageLeng
     th */, const KURL& /* defaultURL */) = 0; | 86     virtual void mediaPlayerKeyMessage(const String& /* keySystem */, const Stri
     ng& /* sessionId */, const unsigned char* /* message */, unsigned /* messageLeng
     th */, const KURL& /* defaultURL */) = 0; | 
| 87     virtual bool mediaPlayerKeyNeeded(const String& /* keySystem */, const Strin
     g& /* sessionId */, const unsigned char* /* initData */, unsigned /* initDataLen
     gth */) = 0; | 87     virtual bool mediaPlayerKeyNeeded(const String& /* keySystem */, const Strin
     g& /* sessionId */, const unsigned char* /* initData */, unsigned /* initDataLen
     gth */) = 0; | 
| 88 |  | 
| 89 #if ENABLE(ENCRYPTED_MEDIA_V2) |  | 
| 90     virtual bool mediaPlayerKeyNeeded(Uint8Array*) = 0; | 88     virtual bool mediaPlayerKeyNeeded(Uint8Array*) = 0; | 
| 91 #endif |  | 
| 92 | 89 | 
| 93     virtual CORSMode mediaPlayerCORSMode() const = 0; | 90     virtual CORSMode mediaPlayerCORSMode() const = 0; | 
| 94 | 91 | 
| 95     virtual void mediaPlayerSetWebLayer(blink::WebLayer*) = 0; | 92     virtual void mediaPlayerSetWebLayer(blink::WebLayer*) = 0; | 
| 96     virtual void mediaPlayerSetOpaque(bool) = 0; | 93     virtual void mediaPlayerSetOpaque(bool) = 0; | 
| 97 | 94 | 
| 98     virtual void mediaPlayerDidAddTrack(blink::WebInbandTextTrack*) = 0; | 95     virtual void mediaPlayerDidAddTrack(blink::WebInbandTextTrack*) = 0; | 
| 99     virtual void mediaPlayerDidRemoveTrack(blink::WebInbandTextTrack*) = 0; | 96     virtual void mediaPlayerDidRemoveTrack(blink::WebInbandTextTrack*) = 0; | 
| 100 }; | 97 }; | 
| 101 | 98 | 
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 184 | 181 | 
| 185     enum MediaKeyException { NoError, InvalidPlayerState, KeySystemNotSupported,
      InvalidAccess }; | 182     enum MediaKeyException { NoError, InvalidPlayerState, KeySystemNotSupported,
      InvalidAccess }; | 
| 186     virtual MediaKeyException addKey(const String&, const unsigned char*, unsign
     ed, const unsigned char*, unsigned, const String&) = 0; | 183     virtual MediaKeyException addKey(const String&, const unsigned char*, unsign
     ed, const unsigned char*, unsigned, const String&) = 0; | 
| 187     virtual MediaKeyException generateKeyRequest(const String&, const unsigned c
     har*, unsigned) = 0; | 184     virtual MediaKeyException generateKeyRequest(const String&, const unsigned c
     har*, unsigned) = 0; | 
| 188     virtual MediaKeyException cancelKeyRequest(const String&, const String&) = 0
     ; | 185     virtual MediaKeyException cancelKeyRequest(const String&, const String&) = 0
     ; | 
| 189 }; | 186 }; | 
| 190 | 187 | 
| 191 } | 188 } | 
| 192 | 189 | 
| 193 #endif // MediaPlayer_h | 190 #endif // MediaPlayer_h | 
| OLD | NEW | 
|---|