diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-04 01:00:19 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-04 01:00:19 +0000 |
| commit | 9630731e7c4bec5722917760a04b56d34da460da (patch) | |
| tree | 8c6cec54d544edef638519273440f31aa86e039f /content/shell | |
| parent | 23e133915ab58db51d4731103903a60bea0e13c7 (diff) | |
| download | chromium_src-9630731e7c4bec5722917760a04b56d34da460da.zip chromium_src-9630731e7c4bec5722917760a04b56d34da460da.tar.gz chromium_src-9630731e7c4bec5722917760a04b56d34da460da.tar.bz2 | |
Start moving WebUserMediaClient on the chromium side to be per frame instead of view.
This is by no means complete, and I've added a bunch of usage of "render_view_" in the code that moved to RenderFrameImpl so that the change doesn't become too big. I will remove these in future cls.
BUG=304341
R=nasko@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=267605
Review URL: https://codereview.chromium.org/264773002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268090 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell')
| -rw-r--r-- | content/shell/renderer/test_runner/WebFrameTestProxy.h | 4 | ||||
| -rw-r--r-- | content/shell/renderer/webkit_test_runner.cc | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/content/shell/renderer/test_runner/WebFrameTestProxy.h b/content/shell/renderer/test_runner/WebFrameTestProxy.h index 6002389..b9fa40a 100644 --- a/content/shell/renderer/test_runner/WebFrameTestProxy.h +++ b/content/shell/renderer/test_runner/WebFrameTestProxy.h @@ -202,6 +202,10 @@ public: // RenderFrameImpl::willStartUsingPeerConnectionHandler can not be mocked. // See http://crbug/363285. } + virtual blink::WebUserMediaClient* userMediaClient() + { + return m_baseProxy->userMediaClient(); + } virtual bool willCheckAndDispatchMessageEvent(blink::WebLocalFrame* sourceFrame, blink::WebFrame* targetFrame, blink::WebSecurityOrigin target, blink::WebDOMMessageEvent event) { if (m_baseProxy->willCheckAndDispatchMessageEvent(sourceFrame, targetFrame, target, event)) diff --git a/content/shell/renderer/webkit_test_runner.cc b/content/shell/renderer/webkit_test_runner.cc index c38a1a4..61c3efa 100644 --- a/content/shell/renderer/webkit_test_runner.cc +++ b/content/shell/renderer/webkit_test_runner.cc @@ -212,9 +212,7 @@ WebKitTestRunner::WebKitTestRunner(RenderView* render_view) focused_view_(NULL), is_main_window_(false), focus_on_next_commit_(false), - leak_detector_(new LeakDetector(this)) -{ - UseMockMediaStreams(render_view); + leak_detector_(new LeakDetector(this)) { } WebKitTestRunner::~WebKitTestRunner() { |