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

Side by Side Diff: third_party/WebKit/Source/modules/mediasession/MediaSession.cpp

Issue 2058783002: media: Replace wtf/Assertions.h macros in favor of base/logging.h macros (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/modules/mediasession/MediaSessionError.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "modules/mediasession/MediaSession.h" 5 #include "modules/mediasession/MediaSession.h"
6 6
7 #include "bindings/core/v8/CallbackPromiseAdapter.h" 7 #include "bindings/core/v8/CallbackPromiseAdapter.h"
8 #include "bindings/core/v8/ScriptPromiseResolver.h" 8 #include "bindings/core/v8/ScriptPromiseResolver.h"
9 #include "bindings/core/v8/ScriptState.h" 9 #include "bindings/core/v8/ScriptState.h"
10 #include "core/dom/DOMException.h" 10 #include "core/dom/DOMException.h"
11 #include "core/dom/ExceptionCode.h" 11 #include "core/dom/ExceptionCode.h"
12 #include "core/frame/LocalDOMWindow.h" 12 #include "core/frame/LocalDOMWindow.h"
13 #include "core/frame/LocalFrame.h" 13 #include "core/frame/LocalFrame.h"
14 #include "core/loader/FrameLoaderClient.h" 14 #include "core/loader/FrameLoaderClient.h"
15 #include "modules/mediasession/MediaMetadata.h" 15 #include "modules/mediasession/MediaMetadata.h"
16 #include "modules/mediasession/MediaSessionError.h" 16 #include "modules/mediasession/MediaSessionError.h"
17 17
18 namespace blink { 18 namespace blink {
19 19
20 MediaSession::MediaSession(PassOwnPtr<WebMediaSession> webMediaSession) 20 MediaSession::MediaSession(PassOwnPtr<WebMediaSession> webMediaSession)
21 : m_webMediaSession(std::move(webMediaSession)) 21 : m_webMediaSession(std::move(webMediaSession))
22 { 22 {
23 ASSERT(m_webMediaSession); 23 DCHECK(m_webMediaSession);
24 } 24 }
25 25
26 MediaSession* MediaSession::create(ExecutionContext* context, ExceptionState& ex ceptionState) 26 MediaSession* MediaSession::create(ExecutionContext* context, ExceptionState& ex ceptionState)
27 { 27 {
28 Document* document = toDocument(context); 28 Document* document = toDocument(context);
29 LocalFrame* frame = document->frame(); 29 LocalFrame* frame = document->frame();
30 FrameLoaderClient* client = frame->loader().client(); 30 FrameLoaderClient* client = frame->loader().client();
31 OwnPtr<WebMediaSession> webMediaSession = client->createWebMediaSession(); 31 OwnPtr<WebMediaSession> webMediaSession = client->createWebMediaSession();
32 if (!webMediaSession) { 32 if (!webMediaSession) {
33 exceptionState.throwDOMException(NotSupportedError, "Missing platform im plementation."); 33 exceptionState.throwDOMException(NotSupportedError, "Missing platform im plementation.");
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 { 65 {
66 return m_metadata; 66 return m_metadata;
67 } 67 }
68 68
69 DEFINE_TRACE(MediaSession) 69 DEFINE_TRACE(MediaSession)
70 { 70 {
71 visitor->trace(m_metadata); 71 visitor->trace(m_metadata);
72 } 72 }
73 73
74 } // namespace blink 74 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/modules/mediasession/MediaSessionError.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698