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

Unified Diff: content/shell/webkit_test_runner.cc

Issue 13159005: Enable media stream layout test with content_shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/shell/webkit_test_runner.h ('k') | webkit/mocks/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/webkit_test_runner.cc
===================================================================
--- content/shell/webkit_test_runner.cc (revision 191981)
+++ content/shell/webkit_test_runner.cc (working copy)
@@ -58,6 +58,7 @@
#include "webkit/glue/glue_serialize.h"
#include "webkit/glue/webkit_glue.h"
#include "webkit/glue/webpreferences.h"
+#include "webkit/mocks/test_media_stream_client.h"
using WebKit::Platform;
using WebKit::WebArrayBufferView;
@@ -68,6 +69,8 @@
using WebKit::WebFrame;
using WebKit::WebGamepads;
using WebKit::WebHistoryItem;
+using WebKit::WebMediaPlayer;
+using WebKit::WebMediaPlayerClient;
using WebKit::WebPoint;
using WebKit::WebRect;
using WebKit::WebSize;
@@ -489,6 +492,17 @@
history->swap(result);
}
+WebMediaPlayer* WebKitTestRunner::createWebMediaPlayer(
+ WebFrame* frame, const WebURL& url, WebMediaPlayerClient* client)
+{
+ if (!test_media_stream_client_.get()) {
+ test_media_stream_client_.reset(
+ new webkit_glue::TestMediaStreamClient());
+ }
+ return webkit_glue::CreateMediaPlayer(
+ frame, url, client, test_media_stream_client_.get());
+}
+
// RenderViewObserver --------------------------------------------------------
void WebKitTestRunner::DidClearWindowObject(WebFrame* frame) {
« no previous file with comments | « content/shell/webkit_test_runner.h ('k') | webkit/mocks/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698