Use WebWidget from the WebKit API. This change also makes...

chrome/browser/renderer_host/render_widget_host.cc

 // Copyright (c) 2009 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.
 
 #include "chrome/browser/renderer_host/render_widget_host.h"
 
 #include "base/histogram.h"
 #include "base/message_loop.h"
 #include "base/keyboard_codes.h"
 #include "chrome/browser/renderer_host/backing_store.h"
 #include "chrome/browser/renderer_host/backing_store_manager.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_widget_helper.h"
 #include "chrome/browser/renderer_host/render_widget_host_painting_observer.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/render_messages.h"
 #include "views/view.h"
 #include "webkit/glue/webcursor.h"
-#include "webkit/glue/webtextdirection.h"
 
 #if defined(OS_WIN)
 #include "base/gfx/gdi_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #endif  // defined(OS_WIN)
 
 #if defined (OS_MACOSX)
 #include "webkit/api/public/WebScreenInfo.h"
 #include "webkit/api/public/mac/WebScreenInfoFactory.h"
 #endif
 
 using base::Time;
 using base::TimeDelta;
 using base::TimeTicks;
 
 using WebKit::WebInputEvent;
 using WebKit::WebKeyboardEvent;
 using WebKit::WebMouseEvent;
 using WebKit::WebMouseWheelEvent;
+using WebKit::WebTextDirection;
 
 #if defined (OS_MACOSX)
 using WebKit::WebScreenInfo;
 using WebKit::WebScreenInfoFactory;
 #endif
 
 // How long to (synchronously) wait for the renderer to respond with a
 // PaintRect message, when our backing-store is invalid, before giving up and
 // returning a null or incorrectly sized backing-store from GetBackingStore.
 // This timeout impacts the "choppiness" of our window resize perf.
@@ skipping 15 matching lines @@
       is_loading_(false),
       is_hidden_(false),
       repaint_ack_pending_(false),
       resize_ack_pending_(false),
       mouse_move_pending_(false),
       needs_repainting_on_restore_(false),
       is_unresponsive_(false),
       in_get_backing_store_(false),
       view_being_painted_(false),
       text_direction_updated_(false),
-      text_direction_(WEB_TEXT_DIRECTION_LTR),
+      text_direction_(WebKit::WebTextDirectionLeftToRight),
       text_direction_canceled_(false) {
   if (routing_id_ == MSG_ROUTING_NONE)
     routing_id_ = process_->GetNextRoutingID();
 
   process_->Attach(this, routing_id_);
   // Because the widget initializes as is_hidden_ == false,
   // tell the process host that we're alive.
   process_->WidgetRestored();
 }
 
@@ skipping 359 matching lines @@
 }
 
 void RenderWidgetHost::CancelUpdateTextDirection() {
   if (text_direction_updated_)
     text_direction_canceled_ = true;
 }
 
 void RenderWidgetHost::NotifyTextDirection() {
   if (text_direction_updated_) {
     if (!text_direction_canceled_)
-      Send(new ViewMsg_SetTextDirection(routing_id(),
-                                        static_cast<int>(text_direction_)));
+      Send(new ViewMsg_SetTextDirection(routing_id(), text_direction_));
     text_direction_updated_ = false;
     text_direction_canceled_ = false;
   }
 }
 
 void RenderWidgetHost::ImeSetInputMode(bool activate) {
   Send(new ViewMsg_ImeSetInputMode(routing_id(), activate));
 }
 
-void RenderWidgetHost::ImeSetComposition(const std::wstring& ime_string,
+void RenderWidgetHost::ImeSetComposition(const string16& ime_string,
                                          int cursor_position,
                                          int target_start,
                                          int target_end) {
-  Send(new ViewMsg_ImeSetComposition(routing_id(), 0, cursor_position,
-                                     target_start, target_end, ime_string));
+  Send(new ViewMsg_ImeSetComposition(routing_id(),
+                                     WebKit::WebCompositionCommandSet,
+                                     cursor_position, target_start, target_end,
+                                     ime_string));
 }
 
-void RenderWidgetHost::ImeConfirmComposition(const std::wstring& ime_string) {
-  Send(new ViewMsg_ImeSetComposition(routing_id(), 1, -1, -1, -1, ime_string));
+void RenderWidgetHost::ImeConfirmComposition(const string16& ime_string) {
+  Send(new ViewMsg_ImeSetComposition(routing_id(),
+                                     WebKit::WebCompositionCommandConfirm,
+                                     -1, -1, -1, ime_string));
 }
 
 void RenderWidgetHost::ImeCancelComposition() {
-  std::wstring empty_string;
-  Send(new ViewMsg_ImeSetComposition(routing_id(), -1, -1, -1, -1,
-                                     empty_string));
+  Send(new ViewMsg_ImeSetComposition(routing_id(),
+                                     WebKit::WebCompositionCommandDiscard,
+                                     -1, -1, -1, string16()));
 }
 
 gfx::Rect RenderWidgetHost::GetRootWindowResizerRect() const {
   return gfx::Rect();
 }
 
 void RenderWidgetHost::Destroy() {
   NotificationService::current()->Notify(
       NotificationType::RENDER_WIDGET_HOST_DESTROYED,
       Source<RenderWidgetHost>(this),
@@ skipping 356 matching lines @@
 
   // TODO(darin): do we need to do something else if our backing store is not
   // the same size as the advertised view?  maybe we just assume there is a
   // full paint on its way?
   BackingStore* backing_store = BackingStoreManager::Lookup(this);
   if (!backing_store || (backing_store->size() != view_size))
     return;
   backing_store->ScrollRect(process_->process().handle(), bitmap, bitmap_rect,
                             dx, dy, clip_rect, view_size);
 }