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

Unified Diff: webkit/glue/plugins/test/plugin_javascript_open_popup.cc

Issue 1073003: Added a test for pepper3d. It ensures that we can successfully load a pepper ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 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
Index: webkit/glue/plugins/test/plugin_javascript_open_popup.cc
===================================================================
--- webkit/glue/plugins/test/plugin_javascript_open_popup.cc (revision 42644)
+++ webkit/glue/plugins/test/plugin_javascript_open_popup.cc (working copy)
@@ -21,12 +21,15 @@
int16 ExecuteJavascriptOpenPopupWithPluginTest::SetWindow(
NPWindow* window) {
+ if (window->window == NULL)
+ return NPERR_NO_ERROR;
+
if (!popup_window_test_started_) {
popup_window_test_started_ = true;
HostFunctions()->geturl(
id(), "popup_window_with_target_plugin.html", "_blank");
}
- return PluginTest::SetWindow(window);
+ return NPERR_NO_ERROR;
}
// ExecuteJavascriptPopupWindowTargetPluginTest member defines.
@@ -39,6 +42,9 @@
int16 ExecuteJavascriptPopupWindowTargetPluginTest::SetWindow(
NPWindow* window) {
+ if (window->window == NULL)
+ return NPERR_NO_ERROR;
+
if (!test_completed_) {
if (CheckWindow(window)) {
SignalTestCompleted();
« no previous file with comments | « webkit/glue/plugins/test/plugin_geturl_test.cc ('k') | webkit/glue/plugins/test/plugin_npobject_lifetime_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698