diff options
| author | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-10 22:50:35 +0000 |
|---|---|---|
| committer | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-10 22:50:35 +0000 |
| commit | bd9480803ba1a5b718fa72d4800a8c94b77ac133 (patch) | |
| tree | e76bfcc28e3eccbe1e4db78cee75c91d61cc1c04 /content/shell/renderer | |
| parent | f0ee1b017effbd988804b29f810b2c6bb2d1a72b (diff) | |
| download | chromium_src-bd9480803ba1a5b718fa72d4800a8c94b77ac133.zip chromium_src-bd9480803ba1a5b718fa72d4800a8c94b77ac133.tar.gz chromium_src-bd9480803ba1a5b718fa72d4800a8c94b77ac133.tar.bz2 | |
Revert 199531 "Use a shared thread for media operations."
Possibly causing mem-corruption on webkit layout tests, thus crashes.
> Use a shared thread for media operations.
>
> This reduces the number of threads created per media element by one.
>
> BUG=61293
> R=acolwell@chromium.org, jamesr@chromium.org, jochen@chromium.org
>
> Review URL: https://codereview.chromium.org/15005005
TBR=scherkus@chromium.org
Review URL: https://codereview.chromium.org/14690019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199562 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/renderer')
| -rw-r--r-- | content/shell/renderer/DEPS | 3 | ||||
| -rw-r--r-- | content/shell/renderer/webkit_test_runner.cc | 29 |
2 files changed, 2 insertions, 30 deletions
diff --git a/content/shell/renderer/DEPS b/content/shell/renderer/DEPS deleted file mode 100644 index 47de12f..0000000 --- a/content/shell/renderer/DEPS +++ /dev/null @@ -1,3 +0,0 @@ -include_rules = [ - "+media/base", # For media::MediaLog. -] diff --git a/content/shell/renderer/webkit_test_runner.cc b/content/shell/renderer/webkit_test_runner.cc index bd5e416..07e906d 100644 --- a/content/shell/renderer/webkit_test_runner.cc +++ b/content/shell/renderer/webkit_test_runner.cc @@ -24,7 +24,6 @@ #include "content/shell/common/shell_messages.h" #include "content/shell/common/webkit_test_helpers.h" #include "content/shell/renderer/shell_render_process_observer.h" -#include "media/base/media_log.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" #include "skia/ext/platform_canvas.h" @@ -60,9 +59,6 @@ #include "webkit/glue/glue_serialize.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webpreferences.h" -#include "webkit/media/webmediaplayer_impl.h" -#include "webkit/media/webmediaplayer_ms.h" -#include "webkit/media/webmediaplayer_params.h" #include "webkit/mocks/test_media_stream_client.h" using WebKit::Platform; @@ -528,29 +524,8 @@ WebMediaPlayer* WebKitTestRunner::createWebMediaPlayer( test_media_stream_client_.reset( new webkit_glue::TestMediaStreamClient()); } - - if (test_media_stream_client_->IsMediaStream(url)) { - return new webkit_media::WebMediaPlayerMS( - frame, - client, - base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(), - test_media_stream_client_.get(), - new media::MediaLog()); - } - -#if defined(OS_ANDROID) - return NULL; -#else - // TODO(scherkus): Use RenderViewImpl::createMediaPlayer() instead of - // duplicating code here, see http://crbug.com/239826 - webkit_media::WebMediaPlayerParams params( - GetMediaThreadMessageLoopProxy(), NULL, NULL, new media::MediaLog()); - return new webkit_media::WebMediaPlayerImpl( - frame, - client, - base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(), - params); -#endif + return webkit_glue::CreateMediaPlayer( + frame, url, client, test_media_stream_client_.get()); } // RenderViewObserver -------------------------------------------------------- |