diff options
| author | sadrul <sadrul@chromium.org> | 2015-08-21 12:17:36 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-21 19:18:41 +0000 |
| commit | b3ad146d98e8e67187e4f072676afbe210e73042 (patch) | |
| tree | 729dc7c4c4b89b406972dba58a8240928d413e77 /content/shell/renderer/layout_test/blink_test_runner.cc | |
| parent | dc76a343f0289d84433bca4132bb61feb2237980 (diff) | |
| download | chromium_src-b3ad146d98e8e67187e4f072676afbe210e73042.zip chromium_src-b3ad146d98e8e67187e4f072676afbe210e73042.tar.gz chromium_src-b3ad146d98e8e67187e4f072676afbe210e73042.tar.bz2 | |
html_viewer: Make sure window.internals is set-up correctly in layout-tests.
Inject window.internals from WebFrameClient::didClearWindowObject() override
instead of right after creation, since that's how //content sets it up as well.
Also, fix a couple of crashes during start-up and tear-down.
BUG=none
Review URL: https://codereview.chromium.org/1297173002
Cr-Commit-Position: refs/heads/master@{#344833}
Diffstat (limited to 'content/shell/renderer/layout_test/blink_test_runner.cc')
| -rw-r--r-- | content/shell/renderer/layout_test/blink_test_runner.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/content/shell/renderer/layout_test/blink_test_runner.cc b/content/shell/renderer/layout_test/blink_test_runner.cc index 7e23c03..a3cd68c 100644 --- a/content/shell/renderer/layout_test/blink_test_runner.cc +++ b/content/shell/renderer/layout_test/blink_test_runner.cc @@ -700,6 +700,10 @@ blink::WebPlugin* BlinkTestRunner::CreatePluginPlaceholder( return placeholder->plugin(); } +void BlinkTestRunner::OnWebTestProxyBaseDestroy( + test_runner::WebTestProxyBase* proxy) { +} + // RenderViewObserver -------------------------------------------------------- void BlinkTestRunner::DidClearWindowObject(WebLocalFrame* frame) { |