diff options
| author | Steve Block <steveblock@google.com> | 2011-02-18 10:17:30 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-02-18 11:15:27 +0000 |
| commit | 9d6f8a4fbbdbaf61802f8e41de8afb692a0e3408 (patch) | |
| tree | 107e562d88608f6f1592d85567445109ff5066f5 /webkit | |
| parent | 10943605487833f68a0e9429c8c18735cdf6a963 (diff) | |
| download | external_chromium-9d6f8a4fbbdbaf61802f8e41de8afb692a0e3408.zip external_chromium-9d6f8a4fbbdbaf61802f8e41de8afb692a0e3408.tar.gz external_chromium-9d6f8a4fbbdbaf61802f8e41de8afb692a0e3408.tar.bz2 | |
Merge Chromium at 9.0.597.106
This is branches/597 at r74919.
Change-Id: Iab4795189c52e254b04051b05cbceda407afb0b6
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/plugins/webview_plugin.cc | 8 | ||||
| -rw-r--r-- | webkit/glue/plugins/webview_plugin.h | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/webkit/glue/plugins/webview_plugin.cc b/webkit/glue/plugins/webview_plugin.cc index 31403fe..e1dc2c1 100644 --- a/webkit/glue/plugins/webview_plugin.cc +++ b/webkit/glue/plugins/webview_plugin.cc @@ -85,6 +85,12 @@ void WebViewPlugin::ReplayReceivedData(WebPlugin* plugin) { } } +void WebViewPlugin::RestoreTitleText() { + if (container_) + container_->element().setAttribute("title", old_title_); +} + + bool WebViewPlugin::initialize(WebPluginContainer* container) { container_ = container; if (container_) @@ -97,8 +103,6 @@ void WebViewPlugin::destroy() { delegate_->WillDestroyPlugin(); delegate_ = NULL; } - if (container_) - container_->element().setAttribute("title", old_title_); container_ = NULL; MessageLoop::current()->DeleteSoon(FROM_HERE, this); } diff --git a/webkit/glue/plugins/webview_plugin.h b/webkit/glue/plugins/webview_plugin.h index 95f32a5..ef85d77 100644 --- a/webkit/glue/plugins/webview_plugin.h +++ b/webkit/glue/plugins/webview_plugin.h @@ -60,6 +60,8 @@ class WebViewPlugin: public WebKit::WebPlugin, public WebKit::WebViewClient, // this method on the actual plug-in. void ReplayReceivedData(WebKit::WebPlugin* plugin); + void RestoreTitleText(); + // WebPlugin methods: virtual bool initialize(WebKit::WebPluginContainer*); virtual void destroy(); |