diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-17 22:57:57 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-17 22:57:57 +0000 |
| commit | 04f7ee8c7d977b48570ca1a799461e5809ba5fca (patch) | |
| tree | afd54ac20978ccb93babdc5076d9321051d26074 /chrome/plugin/npobject_stub.h | |
| parent | 0c8147657356c5f48034db05b86e289746800e99 (diff) | |
| download | chromium_src-04f7ee8c7d977b48570ca1a799461e5809ba5fca.zip chromium_src-04f7ee8c7d977b48570ca1a799461e5809ba5fca.tar.gz chromium_src-04f7ee8c7d977b48570ca1a799461e5809ba5fca.tar.bz2 | |
Fix the deadlock when Flash tries to make WMP full screen. This is a one-off solution that detects this case and returns the reply to the sync message before calling WMP. I don't think this is a generic problem, since we haven't seen it before, and the generic solutions have too many side-effects.
BUG=15985
Review URL: http://codereview.chromium.org/210004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26521 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin/npobject_stub.h')
| -rw-r--r-- | chrome/plugin/npobject_stub.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/plugin/npobject_stub.h b/chrome/plugin/npobject_stub.h index da0745c..0f59290 100644 --- a/chrome/plugin/npobject_stub.h +++ b/chrome/plugin/npobject_stub.h @@ -68,7 +68,7 @@ class NPObjectStub : public IPC::Channel::Listener, bool* result); void OnSetProperty(const NPIdentifier_Param& name, const NPVariant_Param& property, - bool* result); + IPC::Message* reply_msg); void OnRemoveProperty(const NPIdentifier_Param& name, bool* result); void OnInvalidate(); |