Use WebWidget from the WebKit API. This change also makes

use of WebKitClient (replacing WebWidgetDelegate from glue).

The ripple effects of this change are rather large, but most
of the impact is mechanical.

The more interesting changes include:

1- Removing the WebWidget parameter from WebWidgetClient methods.  This didn't
matter at all to RenderWidget or RenderView, but it did cause some changes to
be made to TestWebViewDelegate.  Now, it is not possible to share a delegate
implementation for both the WebView and a popup menu, so I have a second
instance of the delegate owned by TestShell for use with popup menus.

2- Plumbing WebNavigationPolicy in place of WindowOpenDisposition was getting
to be a pretty large change, so I stopped short of deleting WindowOpenDisposition.
That way the Chrome side can remain mostly unmodified.  I then added a mapping
function to convert from WebNavigationPolicy to WindowOpenDisposition.

3- The IME methods on WebWidget were renamed (reviewed separately by hbono), and
there is now an enum to specify the composition command (WebCompositionCommand).

4- I added IPC serialization for WebCompositionCommand and WebTextDirection,
which cleaned up some code that was just using ints in IPC messages.

R=jam
BUG=16234
TEST=none

Review URL: http://codereview.chromium.org/149620

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

1 files changed, 23 insertions, 7 deletions

diff --git a/chrome/renderer/render_view_unittest.cc b/chrome/renderer/render_view_unittest.cc
index ab27ec0..4b4ed60 100644
--- a/chrome/renderer/render_view_unittest.cc
+++ b/chrome/renderer/render_view_unittest.cc
@@ -10,8 +10,23 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/api/public/WebURLError.h"
 
+using WebKit::WebCompositionCommand;
+using WebKit::WebTextDirection;
 using WebKit::WebURLError;
 
+static WebCompositionCommand ToCompositionCommand(int string_type) {
+  switch (string_type) {
+    default:
+      NOTREACHED();
+    case -1:
+      return WebKit::WebCompositionCommandDiscard;
+    case 0:
+      return WebKit::WebCompositionCommandSet;
+    case 1:
+      return WebKit::WebCompositionCommandConfirm;
+  }
+}
+
 TEST_F(RenderViewTest, OnLoadAlternateHTMLText) {
   // Test a new navigation.
   GURL test_url("http://www.google.com/some_test_url");
@@ -210,11 +225,12 @@ TEST_F(RenderViewTest, ImeComposition) {
         break;
 
       case IME_SETCOMPOSITION:
-        view_->OnImeSetComposition(ime_message->string_type,
-                                   ime_message->cursor_position,
-                                   ime_message->target_start,
-                                   ime_message->target_end,
-                                   ime_message->ime_string);
+        view_->OnImeSetComposition(
+            ToCompositionCommand(ime_message->string_type),
+            ime_message->cursor_position,
+            ime_message->target_start,
+            ime_message->target_end,
+            WideToUTF16Hack(ime_message->ime_string));
         break;
     }
 
@@ -257,8 +273,8 @@ TEST_F(RenderViewTest, OnSetTextDirection) {
     WebTextDirection direction;
     const wchar_t* expected_result;
   } kTextDirection[] = {
-    {WEB_TEXT_DIRECTION_RTL, L"\x000A" L"rtl,rtl"},
-    {WEB_TEXT_DIRECTION_LTR, L"\x000A" L"ltr,ltr"},
+    { WebKit::WebTextDirectionRightToLeft, L"\x000A" L"rtl,rtl" },
+    { WebKit::WebTextDirectionLeftToRight, L"\x000A" L"ltr,ltr" },
   };
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTextDirection); ++i) {
     // Set the text direction of the <textarea> element.