summaryrefslogtreecommitdiffstats
path: root/content/shell/shell_content_renderer_client.h
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-26 19:04:28 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-26 19:04:28 +0000
commit3f7ae89f4c48dcf81a4a3facd41edb5092edc5b4 (patch)
tree5843985b81b3fc5d079e7b14721eca0bf789c306 /content/shell/shell_content_renderer_client.h
parentdc3d6dba884c14eb97eb5b7dc9fa8988b2586680 (diff)
downloadchromium_src-3f7ae89f4c48dcf81a4a3facd41edb5092edc5b4.zip
chromium_src-3f7ae89f4c48dcf81a4a3facd41edb5092edc5b4.tar.gz
chromium_src-3f7ae89f4c48dcf81a4a3facd41edb5092edc5b4.tar.bz2
[content shell] change how the main render view is picked for layout tests
The old code would sometimes crash. The reason is that we need to know which is the main render view when the first render view is created. The old code, however, would only pick the main view after it was created. Individual changes: - move sending the fake cwd from RenderViewReady to RenderViewCreated so that we can guarantee it's available on time - Don't guess which WebKitTestRunner belongs to a RenderView, but explictely pass the RenderView with the WebTestProxy creation callback - instead of having the browser set the main render view, the renderer picks the first RenderView and declares it the main view BUG=111316 TEST=Running editing/pasteboard/data-transfer-items-drag-drop-string.html doesn't crash TBR=tsepez@chromium.org Review URL: https://chromiumcodereview.appspot.com/11416177 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169455 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/shell_content_renderer_client.h')
-rw-r--r--content/shell/shell_content_renderer_client.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/content/shell/shell_content_renderer_client.h b/content/shell/shell_content_renderer_client.h
index f9d49d0..1ccf7ac 100644
--- a/content/shell/shell_content_renderer_client.h
+++ b/content/shell/shell_content_renderer_client.h
@@ -23,14 +23,12 @@ namespace content {
class RenderView;
class ShellRenderProcessObserver;
-class WebKitTestRunner;
class ShellContentRendererClient : public ContentRendererClient {
public:
ShellContentRendererClient();
virtual ~ShellContentRendererClient();
virtual void RenderThreadStarted() OVERRIDE;
- virtual void RenderViewCreated(RenderView* render_view) OVERRIDE;
virtual bool OverrideCreatePlugin(
RenderView* render_view,
WebKit::WebFrame* frame,
@@ -38,10 +36,10 @@ class ShellContentRendererClient : public ContentRendererClient {
WebKit::WebPlugin** plugin) OVERRIDE;
private:
- void WebTestProxyCreated(WebTestRunner::WebTestProxyBase* proxy);
+ void WebTestProxyCreated(RenderView* render_view,
+ WebTestRunner::WebTestProxyBase* proxy);
scoped_ptr<ShellRenderProcessObserver> shell_observer_;
- WebKitTestRunner* latest_test_runner_;
};
} // namespace content