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

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

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)
Patch Set: Rebasing... Created 4 years 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 /* 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 761 matching lines...) Expand 10 before | Expand all | Expand 10 after
772 } 772 }
773 773
774 std::unique_ptr<WebSourceBuffer> MediaSource::createWebSourceBuffer( 774 std::unique_ptr<WebSourceBuffer> MediaSource::createWebSourceBuffer(
775 const String& type, 775 const String& type,
776 const String& codecs, 776 const String& codecs,
777 ExceptionState& exceptionState) { 777 ExceptionState& exceptionState) {
778 WebSourceBuffer* webSourceBuffer = 0; 778 WebSourceBuffer* webSourceBuffer = 0;
779 779
780 switch (m_webMediaSource->addSourceBuffer(type, codecs, &webSourceBuffer)) { 780 switch (m_webMediaSource->addSourceBuffer(type, codecs, &webSourceBuffer)) {
781 case WebMediaSource::AddStatusOk: 781 case WebMediaSource::AddStatusOk:
782 return wrapUnique(webSourceBuffer); 782 return WTF::wrapUnique(webSourceBuffer);
783 case WebMediaSource::AddStatusNotSupported: 783 case WebMediaSource::AddStatusNotSupported:
784 DCHECK(!webSourceBuffer); 784 DCHECK(!webSourceBuffer);
785 // 2.2 785 // 2.2
786 // https://dvcs.w3.org/hg/html-media/raw-file/default/media-source/media-s ource.html#widl-MediaSource-addSourceBuffer-SourceBuffer-DOMString-type 786 // https://dvcs.w3.org/hg/html-media/raw-file/default/media-source/media-s ource.html#widl-MediaSource-addSourceBuffer-SourceBuffer-DOMString-type
787 // Step 2: If type contains a MIME type ... that is not supported with the 787 // Step 2: If type contains a MIME type ... that is not supported with the
788 // types specified for the other SourceBuffer objects in sourceBuffers, 788 // types specified for the other SourceBuffer objects in sourceBuffers,
789 // then throw a NotSupportedError exception and abort these steps. 789 // then throw a NotSupportedError exception and abort these steps.
790 logAndThrowDOMException( 790 logAndThrowDOMException(
791 exceptionState, NotSupportedError, 791 exceptionState, NotSupportedError,
792 "The type provided ('" + type + "') is not supported."); 792 "The type provided ('" + type + "') is not supported.");
(...skipping 22 matching lines...) Expand all
815 event->setTarget(this); 815 event->setTarget(this);
816 816
817 m_asyncEventQueue->enqueueEvent(event); 817 m_asyncEventQueue->enqueueEvent(event);
818 } 818 }
819 819
820 URLRegistry& MediaSource::registry() const { 820 URLRegistry& MediaSource::registry() const {
821 return MediaSourceRegistry::registry(); 821 return MediaSourceRegistry::registry();
822 } 822 }
823 823
824 } // namespace blink 824 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698