[M47_2526] Chromium upversion to m47_2526 branch

[platform/framework/web/chromium-efl.git] / tizen_src / chromium_impl / content / browser / renderer_host / render_widget_host_view_efl.h

diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.h b/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.h
index cdf7a48..c1c310d 100755 (executable)
--- a/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.h
+++ b/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.h
@@ -126,14 +126,13 @@ class CONTENT_EXPORT RenderWidgetHostViewEfl
   void UpdateCursor(const WebCursor&) override;
   void SetIsLoading(bool) override;
 
+  // Updates the state of the input method attached to the view.
+  void TextInputStateChanged(
+      const ViewHostMsg_TextInputState_Params& params) override;
+
   void OnTextInputInFormStateChanged(bool is_in_form_tag);
   void OnTextInputStateChanged(const ViewHostMsg_TextInputState_Params& params);
 
-  void TextInputTypeChanged(ui::TextInputType type,
-                            ui::TextInputMode mode,
-                            bool can_compose_inline,
-                            int flags) override;
-
   void ImeCancelComposition() override;
   void ImeCompositionRangeChanged(const gfx::Range&, const std::vector<gfx::Rect>&) override;
   void FocusedNodeChanged(bool is_editable_node) override;
@@ -154,15 +153,14 @@ class CONTENT_EXPORT RenderWidgetHostViewEfl
     const base::Callback<void(bool)>&) override;
 
   bool CanCopyToVideoFrame() const override;
-  bool CanSubscribeFrame() const override;
   void BeginFrameSubscription(
       scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber) override;
   void EndFrameSubscription() override;
   void DidOverscroll(const DidOverscrollParams& params) override;
   bool HasAcceleratedSurface(const gfx::Size&) override;
   void GetScreenInfo(blink::WebScreenInfo*) override;
+  bool GetScreenColorProfile(std::vector<char>* color_profile) override;
   gfx::Rect GetBoundsInRootWindow() override;
-  gfx::GLSurfaceHandle GetCompositingSurface() override;
   void RenderProcessGone(base::TerminationStatus, int) override;
   bool OnMessageReceived(const IPC::Message&) override;
 
@@ -179,6 +177,8 @@ class CONTENT_EXPORT RenderWidgetHostViewEfl
   void OnSwapCompositorFrame(
       uint32 output_surface_id, scoped_ptr<cc::CompositorFrame> frame) override;
 
+  void ClearCompositorFrame () override;
+
   // ui::GestureEventHelper implementation.
   bool CanDispatchToConsumer(ui::GestureConsumer* consumer) override;
   void DispatchCancelTouchEvent(ui::TouchEvent* event) override;