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

Side by Side Diff: webkit/support/webkit_support.cc

Issue 10873064: remove old createMediaPlayer which doesn't have URL as argument. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 3 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/support/webkit_support.h ('k') | webkit/tools/test_shell/test_webview_delegate.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/support/webkit_support.h" 5 #include "webkit/support/webkit_support.h"
6 6
7 #include "base/at_exit.h" 7 #include "base/at_exit.h"
8 #include "base/base64.h" 8 #include "base/base64.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 new_params.mimeType = WebString::fromUTF8(mime_types.front()); 379 new_params.mimeType = WebString::fromUTF8(mime_types.front());
380 return new WebPluginImplWithPageDelegate( 380 return new WebPluginImplWithPageDelegate(
381 frame, new_params, plugins.front().path); 381 frame, new_params, plugins.front().path);
382 } 382 }
383 383
384 WebKit::WebMediaPlayer* CreateMediaPlayer( 384 WebKit::WebMediaPlayer* CreateMediaPlayer(
385 WebFrame* frame, 385 WebFrame* frame,
386 const WebURL& url, 386 const WebURL& url,
387 WebMediaPlayerClient* client, 387 WebMediaPlayerClient* client,
388 webkit_media::MediaStreamClient* media_stream_client) { 388 webkit_media::MediaStreamClient* media_stream_client) {
389 return CreateMediaPlayer(frame, client, media_stream_client);
390 }
391
392 WebKit::WebMediaPlayer* CreateMediaPlayer(
393 WebFrame* frame,
394 WebMediaPlayerClient* client,
395 webkit_media::MediaStreamClient* media_stream_client) {
396 #if defined(OS_ANDROID) 389 #if defined(OS_ANDROID)
397 return new webkit_media::WebMediaPlayerAndroid( 390 return new webkit_media::WebMediaPlayerAndroid(
398 frame, 391 frame,
399 client, 392 client,
400 GetWebKitPlatformSupport()->cookieJar(), 393 GetWebKitPlatformSupport()->cookieJar(),
401 test_environment->media_player_manager(), 394 test_environment->media_player_manager(),
402 new webkit_support::TestStreamTextureFactory()); 395 new webkit_support::TestStreamTextureFactory());
403 #else 396 #else
404 scoped_ptr<media::MessageLoopFactory> message_loop_factory( 397 scoped_ptr<media::MessageLoopFactory> message_loop_factory(
405 new media::MessageLoopFactory()); 398 new media::MessageLoopFactory());
406 399
407 scoped_ptr<media::FilterCollection> collection( 400 scoped_ptr<media::FilterCollection> collection(
408 new media::FilterCollection()); 401 new media::FilterCollection());
409 402
410 return new webkit_media::WebMediaPlayerImpl( 403 return new webkit_media::WebMediaPlayerImpl(
411 frame, 404 frame,
412 client, 405 client,
413 base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(), 406 base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(),
414 collection.release(), 407 collection.release(),
415 NULL, 408 NULL,
416 NULL, 409 NULL,
417 message_loop_factory.release(), 410 message_loop_factory.release(),
418 media_stream_client, 411 media_stream_client,
419 new media::MediaLog()); 412 new media::MediaLog());
420 #endif 413 #endif
421 } 414 }
422 415
423 WebKit::WebMediaPlayer* CreateMediaPlayer( 416 WebKit::WebMediaPlayer* CreateMediaPlayer(
424 WebFrame* frame, 417 WebFrame* frame,
425 WebMediaPlayerClient* client) {
426 return CreateMediaPlayer(frame, client, NULL);
427 }
428
429 WebKit::WebMediaPlayer* CreateMediaPlayer(
430 WebFrame* frame,
431 const WebURL& url, 418 const WebURL& url,
432 WebMediaPlayerClient* client) { 419 WebMediaPlayerClient* client) {
433 return CreateMediaPlayer(frame, url, client, NULL); 420 return CreateMediaPlayer(frame, url, client, NULL);
434 } 421 }
435 422
436 #if defined(OS_ANDROID) 423 #if defined(OS_ANDROID)
437 void ReleaseMediaResources() { 424 void ReleaseMediaResources() {
438 test_environment->media_player_manager()->ReleaseMediaResources(); 425 test_environment->media_player_manager()->ReleaseMediaResources();
439 } 426 }
440 #endif 427 #endif
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
854 // Logging 841 // Logging
855 void EnableWebCoreLogChannels(const std::string& channels) { 842 void EnableWebCoreLogChannels(const std::string& channels) {
856 webkit_glue::EnableWebCoreLogChannels(channels); 843 webkit_glue::EnableWebCoreLogChannels(channels);
857 } 844 }
858 845
859 void SetGamepadData(const WebKit::WebGamepads& pads) { 846 void SetGamepadData(const WebKit::WebGamepads& pads) {
860 test_environment->webkit_platform_support()->setGamepadData(pads); 847 test_environment->webkit_platform_support()->setGamepadData(pads);
861 } 848 }
862 849
863 } // namespace webkit_support 850 } // namespace webkit_support
OLDNEW
« no previous file with comments | « webkit/support/webkit_support.h ('k') | webkit/tools/test_shell/test_webview_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698