Merge 21353 - This CL fixes issue 17468 Regression: Extra white rectangle sh...

webkit/glue/chrome_client_impl.cc

Index: webkit/glue/chrome_client_impl.cc
===================================================================
--- webkit/glue/chrome_client_impl.cc	(revision 21688)
+++ webkit/glue/chrome_client_impl.cc	(working copy)
@@ -517,14 +517,16 @@
   if (webview_->delegate()) {
     std::wstring tooltip_text_as_wstring =
       webkit_glue::StringToStdWString(tooltip_text);
-    if (dir == WebCore::LTR) {
-      // Force the tooltip to have LTR directionality.
-      tooltip_text_as_wstring.insert(0, 1, WebCore::leftToRightEmbed);
-      tooltip_text_as_wstring.push_back(WebCore::popDirectionalFormatting);
-    } else {
-      // Force the tooltip to have RTL directionality.
-      tooltip_text_as_wstring.insert(0, 1, WebCore::rightToLeftEmbed);
-      tooltip_text_as_wstring.push_back(WebCore::popDirectionalFormatting);
+    if (!tooltip_text_as_wstring.empty()) {
+      if (dir == WebCore::LTR) {
+        // Force the tooltip to have LTR directionality.
+        tooltip_text_as_wstring.insert(0, 1, WebCore::leftToRightEmbed);
+        tooltip_text_as_wstring.push_back(WebCore::popDirectionalFormatting);
+      } else {
+        // Force the tooltip to have RTL directionality.
+        tooltip_text_as_wstring.insert(0, 1, WebCore::rightToLeftEmbed);
+        tooltip_text_as_wstring.push_back(WebCore::popDirectionalFormatting);
+      }
     }
     webview_->delegate()->SetTooltipText(webview_, tooltip_text_as_wstring);
   }
Property changes on: webkit\glue\chrome_client_impl.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/webkit/glue/chrome_client_impl.cc:r21353