A tricky fix for Issue 1845 (Take 2).

This is almost the same change as <http://codereview.chromium.org/39252/show>, which caused a build break on a Linux buildbot while compiling my new template function in "chrome/common/render_messages.h".
Even though I was not able to reproduce the build errors on my Linux box, I removed this function and use the int type in my IPC message 'ViewMsg_SetTextDirection'.

BUG=1845
Review URL: http://codereview.chromium.org/42495

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12434 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 62 insertions, 0 deletions

diff --git a/webkit/glue/webtextdirection.h b/webkit/glue/webtextdirection.h
new file mode 100644
index 0000000..822eb34
--- /dev/null
+++ b/webkit/glue/webtextdirection.h
@@ -0,0 +1,22 @@
+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef WEBKIT_GLUE_WEBTEXTDIRECTION_H_
+#define WEBKIT_GLUE_WEBTEXTDIRECTION_H_
+
+// Represents text directions (or writing directions) of a DOM node.
+// This type is used as the input parameter of WebWidget::SetTextDirection().
+// This function converts these values to WebCore::WritingDirection values and
+// call the Editor::setBaseWritingDirection() function.
+// TODO(hbono): Add WEB_TEXT_DIRECTION_ORIGINAL that represents "revert the
+// previous changes and set back to the original one" and implement it.
+// TODO(hbono): Add WEB_TEXT_DIRECTION_TOGGLE that represents "toggle the text
+// direction" and implement it.
+enum WebTextDirection {
+  WEB_TEXT_DIRECTION_DEFAULT,  // WebCore::NaturalWritingDirection
+  WEB_TEXT_DIRECTION_LTR,      // WebCore::LeftToRightWritingDirection
+  WEB_TEXT_DIRECTION_RTL,      // WebCore::RightToLeftWritingDirection
+};
+
+#endif  // WEBKIT_GLUE_WEBTEXTDIRECTION_H_
diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc
index 98c33fe..27d66c6 100644
--- a/webkit/glue/webview_impl.cc
+++ b/webkit/glue/webview_impl.cc
@@ -1236,6 +1236,37 @@ bool WebViewImpl::ImeUpdateStatus(bool* enable_ime,
   return true;
 }
 
+void WebViewImpl::SetTextDirection(WebTextDirection direction) {
+  // The Editor::setBaseWritingDirection() function checks if we can change
+  // the text direction of the selected node and updates its DOM "dir"
+  // attribute and its CSS "direction" property.
+  // So, we just call the function as Safari does.
+  const Frame* focused = GetFocusedWebCoreFrame();
+  if (!focused)
+    return;
+  Editor* editor = focused->editor();
+  if (!editor || !editor->canEdit())
+    return;
+
+  switch (direction) {
+    case WEB_TEXT_DIRECTION_DEFAULT:
+      editor->setBaseWritingDirection(WebCore::NaturalWritingDirection);
+      break;
+
+    case WEB_TEXT_DIRECTION_LTR:
+      editor->setBaseWritingDirection(WebCore::LeftToRightWritingDirection);
+      break;
+
+    case WEB_TEXT_DIRECTION_RTL:
+      editor->setBaseWritingDirection(WebCore::RightToLeftWritingDirection);
+      break;
+
+    default:
+      NOTIMPLEMENTED();
+      break;
+  }
+}
+
 void WebViewImpl::RestoreFocus() {
   if (last_focused_frame_.get()) {
     if (last_focused_frame_->page()) {
diff --git a/webkit/glue/webview_impl.h b/webkit/glue/webview_impl.h
index 465f174..4ac01fb 100644
--- a/webkit/glue/webview_impl.h
+++ b/webkit/glue/webview_impl.h
@@ -76,6 +76,7 @@ class WebViewImpl : public WebView, public base::RefCounted<WebViewImpl> {
                                  const std::wstring& ime_string);
   virtual bool ImeUpdateStatus(bool* enable_ime,
                                gfx::Rect* caret_rect);
+  virtual void SetTextDirection(WebTextDirection direction);
   virtual void StopLoading();
   virtual void SetBackForwardListSize(int size);
   virtual void RestoreFocus();
diff --git a/webkit/glue/webwidget.h b/webkit/glue/webwidget.h
index 23046e8..b1b011d 100644
--- a/webkit/glue/webwidget.h
+++ b/webkit/glue/webwidget.h
@@ -6,6 +6,7 @@
 #define WEBKIT_GLUE_WEBWIDGET_H__
 
 #include "skia/ext/platform_canvas.h"
+#include "webkit/glue/webtextdirection.h"
 
 namespace gfx {
 class Rect;
@@ -64,6 +65,9 @@ class WebWidget {
   // Retrieve the status of this widget required by IME APIs.
   virtual bool ImeUpdateStatus(bool* enable_ime, gfx::Rect* caret_rect) = 0;
 
+  // Changes the text direction of the selected input node.
+  virtual void SetTextDirection(WebTextDirection direction) = 0;
+
  protected:
   virtual ~WebWidget() {}
 
diff --git a/webkit/glue/webwidget_impl.cc b/webkit/glue/webwidget_impl.cc
index 5cf6bbe..52e5ed0 100644
--- a/webkit/glue/webwidget_impl.cc
+++ b/webkit/glue/webwidget_impl.cc
@@ -216,6 +216,9 @@ bool WebWidgetImpl::ImeUpdateStatus(bool* enable_ime,
   return false;
 }
 
+void WebWidgetImpl::SetTextDirection(WebTextDirection direction) {
+}
+
 //-----------------------------------------------------------------------------
 // WebCore::HostWindow
 
diff --git a/webkit/glue/webwidget_impl.h b/webkit/glue/webwidget_impl.h
index e6decf4..83fc23b 100644
--- a/webkit/glue/webwidget_impl.h
+++ b/webkit/glue/webwidget_impl.h
@@ -51,6 +51,7 @@ class WebWidgetImpl : public WebWidget,
                                  const std::wstring& ime_string);
   virtual bool ImeUpdateStatus(bool* enable_ime,
                                gfx::Rect* caret_rect);
+  virtual void SetTextDirection(WebTextDirection direction);
 
   // WebWidgetImpl
   void Init(WebCore::FramelessScrollView* widget, const gfx::Rect& bounds);