[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.cc

diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.cc b/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.cc
index 1a33d5b..8dc8f41 100755 (executable)
--- a/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.cc
+++ b/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.cc
@@ -555,10 +555,9 @@ void RenderWidgetHostViewEfl::Init_EvasGL(int width, int height) {
 
   evas_gl_initialized_ = true;
 
-  context_factory_ = new ui::ContextFactoryEfl(this, host_->surface_id());
+  context_factory_ = new ui::ContextFactoryEfl(this);
 
-  compositor_ = new ui::Compositor(GetNativeViewId(),
-                                   context_factory_,
+  compositor_ = new ui::Compositor(context_factory_,
                                    base::ThreadTaskRunnerHandle::Get());
 
 #if defined(TIZEN_DISABLE_GPU_THREAD)
@@ -853,14 +852,12 @@ void RenderWidgetHostViewEfl::SetIsLoading(bool is_loading) {
     disambiguation_popup_->Dismiss();
 }
 
-void RenderWidgetHostViewEfl::TextInputTypeChanged(ui::TextInputType type,
-                                                   ui::TextInputMode input_mode,
-                                                   bool can_compose_inline,
-                                                   int flags) {
-  if (GetSelectionController()) {
-    GetSelectionController()->SetSelectionEditable(
-        type != ui::TEXT_INPUT_TYPE_NONE);
-  }
+void RenderWidgetHostViewEfl::TextInputStateChanged(
+    const ViewHostMsg_TextInputState_Params& params) {
+#if !defined(EWK_BRINGUP)
+// [M47_2526] Need to implement this API
+//            FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14518
+#endif
 }
 
 void RenderWidgetHostViewEfl::OnTextInputStateChanged(
@@ -1025,7 +1022,7 @@ void RenderWidgetHostViewEfl::DispatchGestureEvent(ui::GestureEvent* event) {
 void RenderWidgetHostViewEfl::CopyFromCompositingSurface(
     const gfx::Rect& src_subrect,
     const gfx::Size& output_size,
-    ReadbackRequestCallback& callback,
+    const ReadbackRequestCallback& callback,
     const SkColorType color_type) {
   // FIXME(venu.musham): should find a way to do it effectively.
   delegated_frame_host_->CopyFromCompositingSurface(src_subrect, output_size,
@@ -1033,6 +1030,9 @@ void RenderWidgetHostViewEfl::CopyFromCompositingSurface(
 }
 
 void RenderWidgetHostViewEfl::GetSnapshotAsync(const gfx::Rect& snapshot_area, int request_id) {
+#if !defined(EWK_BRINGUP)
+// [M47_2526] Temporary disabling the codes for switching to new chromium
+//            FIXME:
   if (!IsDelegatedRendererEnabled())
     Send(new ViewMsg_GetSnapshotFromRender(host_->GetRoutingID(), snapshot_area, request_id));
   else {
@@ -1040,6 +1040,7 @@ void RenderWidgetHostViewEfl::GetSnapshotAsync(const gfx::Rect& snapshot_area, i
     // http://107.108.218.239/bugzilla/show_bug.cgi?id=9858
     NOTIMPLEMENTED();
   }
+#endif
 }
 
 bool RenderWidgetHostViewEfl::RequestSnapshotAsync(const Eina_Rectangle rect,
@@ -1078,11 +1079,6 @@ bool RenderWidgetHostViewEfl::RequestSnapshotAsync(const Eina_Rectangle rect,
   return true;
 }
 
-// CopyFromCompositingSurfaceToVideoFrame implementation borrowed from Aura port
-bool RenderWidgetHostViewEfl::CanSubscribeFrame() const {
-  return delegated_frame_host_->CanSubscribeFrame();
-}
-
 void RenderWidgetHostViewEfl::BeginFrameSubscription(
     scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber) {
   delegated_frame_host_->BeginFrameSubscription(subscriber.Pass());
@@ -1297,6 +1293,12 @@ void RenderWidgetHostViewEfl::GetScreenInfo(
   RenderWidgetHostViewBase::GetDefaultScreenInfo(results);
 }
 
+bool RenderWidgetHostViewEfl::GetScreenColorProfile(std::vector<char>* color_profile) {
+  DCHECK(color_profile->empty());
+  NOTREACHED();
+  return false;
+}
+
 gfx::Rect RenderWidgetHostViewEfl::GetBoundsInRootWindow() {
   Ecore_Evas* ee = ecore_evas_ecore_evas_get(evas_);
   int x, y, w, h;
@@ -1306,10 +1308,6 @@ gfx::Rect RenderWidgetHostViewEfl::GetBoundsInRootWindow() {
   return gfx::ConvertRectToDIP(device_scale_factor_, gfx::Rect(x, y, w, h));
 }
 
-gfx::GLSurfaceHandle RenderWidgetHostViewEfl::GetCompositingSurface() {
-  return gfx::GLSurfaceHandle(gfx::kNullPluginWindow, gfx::NULL_TRANSPORT);
-}
-
 void RenderWidgetHostViewEfl::RenderProcessGone(base::TerminationStatus, int error_code) {
   Destroy();
 }
@@ -1706,8 +1704,9 @@ void RenderWidgetHostViewEfl::ProcessAckedTouchEvent(
       ui::ER_HANDLED : ui::ER_UNHANDLED;
 
   scoped_ptr<ui::GestureRecognizer::Gestures> gestures;
-  gestures.reset(gesture_recognizer_->AckAsyncTouchEvent(
-      result, this));
+  gestures.reset(gesture_recognizer_->AckTouchEvent(
+      touch.event.uniqueTouchEventId, result, this));
+
   if (gestures) {
     for (size_t j = 0; j < gestures->size(); ++j) {
       ui::GestureEvent* event = gestures->get().at(j);
@@ -1797,11 +1796,11 @@ void RenderWidgetHostViewEfl::OnSwapCompositorFrame(
     // ack is sent by delegated frame host
     delegated_frame_host_->SwapDelegatedFrame(
         output_surface_id, frame->delegated_frame_data.Pass(),
-        frame->metadata.device_scale_factor, frame->metadata.latency_info);
+        frame->metadata.device_scale_factor, frame->metadata.latency_info,
+        &frame->metadata.satisfies_sequences);
     return;
-  } else if (frame->software_frame_data) {
-    LOG(ERROR) << "Software frame is not supported.";
-    ack.last_software_frame_id = frame->software_frame_data->id;
+  } else {
+    NOTREACHED();
   }
 
   // TODO(prashant.n): Check if ack should be sent after frame is drawn.
@@ -1811,6 +1810,10 @@ void RenderWidgetHostViewEfl::OnSwapCompositorFrame(
                                     ack);
 }
 
+void RenderWidgetHostViewEfl::ClearCompositorFrame () {
+  delegated_frame_host_->ClearDelegatedFrame();
+}
+
 void RenderWidgetHostViewEfl::ScrollFocusedEditableNode() {
   host_->ScrollFocusedEditableNodeIntoRect(gfx::Rect(0, 0, 0, 0));
 }