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

Side by Side Diff: webkit/media/webmediasourceclient_impl.cc

Issue 15937016: Update refernces to Blink's Platform API (webkit) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « webkit/media/webmediaplayer_ms.cc ('k') | webkit/mocks/mock_webhyphenator.h » ('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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "webkit/media/webmediasourceclient_impl.h" 5 #include "webkit/media/webmediasourceclient_impl.h"
6 6
7 #include "base/guid.h" 7 #include "base/guid.h"
8 #include "media/filters/chunk_demuxer.h" 8 #include "media/filters/chunk_demuxer.h"
9 #include "third_party/WebKit/Source/Platform/chromium/public/WebCString.h" 9 #include "third_party/WebKit/public/platform/WebCString.h"
10 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" 10 #include "third_party/WebKit/public/platform/WebString.h"
11 #include "webkit/media/websourcebuffer_impl.h" 11 #include "webkit/media/websourcebuffer_impl.h"
12 12
13 using ::WebKit::WebString; 13 using ::WebKit::WebString;
14 using ::WebKit::WebMediaSourceClient; 14 using ::WebKit::WebMediaSourceClient;
15 15
16 namespace webkit_media { 16 namespace webkit_media {
17 17
18 #define COMPILE_ASSERT_MATCHING_STATUS_ENUM(webkit_name, chromium_name) \ 18 #define COMPILE_ASSERT_MATCHING_STATUS_ENUM(webkit_name, chromium_name) \
19 COMPILE_ASSERT(static_cast<int>(WebMediaSourceClient::webkit_name) == \ 19 COMPILE_ASSERT(static_cast<int>(WebMediaSourceClient::webkit_name) == \
20 static_cast<int>(media::ChunkDemuxer::chromium_name), \ 20 static_cast<int>(media::ChunkDemuxer::chromium_name), \
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 break; 75 break;
76 default: 76 default:
77 NOTIMPLEMENTED(); 77 NOTIMPLEMENTED();
78 } 78 }
79 79
80 if (!demuxer_->EndOfStream(pipeline_status)) 80 if (!demuxer_->EndOfStream(pipeline_status))
81 DVLOG(1) << "EndOfStream call failed."; 81 DVLOG(1) << "EndOfStream call failed.";
82 } 82 }
83 83
84 } // namespace webkit_media 84 } // namespace webkit_media
OLDNEW
« no previous file with comments | « webkit/media/webmediaplayer_ms.cc ('k') | webkit/mocks/mock_webhyphenator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698