Merge 21266 - This CL fixes issue 5996: Tooltip gets direction from Chrome la...

webkit/glue/chrome_client_impl.cc

Index: webkit/glue/chrome_client_impl.cc
===================================================================
--- webkit/glue/chrome_client_impl.cc	(revision 21653)
+++ webkit/glue/chrome_client_impl.cc	(working copy)
@@ -9,6 +9,7 @@
 MSVC_PUSH_WARNING_LEVEL(0);
 #include "AccessibilityObject.h"
 #include "AXObjectCache.h"
+#include "CharacterNames.h"
 #include "Console.h"
 #include "Cursor.h"
 #include "Document.h"
@@ -507,10 +508,20 @@
   }
 }
 
-void ChromeClientImpl::setToolTip(const WebCore::String& tooltip_text) {
+void ChromeClientImpl::setToolTip(const WebCore::String& tooltip_text,
+                                  WebCore::TextDirection dir) {
   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);
+    }
     webview_->delegate()->SetTooltipText(webview_, tooltip_text_as_wstring);
   }
 }
Property changes on: webkit\glue\chrome_client_impl.cc
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/src/webkit/glue/chrome_client_impl.cc:r3734-4217,4606-5108,5177-5263
   Merged /trunk/src/webkit/glue/chrome_client_impl.cc:r21266