[M47_2526] Chromium upversion to m47_2526 branch

[platform/framework/web/chromium-efl.git] / tizen_src / ewk / efl_integration / eweb_view.cc

diff --git a/tizen_src/ewk/efl_integration/eweb_view.cc b/tizen_src/ewk/efl_integration/eweb_view.cc
index 8660019..f282a33 100644 (file)
--- a/tizen_src/ewk/efl_integration/eweb_view.cc
+++ b/tizen_src/ewk/efl_integration/eweb_view.cc
@@ -13,8 +13,8 @@
 #include "common/render_messages_ewk.h"
 #include "common/version_info.h"
 #include "common/web_contents_utils.h"
-#include "components/sessions/serialized_navigation_entry.h"
 #include "components/sessions/content/content_serialized_navigation_builder.h"
+#include "components/sessions/core/serialized_navigation_entry.h"
 #include "private/ewk_back_forward_list_private.h"
 #include "private/ewk_context_private.h"
 #include "private/ewk_frame_private.h"
@@ -533,8 +533,12 @@ void EWebView::SetTextZoomFactor(double text_zoom_factor) {
 
   text_zoom_factor_ = text_zoom_factor;
   RenderViewHost* render_view_host = web_contents_->GetRenderViewHost();
+#if !defined(EWK_BRINGUP)
+// [M47_2526] The SetTextZoomFactor API was removed in RenderViewHost class
+//            FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14514
   if (render_view_host)
     render_view_host->SetTextZoomFactor(text_zoom_factor);
+#endif
 }
 
 double EWebView::GetPageZoomFactor() const {
@@ -1817,7 +1821,7 @@ void EWebView::GetSessionData(const char **data, unsigned *length) const {
   static const int MAX_SESSION_ENTRY_SIZE = std::numeric_limits<int>::max();
 
   NavigationController &navigationController = web_contents_->GetController();
-  Pickle sessionPickle;
+  base::Pickle sessionPickle;
   const int itemCount = navigationController.GetEntryCount();
 
   sessionPickle.WriteInt(itemCount);
@@ -1836,8 +1840,8 @@ void EWebView::GetSessionData(const char **data, unsigned *length) const {
 }
 
 bool EWebView::RestoreFromSessionData(const char *data, unsigned length) {
-  Pickle sessionPickle(data, length);
-  PickleIterator pickleIterator(sessionPickle);
+  base::Pickle sessionPickle(data, length);
+  base::PickleIterator pickleIterator(sessionPickle);
   int entryCount;
   int currentEntry;
 
@@ -1869,9 +1873,13 @@ bool EWebView::RestoreFromSessionData(const char *data, unsigned length) {
   if (currentEntry >= static_cast<int>(navigationEntries.size()))
     currentEntry = navigationEntries.size() - 1;
 
+#if !defined(EWK_BRINGUP)
+// [M47_2526] Temporary disabling the codes for switching to new chromium
+//            FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14524
   navigationController.Restore(currentEntry,
                                NavigationController::RESTORE_LAST_SESSION_EXITED_CLEANLY,
                                &navigationEntries);
+#endif
   return true;
 }
 
@@ -2032,7 +2040,7 @@ void EWebView::InitializeContent() {
     WebContents::CreateParams params(context_->browser_context());
     params.initial_size = gfx::Size(width, height);
     web_contents_.reset(new WebContentsImplEfl(
-        context_->browser_context(), NULL, this));
+        context_->browser_context(), this));
     static_cast<WebContentsImpl*>(web_contents_.get())->Init(params);
     VLOG(1) << "Initial WebContents size: " << params.initial_size.ToString();
   } else {