summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/plugin/plugin_channel.cc19
-rw-r--r--chrome/test/data/npapi/ensure_plugins_pump_messages_in_sync_calls.html39
-rw-r--r--chrome/test/ui/npapi_uitest.cc10
-rw-r--r--webkit/glue/plugins/test/plugin_client.cc3
-rw-r--r--webkit/glue/plugins/test/plugin_windowed_test.cc9
-rw-r--r--webkit/tools/npapi_layout_test_plugin/PluginObject.cpp15
6 files changed, 5 insertions, 90 deletions
diff --git a/chrome/plugin/plugin_channel.cc b/chrome/plugin/plugin_channel.cc
index 6aa10d4..04d9afc 100644
--- a/chrome/plugin/plugin_channel.cc
+++ b/chrome/plugin/plugin_channel.cc
@@ -73,25 +73,6 @@ bool PluginChannel::Send(IPC::Message* msg) {
LOG(INFO) << "sending message @" << msg << " on channel @" << this
<< " with type " << msg->type();
}
-
- if (msg->is_sync()) {
- IPC::SyncMessage* sync_msg = static_cast<IPC::SyncMessage*>(msg);
- // Clear the existing pump messages event if any in the message. This
- // is because we won't be relying on this event being set to decide whether
- // to pump messages or not.
- sync_msg->set_pump_messages_event(NULL);
-
- // Signal that the channel should continue to pump messages while it waits
- // for the sync call to complete. This is to ensure that the following
- // scenario does not result in a deadlock.
- // 1. Plugin1 issues a sync request to the renderer
- // 2. The renderer then issues a sync request to plugin2.
- // 3. Plugin2 then dispatches a native message to plugin1
- // If we don't pump messages from Plugin1, then it would cause a deadlock
- // as the three processes above are waiting for each other.
- sync_msg->EnableMessagePumping();
- }
-
bool result = PluginChannelBase::Send(msg);
in_send_--;
return result;
diff --git a/chrome/test/data/npapi/ensure_plugins_pump_messages_in_sync_calls.html b/chrome/test/data/npapi/ensure_plugins_pump_messages_in_sync_calls.html
deleted file mode 100644
index f840278..0000000
--- a/chrome/test/data/npapi/ensure_plugins_pump_messages_in_sync_calls.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<html>
-<head>
-<title>Test for verifying if plugins pump messages in sync calls.</title>
-<script src="npapi.js"></script>
-<script>
-function SetFocusToPlugin2() {
- var plugin = window.document["plugin2"];
- plugin.resetFocus = 1;
-}
-</script>
-</head>
-
-<body>
-<div id="statusPanel" style="border: 1px solid red; width: 100%">
-Test running....
-</div>
-
-<h2>Test to verify whether plugins pump messages in sync calls.</h2>
-
-<p>
-This test verifies whether a plugin continues to pump messages in outgoing
-sync calls. This ensures that it remains responsive and does not cause
-other plugins and the browser to hang
-</p>
-
-<DIV ID=PluginDiv>
-<embed type="application/vnd.npapi-test"
- src="foo"
- name="src_plugin_for_outgoing_sync_call"
- id="1"
- mode="np_embed">
-</embed>
-</DIV>
-
-<embed name="plugin2" type="application/x-webkit-test-netscape" resetFocusWindow="1"></embed>
-
-</body>
-</html>
-
diff --git a/chrome/test/ui/npapi_uitest.cc b/chrome/test/ui/npapi_uitest.cc
index a4fa299..eb19042 100644
--- a/chrome/test/ui/npapi_uitest.cc
+++ b/chrome/test/ui/npapi_uitest.cc
@@ -298,13 +298,3 @@ TEST_F(NPAPIVisiblePluginTester, MultipleInstancesSyncCalls) {
kTestCompleteSuccess, kShortWaitTimeout);
}
-TEST_F(NPAPIVisiblePluginTester, EnsurePluginsPumpInSyncCalls) {
- if (UITest::in_process_renderer())
- return;
-
- GURL url = GetTestUrl(L"npapi",
- L"ensure_plugins_pump_messages_in_sync_calls.html");
- NavigateToURL(url);
- WaitForFinish("src_plugin_for_outgoing_sync_call", "1", url,
- kTestCompleteCookie, kTestCompleteSuccess, kShortWaitTimeout);
-}
diff --git a/webkit/glue/plugins/test/plugin_client.cc b/webkit/glue/plugins/test/plugin_client.cc
index dfa151d..bcad2a8 100644
--- a/webkit/glue/plugins/test/plugin_client.cc
+++ b/webkit/glue/plugins/test/plugin_client.cc
@@ -155,8 +155,7 @@ NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16 mode,
// TODO(port): plugin_windowed_test.*.
} else if (test_name == "hidden_plugin" ||
test_name == "create_instance_in_paint" ||
- test_name == "alert_in_window_message" ||
- test_name == "src_plugin_for_outgoing_sync_call") {
+ test_name == "alert_in_window_message") {
new_test = new NPAPIClient::WindowedPluginTest(instance,
NPAPIClient::PluginClient::HostFunctions());
#endif
diff --git a/webkit/glue/plugins/test/plugin_windowed_test.cc b/webkit/glue/plugins/test/plugin_windowed_test.cc
index ace8a4a..3a15ae0 100644
--- a/webkit/glue/plugins/test/plugin_windowed_test.cc
+++ b/webkit/glue/plugins/test/plugin_windowed_test.cc
@@ -33,8 +33,7 @@ NPError WindowedPluginTest::SetWindow(NPWindow* pNPWindow) {
}
if ((test_name() == "create_instance_in_paint" && test_id() == "1") ||
- test_name() == "alert_in_window_message" ||
- test_name() == "src_plugin_for_outgoing_sync_call") {
+ test_name() == "alert_in_window_message") {
static ATOM window_class = 0;
if (!window_class) {
WNDCLASSEX wcex;
@@ -97,12 +96,6 @@ LRESULT CALLBACK WindowedPluginTest::WindowProc(
// and verify that we don't hang the browser.
CallJSFunction(this_ptr, "CallAlert");
CallJSFunction(this_ptr, "CallAlert");
- } else if (this_ptr->test_name() == "src_plugin_for_outgoing_sync_call" &&
- message == WM_PAINT) {
- this_ptr->done_ = true;
- SetFocus(window);
- CallJSFunction(this_ptr, "SetFocusToPlugin2");
- this_ptr->SignalTestCompleted();
}
}
diff --git a/webkit/tools/npapi_layout_test_plugin/PluginObject.cpp b/webkit/tools/npapi_layout_test_plugin/PluginObject.cpp
index 26abd8d..2bfab8f 100644
--- a/webkit/tools/npapi_layout_test_plugin/PluginObject.cpp
+++ b/webkit/tools/npapi_layout_test_plugin/PluginObject.cpp
@@ -72,8 +72,7 @@ static bool identifiersInitialized = false;
#define ID_PROPERTY_LOG_DESTROY 4
#define ID_PROPERTY_RETURN_ERROR_FROM_NEWSTREAM 5
#define ID_PROPERTY_TEST_OBJECT_COUNT 6
-#define ID_PROPERTY_RESET_FOCUS 7
-#define NUM_PROPERTY_IDENTIFIERS 8
+#define NUM_PROPERTY_IDENTIFIERS 7
static NPIdentifier pluginPropertyIdentifiers[NUM_PROPERTY_IDENTIFIERS];
static const NPUTF8 *pluginPropertyIdentifierNames[NUM_PROPERTY_IDENTIFIERS] = {
@@ -84,7 +83,6 @@ static const NPUTF8 *pluginPropertyIdentifierNames[NUM_PROPERTY_IDENTIFIERS] = {
"logDestroy",
"returnErrorFromNewStream",
"testObjectCount",
- "resetFocus"
};
#define ID_TEST_CALLBACK_METHOD 0
@@ -213,13 +211,6 @@ static bool pluginSetProperty(NPObject* obj, NPIdentifier name, const NPVariant*
} else if (name == pluginPropertyIdentifiers[ID_PROPERTY_RETURN_ERROR_FROM_NEWSTREAM]) {
plugin->returnErrorFromNewStream = NPVARIANT_TO_BOOLEAN(*variant);
return true;
- } else if (name == pluginPropertyIdentifiers[ID_PROPERTY_RESET_FOCUS]) {
-#ifdef OS_WIN
- if (NPVARIANT_TO_BOOLEAN(*variant)) {
- SetFocus(NULL);
- }
- return true;
-#endif // OS_WIN
}
return false;
@@ -757,9 +748,9 @@ static bool pluginInvoke(NPObject* header, NPIdentifier name, const NPVariant* a
return testCallbackAndGetValue(plugin, args, argCount, result);
} else if (name == pluginMethodIdentifiers[ID_TEST_CONSTRUCT]) {
return testConstruct(plugin, args, argCount, result);
- } else if (name == pluginMethodIdentifiers[ID_DESTROY_NULL_STREAM])
+ } else if (name == pluginMethodIdentifiers[ID_DESTROY_NULL_STREAM])
return destroyNullStream(plugin, args, argCount, result);
-
+
return false;
}
generated by cgit v1.1 at 2025-02-11 13:36:09 +0000