diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-16 18:19:44 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-16 18:19:44 +0000 |
commit | f2eefdabd9adf6c31676a401b4fc01e4e9218cbe (patch) | |
tree | 108efd9f9abbd08201b4623e6f509ea445cf8ccf /webkit/tools/test_shell/plugin_tests.cc | |
parent | 2b2d1697cd3cd6303b372949565bb8ac87741589 (diff) | |
download | chromium_src-f2eefdabd9adf6c31676a401b4fc01e4e9218cbe.zip chromium_src-f2eefdabd9adf6c31676a401b4fc01e4e9218cbe.tar.gz chromium_src-f2eefdabd9adf6c31676a401b4fc01e4e9218cbe.tar.bz2 |
Ensure we check the page pointer before using it after we come out of NPP_HandleEvent, as it might have gone away depending on JavaScript that was executed by the plugin.
BUG=9955
Review URL: http://codereview.chromium.org/75026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13858 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/plugin_tests.cc')
-rw-r--r-- | webkit/tools/test_shell/plugin_tests.cc | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/webkit/tools/test_shell/plugin_tests.cc b/webkit/tools/test_shell/plugin_tests.cc index f2ad349..8759233 100644 --- a/webkit/tools/test_shell/plugin_tests.cc +++ b/webkit/tools/test_shell/plugin_tests.cc @@ -7,8 +7,10 @@ #include "base/file_util.h" #include "base/path_service.h" #include "base/string_util.h" +#include "net/base/escape.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/WebKit/chromium/public/WebScriptSource.h" +#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" #include "webkit/glue/webframe.h" #include "webkit/glue/webview.h" #include "webkit/tools/test_shell/test_shell.h" @@ -123,3 +125,22 @@ TEST_F(PluginTest, DefaultPluginLoadTest) { ASSERT_EQ(true, StartsWith(text, L"DONE", true)); } + +// Tests that if a frame is deleted as a result of calling NPP_HandleEvent, we +// don't crash. +TEST_F(PluginTest, DeleteFrameDuringEvent) { + FilePath test_html = data_dir_; + test_html = test_html.AppendASCII("plugins"); + test_html = test_html.AppendASCII("delete_frame.html"); + test_shell_->LoadURL(test_html.ToWStringHack().c_str()); + test_shell_->WaitTestFinished(); + + WebKit::WebMouseEvent input; + input.button = WebKit::WebMouseEvent::ButtonLeft; + input.x = 50; + input.y = 50; + input.type = WebKit::WebInputEvent::MouseUp; + test_shell_->webView()->HandleInputEvent(&input); + + // No crash means we passed. +} |