From 9d6f8a4fbbdbaf61802f8e41de8afb692a0e3408 Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Fri, 18 Feb 2011 10:17:30 +0000
Subject: Merge Chromium at 9.0.597.106

This is branches/597 at r74919.

Change-Id: Iab4795189c52e254b04051b05cbceda407afb0b6
---
 webkit/glue/plugins/webview_plugin.cc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'webkit/glue/plugins/webview_plugin.cc')

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);
 }
-- 
cgit v1.1