| OLD | NEW |
| 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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 DCHECK(isMainThread()); | 69 DCHECK(isMainThread()); |
| 70 return m_mediaSources.get(url); | 70 return url.isNull() ? nullptr : 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 |
| OLD | NEW |