fixup! [M48_2564] Chromium upversion to m48_2564 branch

RenderViewHost was separated from RenderWidgetHost after [1].
So we need to get RWHI from RVHI by |GetWidget()| to access
RWHI's member functions.

[1] https://codereview.chromium.org/1413643002

Bug: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=15384
Bug: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=15385

Reviewed by: a1.gomes, sns.park

Change-Id: I51b483144524172ffb428db180d94ffc162d5eec
Signed-off-by: SangHyup Lee <sh53.lee@samsung.com>

diff --git a/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.cc b/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.cc
index 06b74e2..5da0637 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.cc
+++ b/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.cc
@@ -197,12 +197,9 @@ void SelectionControllerEfl::UpdateSelectionData(const base::string16& text) {
 
 bool SelectionControllerEfl::ClearSelectionViaEWebView() {
   if (GetSelectionStatus()) {
-#if !defined(EWK_BRINGUP)
-    RenderViewHostImpl* rvhi = static_cast<RenderViewHostImpl*>(web_contents_.GetRenderViewHost());
-// [M48_2564] Temporary disabling the codes for switching to new chromium
-//            FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=15385
-    rvhi->ExecuteEditCommand("Unselect", "");
-#endif
+    RenderWidgetHostImpl* rwhi = static_cast<RenderWidgetHostImpl*>(
+        web_contents_.GetRenderViewHost()->GetWidget());
+    rwhi->ExecuteEditCommand("Unselect", "");
     return true;
   }
 

diff --git a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.cc b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.cc
index 1733a9c..58c8378 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.cc
+++ b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.cc
@@ -327,15 +327,12 @@ WebContents* WebContentsImplEfl::HandleNewWebContentsCreate(
   // will be shown immediately).
   if (!params.opener_suppressed) {
     if (!is_guest) {
-#if !defined(EWK_BRINGUP)
       WebContentsView* new_view = new_contents->view_.get();
 
-// [M48_2564] Temporary disabling the codes for switching to new chromium
-//            FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=15384
       // TODO(brettw): It seems bogus that we have to call this function on the
       // newly created object and give it one of its own member variables.
-      new_view->CreateViewForWidget(new_contents->GetRenderViewHost(), false);
-#endif
+      new_view->CreateViewForWidget(
+          new_contents->GetRenderViewHost()->GetWidget(), false);
     }
     // Save the created window associated with the route so we can show it
     // later.

diff --git a/tizen_src/ewk/efl_integration/eweb_view.cc b/tizen_src/ewk/efl_integration/eweb_view.cc
index 04615f1..e5cd5ce 100644 (file)
--- a/tizen_src/ewk/efl_integration/eweb_view.cc
+++ b/tizen_src/ewk/efl_integration/eweb_view.cc
@@ -446,13 +446,9 @@ void EWebView::ExecuteEditCommand(const char* command, const char* value) {
 
   value = (value == NULL) ? "" : value;
 
-#if !defined(EWK_BRINGUP)
-  RenderViewHostImpl* rvhi = static_cast<RenderViewHostImpl*>(web_contents_->GetRenderViewHost());
-
-// [M48_2564] Temporary disabling the codes for switching to new chromium
-//            FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=15385
-  rvhi->ExecuteEditCommand(command, value);
-#endif
+  RenderWidgetHostImpl* rwhi = static_cast<RenderWidgetHostImpl*>(
+      web_contents_->GetRenderViewHost()->GetWidget());
+  rwhi->ExecuteEditCommand(command, value);
 
   // This is workaround for rich text toolbar buttons in email application
   if ( !strcmp(command, "InsertOrderedList")