From: SeungSeop Park Date: Thu, 20 Nov 2014 05:14:45 +0000 (+0900) Subject: [M40_2214] Chromium upversion to m40_2214 branch X-Git-Tag: submit/tizen/20201118.160233~1590 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a9d53a32921b88b03e2dc67c893534f4532eb10f;p=platform%2Fframework%2Fweb%2Fchromium-efl.git [M40_2214] Chromium upversion to m40_2214 branch * Notes for this rebase: 1. gyp variable 'enable_printing' changed in m40_2214 : enable_printing -> enable_basic_printing, enable_print_preview 2. Changed include path for gesture_configuration.h : ui/events/gestures/ -> ui/events/gesture_detection/ 3. OnRequestPlatformNotificationPermission does not exist : The API removed from content/public/browser/content_browser_client.h. So, removed it from our code since it was dummy anyway. 4. ShowDesktopNotification() : arguments changed Bug: http://107.108.218.239/bugzilla/show_bug.cgi?id=9170 Reviewed by: Kangil Han, SeungSeop Park, Viatcheslav Ostapenko Change-Id: I9ecef10f24a48422fa5e44d5862d6935f161aa0a Signed-off-by: SeungSeop Park --- diff --git a/tizen_src/VERSION b/tizen_src/VERSION index 4c15a6c..c39e29f 100644 --- a/tizen_src/VERSION +++ b/tizen_src/VERSION @@ -1 +1 @@ -Chromium upsteam version: 34.0.1847.76 +Chromium upsteam version: 40.0.2214.0 diff --git a/tizen_src/build/gyp_chromiumefl.sh b/tizen_src/build/gyp_chromiumefl.sh index dbbb8047..26e3d0f 100755 --- a/tizen_src/build/gyp_chromiumefl.sh +++ b/tizen_src/build/gyp_chromiumefl.sh @@ -62,7 +62,8 @@ else -Dpython_ver=$(getPythonVersion) -Dtarget_arch=$host_arch -Dhost_arch=$host_arch - -Denable_printing=0 + -Denable_basic_printing=0 + -Denable_print_preview=0 -Duse_kerberos=0 -Duse_gconf=0 " diff --git a/tizen_src/ewk/efl_integration/pkgconfig/chromium-ewk.pc b/tizen_src/ewk/efl_integration/pkgconfig/chromium-ewk.pc index 3dff4b8..127777d 100644 --- a/tizen_src/ewk/efl_integration/pkgconfig/chromium-ewk.pc +++ b/tizen_src/ewk/efl_integration/pkgconfig/chromium-ewk.pc @@ -5,7 +5,7 @@ includedir=${prefix}/include Name: chromium-ewk Description: EWK API based on chromium-efl engine -Version: 34.1847.76.35-1 +Version: 40.2214.0.47-1 Requires: chromium-efl Libs: -L${libdir} -lchromium-ewk Cflags: -I${includedir}/chromium-ewk diff --git a/tizen_src/ewk/efl_integration/public/ewk_settings.cc b/tizen_src/ewk/efl_integration/public/ewk_settings.cc index 55511de..faabcf6 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_settings.cc +++ b/tizen_src/ewk/efl_integration/public/ewk_settings.cc @@ -7,7 +7,7 @@ #include // TODO: remove dependency -#include +#include #include <../impl/API/ewk_settings_private.h> // TODO: move non-ewk header file to other location #include "public/text_encoding_map_efl.h" diff --git a/tizen_src/ewk/efl_integration/public/ewk_view.cc b/tizen_src/ewk/efl_integration/public/ewk_view.cc index a198a41..3193112 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_view.cc +++ b/tizen_src/ewk/efl_integration/public/ewk_view.cc @@ -26,7 +26,7 @@ #include // TODO: remove dependency -#include +#include #if !defined(EWK_BRINGUP) #include #else diff --git a/tizen_src/ewk/efl_webview_app/chromium-efl.xml b/tizen_src/ewk/efl_webview_app/chromium-efl.xml index 120554d..89e2c19 100644 --- a/tizen_src/ewk/efl_webview_app/chromium-efl.xml +++ b/tizen_src/ewk/efl_webview_app/chromium-efl.xml @@ -1,5 +1,5 @@ - + SWC mini browser application based on chromium-efl diff --git a/tizen_src/impl/browser/renderer_host/touchpad_tap_suppression_controller_efl.cc b/tizen_src/impl/browser/renderer_host/touchpad_tap_suppression_controller_efl.cc index 44dea6b..5c8de3e 100644 --- a/tizen_src/impl/browser/renderer_host/touchpad_tap_suppression_controller_efl.cc +++ b/tizen_src/impl/browser/renderer_host/touchpad_tap_suppression_controller_efl.cc @@ -8,7 +8,7 @@ #include "content/browser/renderer_host/input/input_router.h" #include "content/browser/renderer_host/input/tap_suppression_controller.h" #include "content/browser/renderer_host/input/tap_suppression_controller_client.h" -#include "ui/events/gestures/gesture_configuration.h" +#include "ui/events/gesture_detection/gesture_configuration.h" namespace content { diff --git a/tizen_src/impl/chromium-efl.gyp b/tizen_src/impl/chromium-efl.gyp index 3b6ab2b..75337f6 100644 --- a/tizen_src/impl/chromium-efl.gyp +++ b/tizen_src/impl/chromium-efl.gyp @@ -387,7 +387,7 @@ 'defines': [ 'EWK_BRINGUP=1' ], 'defines!': [ 'TIZEN_CONTENTS_DETECTION=1' ], }], - ['enable_printing==0', { + ['enable_basic_printing==0 and enable_print_preview==0', { 'sources!': [ 'renderer/print_pages_params.cc', 'renderer/print_pages_params.h', diff --git a/tizen_src/impl/content_browser_client_efl.cc b/tizen_src/impl/content_browser_client_efl.cc index a86740e..2a93cf9 100644 --- a/tizen_src/impl/content_browser_client_efl.cc +++ b/tizen_src/impl/content_browser_client_efl.cc @@ -107,43 +107,10 @@ void ContentBrowserClientEfl::AllowCertificateError( resource_type, overridable, strict_enforcement, callback, result); } -void ContentBrowserClientEfl::RequestDesktopNotificationPermission( - const GURL& source_origin, - content::RenderFrameHost* render_frame_host, - const base::Callback& callback) { -#if defined(ENABLE_NOTIFICATIONS) && !defined(EWK_BRINGUP) - WebContents* web_contents = WebContentsFromViewID(render_process_id, - render_view_id); - if (!web_contents) - return; - - WebContentsDelegateEfl* delegate = - static_cast(web_contents->GetDelegate()); - if (!delegate) - return; - - BrowserContextEfl* browser_context = - static_cast(web_contents->GetBrowserContext()); - NotificationPermissionRequest* notification_permission - = new NotificationPermissionRequest(delegate->web_view()->evas_object(), - callback_context, - tizen_webview::GetURL(source_origin)); - - delegate->web_view()-> - SmartCallback() - .call(notification_permission); - // A smart callback cannot have ownership for data because the callback may - // not ever exist. Therefore new resource should be deleted in the call site. - // [sns.park] TODO: uncomment below if no side effect. - //delete notification_permission; -#else - NOTIMPLEMENTED(); -#endif -} - void ContentBrowserClientEfl::ShowDesktopNotification( const content::ShowDesktopNotificationHostMsgParams& params, - content::RenderFrameHost* render_frame_host, + BrowserContext* browser_context, + int render_process_id, scoped_ptr delegate, base::Closure* cancel_callback) { #if defined(ENABLE_NOTIFICATIONS) && !defined(EWK_BRINGUP) diff --git a/tizen_src/impl/content_browser_client_efl.h b/tizen_src/impl/content_browser_client_efl.h index f36cd12..f84f7e1 100644 --- a/tizen_src/impl/content_browser_client_efl.h +++ b/tizen_src/impl/content_browser_client_efl.h @@ -57,16 +57,12 @@ class ContentBrowserClientEfl: public ContentBrowserClient { const base::Callback& callback, CertificateRequestResultType* result) override; - // Asks permission to show desktop notifications. - virtual void RequestDesktopNotificationPermission(const GURL& source_origin, - content::RenderFrameHost* render_frame_host, - const base::Callback& callback) override; - // Show a desktop notification. If |worker| is true, the request came from an // HTML5 web worker, otherwise, it came from a renderer. virtual void ShowDesktopNotification( const content::ShowDesktopNotificationHostMsgParams& params, - content::RenderFrameHost* render_frame_host, + BrowserContext* browser_context, + int render_process_id, scoped_ptr delegate, base::Closure* cancel_callback) override; diff --git a/tizen_src/packaging/chromium-efl.spec b/tizen_src/packaging/chromium-efl.spec index cc71f07..f3dc29c 100755 --- a/tizen_src/packaging/chromium-efl.spec +++ b/tizen_src/packaging/chromium-efl.spec @@ -10,8 +10,8 @@ Name: chromium-efl Summary: Chromium EFL # Set by by scripts/update-chromium-version.sh -%define ChromiumVersion 40.2202.0 -%define Week 44 +%define ChromiumVersion 40.2214.0 +%define Week 47 Version: %{ChromiumVersion}.%{Week} Release: 1 Group: Applications/Internet diff --git a/tizen_src/packaging/manifest.xml b/tizen_src/packaging/manifest.xml index 58ccfc6..f0528ff 100644 --- a/tizen_src/packaging/manifest.xml +++ b/tizen_src/packaging/manifest.xml @@ -1,7 +1,7 @@ kmcele1k1p - 34.1847.76.35 + 40.2214.0.47 C++App diff --git a/tizen_src/sync_repos.sh b/tizen_src/sync_repos.sh index 62c9da2..f101968 100755 --- a/tizen_src/sync_repos.sh +++ b/tizen_src/sync_repos.sh @@ -1,6 +1,6 @@ #!/bin/bash -BRANCH=dev/m40_2202 +BRANCH=dev/m40_2214 URLBASE='ssh://165.213.202.130:29418/webplatform' REPOS=( "src|$URLBASE/s-chromium.git" \ "src/third_party/WebKit|$URLBASE/s-blink" \