Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(358)

Side by Side Diff: Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp

Issue 635233004: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/modules (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h" 6 #include "modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h"
7 7
8 #include "bindings/core/v8/ExceptionState.h" 8 #include "bindings/core/v8/ExceptionState.h"
9 #include "bindings/core/v8/ScriptPromise.h" 9 #include "bindings/core/v8/ScriptPromise.h"
10 #include "bindings/core/v8/ScriptPromiseResolver.h" 10 #include "bindings/core/v8/ScriptPromiseResolver.h"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 RefPtrWillBePersistent<HTMLMediaElement> m_element; 67 RefPtrWillBePersistent<HTMLMediaElement> m_element;
68 Persistent<MediaKeys> m_newMediaKeys; 68 Persistent<MediaKeys> m_newMediaKeys;
69 Timer<SetMediaKeysHandler> m_timer; 69 Timer<SetMediaKeysHandler> m_timer;
70 }; 70 };
71 71
72 typedef Function<void()> SuccessCallback; 72 typedef Function<void()> SuccessCallback;
73 typedef Function<void(ExceptionCode, const String&)> FailureCallback; 73 typedef Function<void(ExceptionCode, const String&)> FailureCallback;
74 74
75 // Represents the result used when setContentDecryptionModule() is called. 75 // Represents the result used when setContentDecryptionModule() is called.
76 // Calls |success| if result is resolved, |failure| is result is rejected. 76 // Calls |success| if result is resolved, |failure| is result is rejected.
77 class SetContentDecryptionModuleResult FINAL : public ContentDecryptionModuleRes ult { 77 class SetContentDecryptionModuleResult final : public ContentDecryptionModuleRes ult {
78 public: 78 public:
79 SetContentDecryptionModuleResult(SuccessCallback success, FailureCallback fa ilure) 79 SetContentDecryptionModuleResult(SuccessCallback success, FailureCallback fa ilure)
80 : m_successCallback(success) 80 : m_successCallback(success)
81 , m_failureCallback(failure) 81 , m_failureCallback(failure)
82 { 82 {
83 } 83 }
84 84
85 // ContentDecryptionModuleResult implementation. 85 // ContentDecryptionModuleResult implementation.
86 virtual void complete() OVERRIDE 86 virtual void complete() override
87 { 87 {
88 m_successCallback(); 88 m_successCallback();
89 } 89 }
90 90
91 virtual void completeWithSession(blink::WebContentDecryptionModuleResult::Se ssionStatus status) OVERRIDE 91 virtual void completeWithSession(blink::WebContentDecryptionModuleResult::Se ssionStatus status) override
92 { 92 {
93 ASSERT_NOT_REACHED(); 93 ASSERT_NOT_REACHED();
94 m_failureCallback(InvalidStateError, "Unexpected completion."); 94 m_failureCallback(InvalidStateError, "Unexpected completion.");
95 } 95 }
96 96
97 virtual void completeWithError(blink::WebContentDecryptionModuleException co de, unsigned long systemCode, const blink::WebString& message) OVERRIDE 97 virtual void completeWithError(blink::WebContentDecryptionModuleException co de, unsigned long systemCode, const blink::WebString& message) override
98 { 98 {
99 m_failureCallback(WebCdmExceptionToExceptionCode(code), message); 99 m_failureCallback(WebCdmExceptionToExceptionCode(code), message);
100 } 100 }
101 101
102 private: 102 private:
103 SuccessCallback m_successCallback; 103 SuccessCallback m_successCallback;
104 FailureCallback m_failureCallback; 104 FailureCallback m_failureCallback;
105 }; 105 };
106 106
107 ScriptPromise SetMediaKeysHandler::create(ScriptState* scriptState, HTMLMediaEle ment& element, MediaKeys* mediaKeys) 107 ScriptPromise SetMediaKeysHandler::create(ScriptState* scriptState, HTMLMediaEle ment& element, MediaKeys* mediaKeys)
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 return thisElement.contentDecryptionModule(); 541 return thisElement.contentDecryptionModule();
542 } 542 }
543 543
544 void HTMLMediaElementEncryptedMedia::trace(Visitor* visitor) 544 void HTMLMediaElementEncryptedMedia::trace(Visitor* visitor)
545 { 545 {
546 visitor->trace(m_mediaKeys); 546 visitor->trace(m_mediaKeys);
547 WillBeHeapSupplement<HTMLMediaElement>::trace(visitor); 547 WillBeHeapSupplement<HTMLMediaElement>::trace(visitor);
548 } 548 }
549 549
550 } // namespace blink 550 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h ('k') | Source/modules/encryptedmedia/MediaKeyMessageEvent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698