OOPIF IME: Renderer Side Changes

content/renderer/render_frame_impl.h

 // Copyright 2013 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 CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 26 matching lines @@
 #include "media/blink/webmediaplayer_delegate.h"
 #include "media/blink/webmediaplayer_params.h"
 #include "services/shell/public/interfaces/connector.mojom.h"
 #include "services/shell/public/interfaces/interface_provider.mojom.h"
 #include "third_party/WebKit/public/platform/WebEffectiveConnectionType.h"
 #include "third_party/WebKit/public/platform/WebFocusType.h"
 #include "third_party/WebKit/public/platform/WebLoadingBehaviorFlag.h"
 #include "third_party/WebKit/public/platform/WebMediaPlayer.h"
 #include "third_party/WebKit/public/platform/modules/app_banner/WebAppBannerClient.h"
 #include "third_party/WebKit/public/web/WebAXObject.h"
+#include "third_party/WebKit/public/web/WebCompositionUnderline.h"
 #include "third_party/WebKit/public/web/WebDataSource.h"
 #include "third_party/WebKit/public/web/WebFrameClient.h"
 #include "third_party/WebKit/public/web/WebFrameLoadType.h"
 #include "third_party/WebKit/public/web/WebFrameOwnerProperties.h"
 #include "third_party/WebKit/public/web/WebFrameSerializerClient.h"
 #include "third_party/WebKit/public/web/WebHistoryCommitType.h"
 #include "third_party/WebKit/public/web/WebMeaningfulLayout.h"
 #include "third_party/WebKit/public/web/WebScriptExecutionCallback.h"
 #include "ui/gfx/range/range.h"
 #include "url/gurl.h"
@@ skipping 20 matching lines @@
 class SyncMessage;
 }
 
 namespace blink {
 class WebMouseEvent;
 class WebContentDecryptionModule;
 class WebPresentationClient;
 class WebPushClient;
 class WebSecurityOrigin;
 enum class WebCachePolicy;
-struct WebCompositionUnderline;
 struct WebContextMenuData;
 struct WebCursorInfo;
 struct WebFindOptions;
 struct WebScreenInfo;
 }
 
 namespace gfx {
 class Point;
 class Range;
 class Rect;
@@ skipping 156 matching lines @@
 
   // This method must be called after the frame has been added to the frame
   // tree. It creates all objects that depend on the frame being at its proper
   // spot.
   void Initialize();
 
   // Notifications from RenderWidget.
   void WasHidden();
   void WasShown();
   void WidgetWillClose();
+  // The following methods are called by the RenderWidget which receives a
+  // corresponding IME-related IPC. If the target of IME is a pepper plugin,
+  // RenderFrame will pass on the message to the RenderFrame of the plugin.
+  // Otherwise, the selected text for focused frame is adjusted according to
+  // the replacement range (this is needed in Mac for accented characters).
+  // Finally, RenderFrameImpl will pass the parameters back to RenderWidget to
+  // process the IME-related call.
+  void OnImeSetComposition(
+      RenderWidget* render_widget,
+      const base::string16& text,
+      const std::vector<blink::WebCompositionUnderline>& underlines,
+      const gfx::Range& replacement_range,
+      int selection_start,
+      int selection_end);
+  void OnImeConfirmComposition(RenderWidget* render_widget,
+                               const base::string16& text,
+                               const gfx::Range& replacement_range,
+                               bool keep_selection);
 
   // Start/Stop loading notifications.
   // TODO(nasko): Those are page-level methods at this time and come from
   // WebViewClient. We should move them to be WebFrameClient calls and put
   // logic in the browser side to balance starts/stops.
   // |to_different_document| will be true unless the load is a fragment
   // navigation, or triggered by history.pushState/replaceState.
   void didStartLoading(bool to_different_document) override;
   void didStopLoading() override;
   void didChangeLoadProgress(double load_progress) override;
@@ skipping 449 matching lines @@
   // Functions to add and remove observers for this object.
   void AddObserver(RenderFrameObserver* observer);
   void RemoveObserver(RenderFrameObserver* observer);
 
   bool IsLocalRoot() const;
 
   // Builds and sends DidCommitProvisionalLoad to the host.
   void SendDidCommitProvisionalLoad(blink::WebFrame* frame,
                                     blink::WebHistoryCommitType commit_type,
                                     const blink::WebHistoryItem& item);
+  // Selects the text in |replacement_range| so that it will be replaced by text
+  // added by the call to RenderWidget::HandleImeSetComposition or
+  // RenderWidget::HandleImeConfirmComposition. This is currently used for
+  // accented characters in Mac.
+  void AdjustReplacementRangeForAccentedCharacters(
+      const gfx::Range& replacement_range) const;
 
   // IPC message handlers ------------------------------------------------------
   //
   // The documentation for these functions should be in
   // content/common/*_messages.h for the message that the function is handling.
   void OnNavigate(const CommonNavigationParams& common_params,
                   const StartNavigationParams& start_params,
                   const RequestNavigationParams& request_params);
   void OnBeforeUnload(bool is_reload);
   void OnSwapOut(int proxy_routing_id,
@@ skipping 494 matching lines @@
 #endif
 
   base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_