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

Side by Side Diff: third_party/WebKit/Source/modules/mediasource/MediaSourceRegistry.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 | « no previous file | third_party/WebKit/Source/modules/mediasource/SourceBuffer.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 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 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 19 matching lines...) Expand all
30 30
31 #include "modules/mediasource/MediaSourceRegistry.h" 31 #include "modules/mediasource/MediaSourceRegistry.h"
32 32
33 #include "modules/mediasource/MediaSource.h" 33 #include "modules/mediasource/MediaSource.h"
34 #include "platform/weborigin/KURL.h" 34 #include "platform/weborigin/KURL.h"
35 35
36 namespace blink { 36 namespace blink {
37 37
38 MediaSourceRegistry& MediaSourceRegistry::registry() 38 MediaSourceRegistry& MediaSourceRegistry::registry()
39 { 39 {
40 ASSERT(isMainThread()); 40 DCHECK(isMainThread());
41 DEFINE_STATIC_LOCAL(MediaSourceRegistry, instance, ()); 41 DEFINE_STATIC_LOCAL(MediaSourceRegistry, instance, ());
42 return instance; 42 return instance;
43 } 43 }
44 44
45 void MediaSourceRegistry::registerURL(SecurityOrigin*, const KURL& url, URLRegis trable* registrable) 45 void MediaSourceRegistry::registerURL(SecurityOrigin*, const KURL& url, URLRegis trable* registrable)
46 { 46 {
47 ASSERT(&registrable->registry() == this); 47 DCHECK_EQ(&registrable->registry(), this);
48 ASSERT(isMainThread()); 48 DCHECK(isMainThread());
49 49
50 MediaSource* source = static_cast<MediaSource*>(registrable); 50 MediaSource* source = static_cast<MediaSource*>(registrable);
51 source->addedToRegistry(); 51 source->addedToRegistry();
52 m_mediaSources.set(url.getString(), source); 52 m_mediaSources.set(url.getString(), source);
53 } 53 }
54 54
55 void MediaSourceRegistry::unregisterURL(const KURL& url) 55 void MediaSourceRegistry::unregisterURL(const KURL& url)
56 { 56 {
57 ASSERT(isMainThread()); 57 DCHECK(isMainThread());
58 PersistentHeapHashMap<String, Member<MediaSource>>::iterator iter = m_mediaS ources.find(url.getString()); 58 PersistentHeapHashMap<String, Member<MediaSource>>::iterator iter = m_mediaS ources.find(url.getString());
59 if (iter == m_mediaSources.end()) 59 if (iter == m_mediaSources.end())
60 return; 60 return;
61 61
62 MediaSource* source = iter->value; 62 MediaSource* source = iter->value;
63 m_mediaSources.remove(iter); 63 m_mediaSources.remove(iter);
64 source->removedFromRegistry(); 64 source->removedFromRegistry();
65 } 65 }
66 66
67 URLRegistrable* MediaSourceRegistry::lookup(const String& url) 67 URLRegistrable* MediaSourceRegistry::lookup(const String& url)
68 { 68 {
69 ASSERT(isMainThread()); 69 DCHECK(isMainThread());
70 return m_mediaSources.get(url); 70 return m_mediaSources.get(url);
71 } 71 }
72 72
73 MediaSourceRegistry::MediaSourceRegistry() 73 MediaSourceRegistry::MediaSourceRegistry()
74 { 74 {
75 HTMLMediaSource::setRegistry(this); 75 HTMLMediaSource::setRegistry(this);
76 } 76 }
77 77
78 } // namespace blink 78 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/modules/mediasource/SourceBuffer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698