diff options
| author | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-30 01:15:26 +0000 |
|---|---|---|
| committer | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-30 01:15:26 +0000 |
| commit | e46c47f8f360ed1fadb6a921f32bff4a17d57861 (patch) | |
| tree | 998a743200ab338e0d8d57f68cc061486aa68cd4 /webkit/glue/plugins/webplugin_delegate_impl_gtk.cc | |
| parent | a1373e7e48fe39b488f8888f5018bf2e624a0268 (diff) | |
| download | chromium_src-e46c47f8f360ed1fadb6a921f32bff4a17d57861.zip chromium_src-e46c47f8f360ed1fadb6a921f32bff4a17d57861.tar.gz chromium_src-e46c47f8f360ed1fadb6a921f32bff4a17d57861.tar.bz2 | |
Reverting 19560. This caused a bunch of plugin-related unittest failures on Windows.
Review URL: http://codereview.chromium.org/150088
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19573 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/plugins/webplugin_delegate_impl_gtk.cc')
| -rw-r--r-- | webkit/glue/plugins/webplugin_delegate_impl_gtk.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/webkit/glue/plugins/webplugin_delegate_impl_gtk.cc b/webkit/glue/plugins/webplugin_delegate_impl_gtk.cc index 9f9838b..c20fee0 100644 --- a/webkit/glue/plugins/webplugin_delegate_impl_gtk.cc +++ b/webkit/glue/plugins/webplugin_delegate_impl_gtk.cc @@ -263,10 +263,12 @@ bool WebPluginDelegateImpl::WindowedCreatePlugin() { return false; } - // Xembed plugins need a window created for them browser-side. - // Do that now. - windowed_handle_ = plugin_->CreatePluginContainer(); - window_.window = reinterpret_cast<void*>(windowed_handle_); + window_.window = reinterpret_cast<void*>(parent_); + // The remainder of the code expects windowed_handle_ to exist for + // windowed mode, despite not actually ever reaching through + // windowed_handle_. It is still used as a token to represent "this + // plugin" in messages to the browser. + windowed_handle_ = parent_; if (!window_.ws_info) window_.ws_info = new NPSetWindowCallbackStruct; |