Switch to new internal chromium branch dev/m38_2114 .

Remove custom dependencies from .gclient because gclient cannot handle branch names with slashes.
Add sync_repos.sh script to update repositories.
Fix breakages because of chromium API updates.

Bug: http://107.108.218.239/bugzilla/show_bug.cgi?id=4403

Change-Id: I235de92e72edf59f51accf7b62e9c09d31124f08
Signed-off-by: Viatcheslav Ostapenko <sl.ostapenko@samsung.com>

diff --git a/tizen_src/.gclient b/tizen_src/.gclient
index 79b3d99..81927cb 100644 (file)
--- a/tizen_src/.gclient
+++ b/tizen_src/.gclient
@@ -1,12 +1,12 @@
 solutions = [{
   'managed'     : False,
   'name'        : 'src',
-  'url'         : 'ssh://165.213.202.130:29418/webplatform/s-chromium.git@dev/m38_2101',
+  'url'         : 'ssh://165.213.202.130:29418/webplatform/s-chromium.git@dev/m38_2114',
   'custom_deps' : {
-    'src/third_party/WebKit': 'ssh://165.213.202.130:29418/webplatform/s-blink@dev/m38_2101',
+    'src/third_party/WebKit':None,
     'src/sbrowser':None,
-    'src/third_party/skia': 'ssh://165.213.202.130:29418/webplatform/s-skia.git@dev/m38_2101',
-    'src/v8': 'ssh://165.213.202.130:29418/webplatform/s-v8@dev/m38_2101',
+    'src/third_party/skia':None,
+    'src/v8':None,
   },
   'deps_file'   : '.DEPS.git',
   'safesync_url': '',

diff --git a/tizen_src/impl/browser/resource_dispatcher_host_delegate_efl.cc b/tizen_src/impl/browser/resource_dispatcher_host_delegate_efl.cc
index aaf0011..a740d7f 100644 (file)
--- a/tizen_src/impl/browser/resource_dispatcher_host_delegate_efl.cc
+++ b/tizen_src/impl/browser/resource_dispatcher_host_delegate_efl.cc
@@ -48,7 +48,7 @@ void ResourceDispatcherHostDelegateEfl::RequestBeginning(
     net::URLRequest* request,
     ResourceContext* resource_context,
     AppCacheService* appcache_service,
-    ResourceType::Type resource_type,
+    ResourceType resource_type,
     int child_id,
     int route_id,
     ScopedVector<ResourceThrottle>* throttles) {

diff --git a/tizen_src/impl/browser/resource_dispatcher_host_delegate_efl.h b/tizen_src/impl/browser/resource_dispatcher_host_delegate_efl.h
index 18b0ae6..08602c4 100644 (file)
--- a/tizen_src/impl/browser/resource_dispatcher_host_delegate_efl.h
+++ b/tizen_src/impl/browser/resource_dispatcher_host_delegate_efl.h
@@ -25,7 +25,7 @@ class ResourceDispatcherHostDelegateEfl
   virtual void RequestBeginning(net::URLRequest* request,
       ResourceContext* resource_context,
       AppCacheService* appcache_service,
-      ResourceType::Type resource_type,
+      ResourceType resource_type,
       int child_id, int route_id,
       ScopedVector<ResourceThrottle>* throttles) OVERRIDE;
 

diff --git a/tizen_src/impl/browser/selectpicker/popup_menu_item.cc b/tizen_src/impl/browser/selectpicker/popup_menu_item.cc
index 7bc0348..401c45f 100644 (file)
--- a/tizen_src/impl/browser/selectpicker/popup_menu_item.cc
+++ b/tizen_src/impl/browser/selectpicker/popup_menu_item.cc
@@ -47,7 +47,7 @@ const char* popup_menu_item_text_get(const Popup_Menu_Item* item) {
 }
 
 blink::TextDirection popup_menu_item_text_direction_get(const Popup_Menu_Item* item) {
-    EINA_SAFETY_ON_NULL_RETURN_VAL(item, WebCore::LTR);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(item, blink::LTR);
 
     return item->textDirection;
 }

diff --git a/tizen_src/impl/browser_context_efl.cc b/tizen_src/impl/browser_context_efl.cc
index 9cc4a00..2619d83 100644 (file)
--- a/tizen_src/impl/browser_context_efl.cc
+++ b/tizen_src/impl/browser_context_efl.cc
@@ -174,4 +174,9 @@ void BrowserContextEfl::RebuildTable(const scoped_refptr<URLEnumerator>& enumera
   enumerator->OnComplete(true);
 }
 
+SSLHostStateDelegate* BrowserContextEfl::GetSSLHostStateDelegate() {
+  // Pure method in BrowserContext class. Need implementation.
+  NOTIMPLEMENTED();
+}
+
 }

diff --git a/tizen_src/impl/browser_context_efl.h b/tizen_src/impl/browser_context_efl.h
index d905f50..ed96edd 100644 (file)
--- a/tizen_src/impl/browser_context_efl.h
+++ b/tizen_src/impl/browser_context_efl.h
@@ -114,6 +114,7 @@ class BrowserContextEfl
 
  private:
   static void ReadCertificateAndAdd(base::FilePath* file_path);
+  virtual SSLHostStateDelegate* GetSSLHostStateDelegate() OVERRIDE;
 
   scoped_ptr<visitedlink::VisitedLinkMaster> visitedlink_master_;
   ResourceContextEfl* resource_context_;

diff --git a/tizen_src/impl/content_browser_client_efl.cc b/tizen_src/impl/content_browser_client_efl.cc
index 3b7fb94..0bb9c60 100644 (file)
--- a/tizen_src/impl/content_browser_client_efl.cc
+++ b/tizen_src/impl/content_browser_client_efl.cc
@@ -101,7 +101,7 @@ void ContentBrowserClientEfl::ResourceDispatcherHostCreated() {
 void ContentBrowserClientEfl::AllowCertificateError(
     int render_process_id, int render_frame_id, int cert_error,
     const net::SSLInfo& ssl_info, const GURL& request_url,
-    ResourceType::Type resource_type, bool overridable,
+    ResourceType resource_type, bool overridable,
     bool strict_enforcement, const base::Callback<void(bool)>& callback,
     CertificateRequestResultType* result) {
 
@@ -123,7 +123,7 @@ void ContentBrowserClientEfl::AllowCertificateError(
 void ContentBrowserClientEfl::RequestDesktopNotificationPermission(
     const GURL& source_origin,
     content::RenderFrameHost* render_frame_host,
-    const base::Closure& callback) {
+    const base::Callback<void(blink::WebNotificationPermission)>& callback) {
 #if defined(ENABLE_NOTIFICATIONS) && !defined(EWK_BRINGUP)
   WebContents* web_contents = WebContentsFromViewID(render_process_id,
                                                     render_view_id);

diff --git a/tizen_src/impl/content_browser_client_efl.h b/tizen_src/impl/content_browser_client_efl.h
index d3f7280..0cb00a6 100644 (file)
--- a/tizen_src/impl/content_browser_client_efl.h
+++ b/tizen_src/impl/content_browser_client_efl.h
@@ -65,7 +65,7 @@ class ContentBrowserClientEfl: public ContentBrowserClient {
                                      int cert_error,
                                      const net::SSLInfo& ssl_info,
                                      const GURL& request_url,
-                                     ResourceType::Type resource_type,
+                                     ResourceType resource_type,
                                      bool overridable,
                                      bool strict_enforcement,
                                      const base::Callback<void(bool)>& callback,
@@ -73,8 +73,8 @@ class ContentBrowserClientEfl: public ContentBrowserClient {
 
   // Asks permission to show desktop notifications.
   virtual void RequestDesktopNotificationPermission(const GURL& source_origin,
-                                                    content::RenderFrameHost* render_frame_host,
-                                                    const base::Closure& callback) OVERRIDE;
+      content::RenderFrameHost* render_frame_host,
+      const base::Callback<void(blink::WebNotificationPermission)>& callback) OVERRIDE;
 
   // Show a desktop notification.  If |worker| is true, the request came from an
   // HTML5 web worker, otherwise, it came from a renderer.

diff --git a/tizen_src/impl/eweb_context.cc b/tizen_src/impl/eweb_context.cc
index c4e6554..e1c9e8f 100644 (file)
--- a/tizen_src/impl/eweb_context.cc
+++ b/tizen_src/impl/eweb_context.cc
@@ -370,7 +370,7 @@ void EWebContext::DeleteApplicationCacheForSite(const tizen_webview::URL& site)
   partition->ClearDataForOrigin(content::StoragePartition::REMOVE_DATA_MASK_APPCACHE,
                                 content::StoragePartition::QUOTA_MANAGED_STORAGE_MASK_ALL,
                                 GetGURL(site),
-                                partition->GetURLRequestContext());
+                                partition->GetURLRequestContext(), base::Bind(&base::DoNothing));
 }
 
 void EWebContext::GetAllOriginsWithApplicationCache(tizen_webview::Web_Application_Cache_Origins_Get_Callback callback,

diff --git a/tizen_src/impl/renderer/render_process_observer_efl.cc b/tizen_src/impl/renderer/render_process_observer_efl.cc
index c468e9b..01cf7dc 100644 (file)
--- a/tizen_src/impl/renderer/render_process_observer_efl.cc
+++ b/tizen_src/impl/renderer/render_process_observer_efl.cc
@@ -71,13 +71,13 @@ void RenderProcessObserverEfl::OnPurgeMemory()
   // freed).
   OnClearCache();
   // Clear the font/glyph cache.
-  WebCore::FontCache::fontCache()->invalidate();
+  blink::FontCache::fontCache()->invalidate();
   // TODO(pk): currently web process not linking sqlite. when used this should enable
   // Release all freeable memory from the SQLite process-global page cache (a
   // low-level object which backs the Connection-specific page caches).
   //while (sqlite3_release_memory(std::numeric_limits<int>::max()) > 0) {
   //}
-  v8::V8::LowMemoryNotification();
+  v8::Isolate::GetCurrent()->LowMemoryNotification();
   // Tell our allocator to release any free pages it's still holding.
   base::allocator::ReleaseFreeMemory();
 }

diff --git a/tizen_src/impl/renderer/render_view_observer_efl.cc b/tizen_src/impl/renderer/render_view_observer_efl.cc
index c060f18..35a0c59 100644 (file)
--- a/tizen_src/impl/renderer/render_view_observer_efl.cc
+++ b/tizen_src/impl/renderer/render_view_observer_efl.cc
@@ -61,6 +61,8 @@ bool GetGRBAValuesFromString(const std::string& input, int* r, int* g, int* b, i
 void PopulateEwkHitTestData(const blink::WebHitTestResult& web_hit_test, _Ewk_Hit_Test* ewk_hit_test)
 {
   DCHECK(ewk_hit_test);
+#if !defined(EWK_BRINGUP)
+  // Unifdef it when this change will be relanded: http://165.213.202.130:8080/#/c/68152/
   ewk_hit_test->imageURI = web_hit_test.absoluteImageURL().string().utf8();
   ewk_hit_test->linkURI = web_hit_test.absoluteLinkURL().string().utf8();
   ewk_hit_test->mediaURI = web_hit_test.absoluteMediaURL().string().utf8();
@@ -81,7 +83,9 @@ void PopulateEwkHitTestData(const blink::WebHitTestResult& web_hit_test, _Ewk_Hi
     context |= TW_HIT_TEST_RESULT_CONTEXT_EDITABLE;
   if (web_hit_test.node().isTextNode())
     context |= TW_HIT_TEST_RESULT_CONTEXT_TEXT;
-
+#else
+  int context = TW_HIT_TEST_RESULT_CONTEXT_DOCUMENT;
+#endif
   ewk_hit_test->context = static_cast<tizen_webview::Hit_Test_Result_Context>(context);
   ewk_hit_test->nodeData.attributeHash = 0;
 
@@ -198,7 +202,7 @@ void RenderViewObserverEfl::OnSetScroll(int x, int y)
 
 void RenderViewObserverEfl::OnUseSettingsFont()
 {
-  WebCore::FontCache::fontCache()->invalidate();
+  blink::FontCache::fontCache()->invalidate();
 
 #if !defined(EWK_BRINGUP)
   blink::WebView* view = render_view()->GetWebView();
@@ -248,6 +252,8 @@ void RenderViewObserverEfl::OnGetSelectionStyle()
   if (!frame)
     return;
 
+#if !defined(EWK_BRINGUP)
+  // Unifdef it when this change will be relanded: http://165.213.202.130:8080/#/c/68152/
   SelectionStylePrams params;
   params.underline_state = frame->stateCommand(blink::WebString::fromUTF8("underline"));
   params.italic_state = frame->stateCommand(blink::WebString::fromUTF8("italic"));
@@ -266,6 +272,7 @@ void RenderViewObserverEfl::OnGetSelectionStyle()
   params.text_align_full_state = frame->stateCommand(blink::WebString::fromUTF8("JustifyFull"));
   params.has_composition = frame->hasMarkedText();
   Send(new EwkViewMsg_SelectionTextStyleState(render_view()->GetRoutingID(), params));
+#endif
 }
 
 void RenderViewObserverEfl::OnSelectClosestWord(int x, int y)

diff --git a/tizen_src/impl/url_request_context_getter_efl.cc b/tizen_src/impl/url_request_context_getter_efl.cc
index 59a456c..70b7e98 100644 (file)
--- a/tizen_src/impl/url_request_context_getter_efl.cc
+++ b/tizen_src/impl/url_request_context_getter_efl.cc
@@ -23,8 +23,8 @@
 #include "net/http/http_cache.h"
 #include "net/http/http_server_properties_impl.h"
 #include "net/proxy/proxy_service.h"
-#include "net/ssl/default_server_bound_cert_store.h"
-#include "net/ssl/server_bound_cert_service.h"
+#include "net/ssl/channel_id_service.h"
+#include "net/ssl/default_channel_id_store.h"
 #include "net/ssl/ssl_config_service_defaults.h"
 #include "net/url_request/data_protocol_handler.h"
 #include "net/url_request/file_protocol_handler.h"
@@ -102,8 +102,8 @@ net::URLRequestContext* URLRequestContextGetterEfl::GetURLRequestContext() {
         new net::URLRequestContextStorage(url_request_context_.get()));
     storage_->set_cookie_store(
         CreateCookieStore(CookieStoreConfig()));
-    storage_->set_server_bound_cert_service(new net::ServerBoundCertService(
-        new net::DefaultServerBoundCertStore(NULL),
+    storage_->set_channel_id_service(new net::ChannelIDService(
+        new net::DefaultChannelIDStore(NULL),
         base::WorkerPool::GetTaskRunner(true)));
     storage_->set_http_user_agent_settings(
         new net::StaticHttpUserAgentSettings("en-us,en", std::string()));
@@ -144,8 +144,8 @@ net::URLRequestContext* URLRequestContextGetterEfl::GetURLRequestContext() {
         url_request_context_->cert_verifier();
     network_session_params.transport_security_state =
         url_request_context_->transport_security_state();
-    network_session_params.server_bound_cert_service =
-        url_request_context_->server_bound_cert_service();
+    network_session_params.channel_id_service =
+        url_request_context_->channel_id_service();
     network_session_params.proxy_service =
         url_request_context_->proxy_service();
     network_session_params.ssl_config_service =

diff --git a/tizen_src/impl/web_contents_delegate_efl.cc b/tizen_src/impl/web_contents_delegate_efl.cc
index b5b9cf2..4596a6a 100755 (executable)
--- a/tizen_src/impl/web_contents_delegate_efl.cc
+++ b/tizen_src/impl/web_contents_delegate_efl.cc
@@ -347,7 +347,7 @@ void WebContentsDelegateEfl::RequestCertificateConfirm(WebContents* /*web_conten
                                                       int cert_error,
                                                       const net::SSLInfo& ssl_info,
                                                       const GURL& url,
-                                                      ResourceType::Type /*resource_type*/,
+                                                      ResourceType /*resource_type*/,
                                                       bool /*overridable*/,
                                                       bool /*strict_enforcement*/,
                                                       const base::Callback<void(bool)>& callback,

diff --git a/tizen_src/impl/web_contents_delegate_efl.h b/tizen_src/impl/web_contents_delegate_efl.h
index 58dfde6..baaa6a8 100755 (executable)
--- a/tizen_src/impl/web_contents_delegate_efl.h
+++ b/tizen_src/impl/web_contents_delegate_efl.h
@@ -87,7 +87,7 @@ class WebContentsDelegateEfl
                  bool final_update) OVERRIDE;
 
   void RequestCertificateConfirm(WebContents* web_contents, int cert_error,
-      const net::SSLInfo& ssl_info, const GURL& url, ResourceType::Type resource_type,
+      const net::SSLInfo& ssl_info, const GURL& url, ResourceType resource_type,
       bool overridable,
       bool strict_enforcement,
       const base::Callback<void(bool)>& callback,

diff --git a/tizen_src/sync_repos.sh b/tizen_src/sync_repos.sh
new file mode 100755 (executable)
index 0000000..cf5da9f
--- /dev/null
+++ b/tizen_src/sync_repos.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+BRANCH=dev/m38_2114
+URLBASE='ssh://165.213.202.130:29418/webplatform'
+REPOS=( "src|$URLBASE/s-chromium.git" \
+        "src/third_party/WebKit|$URLBASE/s-blink" \
+        "src/third_party/skia|$URLBASE/s-skia.git" \
+        "src/v8|$URLBASE/s-v8" )
+
+for K in ${REPOS[@]} ; do
+  L=(${K//\|/ })
+  REPOPATH=${L[0]}
+  REPO=${L[1]}
+  if [ -d $REPOPATH ] ; then
+    pushd $REPOPATH 2>&1 > /dev/null
+    CURRENT_BRANCH=`git rev-parse --abbrev-ref HEAD`
+    if [ "x$CURRENT_BRANCH" == "x$BRANCH" ] ; then
+      echo Updating branch $BRANCH of $REPO in $REPOPATH
+      git fetch $REPO $BRANCH
+      git rebase FETCH_HEAD
+    else
+      echo Fetching branch $BRANCH of $REPO into $REPOPATH
+      git fetch $REPO $BRANCH:$BRANCH
+      git checkout $BRANCH
+    fi
+    popd 2>&1 >/dev/null
+  else
+    echo Cloning branch $BRANCH of $REPO into $REPOPATH
+    git clone -b $BRANCH $REPO $REPOPATH
+  fi
+done
+
+gclient sync -n