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

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

Issue 7566054: Revert 95542 - Plumb media data from renderers up to MediaInternals in the browser process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 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/glue/webmediaplayer_impl.cc ('k') | webkit/tools/test_shell/test_webview_delegate.cc » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/debugger.h" 10 #include "base/debug/debugger.h"
11 #include "base/file_path.h" 11 #include "base/file_path.h"
12 #include "base/file_util.h" 12 #include "base/file_util.h"
13 #include "base/i18n/icu_util.h" 13 #include "base/i18n/icu_util.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/memory/ref_counted.h" 15 #include "base/memory/ref_counted.h"
16 #include "base/memory/weak_ptr.h" 16 #include "base/memory/weak_ptr.h"
17 #include "base/message_loop.h" 17 #include "base/message_loop.h"
18 #include "base/path_service.h" 18 #include "base/path_service.h"
19 #include "base/process_util.h" 19 #include "base/process_util.h"
20 #include "base/scoped_temp_dir.h" 20 #include "base/scoped_temp_dir.h"
21 #include "base/string_piece.h" 21 #include "base/string_piece.h"
22 #include "base/string_util.h" 22 #include "base/string_util.h"
23 #include "base/stringprintf.h" 23 #include "base/stringprintf.h"
24 #include "base/sys_string_conversions.h" 24 #include "base/sys_string_conversions.h"
25 #include "base/time.h" 25 #include "base/time.h"
26 #include "base/utf_string_conversions.h" 26 #include "base/utf_string_conversions.h"
27 #include "googleurl/src/url_util.h" 27 #include "googleurl/src/url_util.h"
28 #include "grit/webkit_chromium_resources.h" 28 #include "grit/webkit_chromium_resources.h"
29 #include "media/base/filter_collection.h" 29 #include "media/base/filter_collection.h"
30 #include "media/base/media_log.h"
31 #include "media/base/message_loop_factory_impl.h" 30 #include "media/base/message_loop_factory_impl.h"
32 #include "net/base/escape.h" 31 #include "net/base/escape.h"
33 #include "net/base/net_errors.h" 32 #include "net/base/net_errors.h"
34 #include "net/base/net_util.h" 33 #include "net/base/net_util.h"
35 #include "testing/gtest/include/gtest/gtest.h" 34 #include "testing/gtest/include/gtest/gtest.h"
36 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallback s.h" 35 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallback s.h"
37 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" 36 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
38 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h" 37 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h"
39 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLError.h" 38 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLError.h"
40 #include "ui/gfx/gl/gl_context.h" 39 #include "ui/gfx/gl/gl_context.h"
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 new media::FilterCollection()); 302 new media::FilterCollection());
304 303
305 scoped_refptr<webkit_glue::VideoRendererImpl> video_renderer( 304 scoped_refptr<webkit_glue::VideoRendererImpl> video_renderer(
306 new webkit_glue::VideoRendererImpl(false)); 305 new webkit_glue::VideoRendererImpl(false));
307 collection->AddVideoRenderer(video_renderer); 306 collection->AddVideoRenderer(video_renderer);
308 307
309 scoped_ptr<webkit_glue::WebMediaPlayerImpl> result( 308 scoped_ptr<webkit_glue::WebMediaPlayerImpl> result(
310 new webkit_glue::WebMediaPlayerImpl(client, 309 new webkit_glue::WebMediaPlayerImpl(client,
311 collection.release(), 310 collection.release(),
312 message_loop_factory.release(), 311 message_loop_factory.release(),
313 NULL, 312 NULL));
314 new media::MediaLog()));
315 if (!result->Initialize(frame, false, video_renderer)) { 313 if (!result->Initialize(frame, false, video_renderer)) {
316 return NULL; 314 return NULL;
317 } 315 }
318 return result.release(); 316 return result.release();
319 } 317 }
320 318
321 WebKit::WebApplicationCacheHost* CreateApplicationCacheHost( 319 WebKit::WebApplicationCacheHost* CreateApplicationCacheHost(
322 WebFrame*, WebKit::WebApplicationCacheHostClient* client) { 320 WebFrame*, WebKit::WebApplicationCacheHostClient* client) {
323 return SimpleAppCacheSystem::CreateApplicationCacheHost(client); 321 return SimpleAppCacheSystem::CreateApplicationCacheHost(client);
324 } 322 }
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
611 test_environment->webkit_client()->fileSystem()); 609 test_environment->webkit_client()->fileSystem());
612 fileSystem->OpenFileSystem(frame, type, size, create, callbacks); 610 fileSystem->OpenFileSystem(frame, type, size, create, callbacks);
613 } 611 }
614 612
615 // Timers 613 // Timers
616 double GetForegroundTabTimerInterval() { 614 double GetForegroundTabTimerInterval() {
617 return webkit_glue::kForegroundTabTimerInterval; 615 return webkit_glue::kForegroundTabTimerInterval;
618 } 616 }
619 617
620 } // namespace webkit_support 618 } // namespace webkit_support
OLDNEW
« no previous file with comments | « webkit/glue/webmediaplayer_impl.cc ('k') | webkit/tools/test_shell/test_webview_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698