summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authortkent@google.com <tkent@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-04 08:25:08 +0000
committertkent@google.com <tkent@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-04 08:25:08 +0000
commit43b3be394cf9062a2b80e4dba5d880759d060633 (patch)
tree074b05cf00d1df1e057f8cedcc23774519cbd988 /webkit/tools
parentebaac267c41fce4a5b8ed4341ba32be40c7ac43e (diff)
downloadchromium_src-43b3be394cf9062a2b80e4dba5d880759d060633.zip
chromium_src-43b3be394cf9062a2b80e4dba5d880759d060633.tar.gz
chromium_src-43b3be394cf9062a2b80e4dba5d880759d060633.tar.bz2
Initial change for DumpRrenderTree support library
This library provides: - An implementation of WebKitClient, - An implementation of WebPlugin, - An implementation of WebMediaPalyer, - Initialization and termination functions, - Two function for database, and - Some functions required by webkit_glue. webkit_support.gyp is not referred by build/all.gyp. A gyp for DRT/chromium in WebKit tree will refer to it. BUG=none TEST=none. This is a part of test code. Review URL: http://codereview.chromium.org/652226 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40610 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/test_shell/test_shell.gypi16
-rw-r--r--webkit/tools/test_shell/test_webview_delegate.cc35
2 files changed, 3 insertions, 48 deletions
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi
index 67bb736..ebdabae 100644
--- a/webkit/tools/test_shell/test_shell.gypi
+++ b/webkit/tools/test_shell/test_shell.gypi
@@ -43,6 +43,7 @@
'<(DEPTH)/webkit/webkit.gyp:database',
'<(DEPTH)/webkit/webkit.gyp:glue',
'<(DEPTH)/webkit/webkit.gyp:inspector_resources',
+ '<(DEPTH)/webkit/webkit.gyp:webkit_support',
'npapi_layout_test_plugin',
],
'msvs_guid': '77C32787-1B96-CB84-B905-7F170629F0AC',
@@ -69,22 +70,9 @@
'layout_test_controller.h',
'mock_spellcheck.cc',
'mock_spellcheck.h',
- 'mock_webclipboard_impl.cc',
- 'mock_webclipboard_impl.h',
'plain_text_controller.cc',
'plain_text_controller.h',
'resource.h',
- 'simple_appcache_system.cc',
- 'simple_appcache_system.h',
- 'simple_clipboard_impl.cc',
- 'simple_database_system.cc',
- 'simple_database_system.h',
- 'simple_resource_loader_bridge.cc',
- 'simple_resource_loader_bridge.h',
- 'simple_socket_stream_bridge.cc',
- 'simple_socket_stream_bridge.h',
- 'simple_webcookiejar_impl.h',
- 'simple_webcookiejar_impl.cc',
'test_navigation_controller.cc',
'test_navigation_controller.h',
'test_shell.cc',
@@ -102,8 +90,6 @@
'test_shell_platform_delegate_gtk.cc',
'test_shell_platform_delegate_mac.mm',
'test_shell_platform_delegate_win.cc',
- 'test_shell_request_context.cc',
- 'test_shell_request_context.h',
'test_shell_switches.cc',
'test_shell_switches.h',
'test_shell_win.cc',
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index 1cff673..ded3c1c 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -41,18 +41,14 @@
#include "third_party/WebKit/WebKit/chromium/public/WebView.h"
#include "webkit/appcache/web_application_cache_host_impl.h"
#include "webkit/glue/glue_serialize.h"
-#include "webkit/glue/media/buffered_data_source.h"
-#include "webkit/glue/media/media_resource_loader_bridge_factory.h"
-#include "webkit/glue/media/simple_data_source.h"
-#include "webkit/glue/media/video_renderer_impl.h"
#include "webkit/glue/webdropdata.h"
#include "webkit/glue/webplugin_impl.h"
#include "webkit/glue/webpreferences.h"
#include "webkit/glue/webkit_glue.h"
#include "webkit/glue/plugins/plugin_list.h"
#include "webkit/glue/plugins/webplugin_delegate_impl.h"
-#include "webkit/glue/webmediaplayer_impl.h"
#include "webkit/glue/window_open_disposition.h"
+#include "webkit/support/webkit_support.h"
#include "webkit/tools/test_shell/accessibility_controller.h"
#include "webkit/tools/test_shell/mock_spellcheck.h"
#include "webkit/tools/test_shell/test_navigation_controller.h"
@@ -642,34 +638,7 @@ WebWorker* TestWebViewDelegate::createWorker(
WebMediaPlayer* TestWebViewDelegate::createMediaPlayer(
WebFrame* frame, WebMediaPlayerClient* client) {
- scoped_refptr<media::FilterFactoryCollection> factory =
- new media::FilterFactoryCollection();
-
- WebApplicationCacheHostImpl* appcache_host =
- WebApplicationCacheHostImpl::FromFrame(frame);
-
- // TODO(hclam): this is the same piece of code as in RenderView, maybe they
- // should be grouped together.
- webkit_glue::MediaResourceLoaderBridgeFactory* bridge_factory =
- new webkit_glue::MediaResourceLoaderBridgeFactory(
- GURL(), // referrer
- "null", // frame origin
- "null", // main_frame_origin
- base::GetCurrentProcId(),
- appcache_host ? appcache_host->host_id() : appcache::kNoHostId,
- 0);
- // A simple data source that keeps all data in memory.
- media::FilterFactory* simple_data_source_factory =
- webkit_glue::SimpleDataSource::CreateFactory(MessageLoop::current(),
- bridge_factory);
- // A sophisticated data source that does memory caching.
- media::FilterFactory* buffered_data_source_factory =
- webkit_glue::BufferedDataSource::CreateFactory(MessageLoop::current(),
- bridge_factory);
- factory->AddFactory(buffered_data_source_factory);
- factory->AddFactory(simple_data_source_factory);
- return new webkit_glue::WebMediaPlayerImpl(
- client, factory, new webkit_glue::VideoRendererImpl::FactoryFactory());
+ return webkit_support::CreateMediaPlayer(frame, client);
}
bool TestWebViewDelegate::allowPlugins(WebFrame* frame,