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

Side by Side Diff: third_party/WebKit/Source/modules/mediasource/URLMediaSource.cpp

Issue 2002073002: 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: Rebase and fix test failures 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 | « third_party/WebKit/Source/modules/mediasource/TrackDefault.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 20 matching lines...) Expand all
31 #include "modules/mediasource/URLMediaSource.h" 31 #include "modules/mediasource/URLMediaSource.h"
32 32
33 #include "core/dom/DOMURL.h" 33 #include "core/dom/DOMURL.h"
34 #include "modules/mediasource/MediaSource.h" 34 #include "modules/mediasource/MediaSource.h"
35 35
36 namespace blink { 36 namespace blink {
37 37
38 String URLMediaSource::createObjectURL(ExecutionContext* executionContext, Media Source* source) 38 String URLMediaSource::createObjectURL(ExecutionContext* executionContext, Media Source* source)
39 { 39 {
40 // Since WebWorkers cannot obtain MediaSource objects, we should be on the m ain thread. 40 // Since WebWorkers cannot obtain MediaSource objects, we should be on the m ain thread.
41 ASSERT(isMainThread()); 41 DCHECK(isMainThread());
42 42
43 if (!executionContext) 43 if (!executionContext)
44 return String(); 44 return String();
45 return DOMURL::createPublicURL(executionContext, source); 45 return DOMURL::createPublicURL(executionContext, source);
46 } 46 }
47 47
48 } // namespace blink 48 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/modules/mediasource/TrackDefault.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698