Switch to the branch dev/m38_2125

Printing and kerberos has to be disabled for mobile due to unsatisfied
dependencies.

TODO: * rationalize build (set flags in gyp files, preferably supplement.gypi)
      * add cups to gbs to reenable printing

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

Change-Id: I7dc8aac41e359d24cd35e46b7763a6ed1050846f
Signed-off-by: Balazs Kelemen <b.kelemen@samsung.com>

diff --git a/tizen_src/.gclient b/tizen_src/.gclient
index 23c7ba2..ed48782 100644 (file)
--- a/tizen_src/.gclient
+++ b/tizen_src/.gclient
@@ -1,7 +1,7 @@
 solutions = [{
   'managed'     : False,
   'name'        : 'src',
-  'url'         : 'ssh://165.213.202.130:29418/webplatform/s-chromium.git@dev/m38_2121',
+  'url'         : 'ssh://165.213.202.130:29418/webplatform/s-chromium.git@dev/m38_2125',
   'custom_deps' : {
     'src/third_party/WebKit':None,
     'src/sbrowser':None,

diff --git a/tizen_src/build/gyp_chromiumefl.sh b/tizen_src/build/gyp_chromiumefl.sh
index be299d6..b1daf21 100755 (executable)
--- a/tizen_src/build/gyp_chromiumefl.sh
+++ b/tizen_src/build/gyp_chromiumefl.sh
@@ -67,6 +67,8 @@ else
                               -Dpython_ver=$(getPythonVersion)
                               -Dtarget_arch=$host_arch
                               -Dhost_arch=$host_arch
+                              -Denable_printing=0
+                              -Duse_kerberos=0
                              "
 
   if [ "${GBS_ARCH}" == "arm" ]; then

diff --git a/tizen_src/impl/chromium-efl.gyp b/tizen_src/impl/chromium-efl.gyp
index ccf388a..3c58928 100644 (file)
--- a/tizen_src/impl/chromium-efl.gyp
+++ b/tizen_src/impl/chromium-efl.gyp
@@ -355,6 +355,14 @@
       ['ewk_bringup==1', {
         'defines': [ 'EWK_BRINGUP=1' ],
       }],
+      ['enable_printing==0', {
+        'sources!': [
+          'renderer/print_pages_params.cc',
+          'renderer/print_pages_params.h',
+          'renderer/print_web_view_helper_efl.cc',
+          'renderer/print_web_view_helper_efl.h',
+        ],
+      }],
     ],
     'actions': [{
       'action_name': 'generate_pkgconfigs',

diff --git a/tizen_src/impl/renderer/render_view_observer_efl.cc b/tizen_src/impl/renderer/render_view_observer_efl.cc
index 6ea74d5..6650af5 100644 (file)
--- a/tizen_src/impl/renderer/render_view_observer_efl.cc
+++ b/tizen_src/impl/renderer/render_view_observer_efl.cc
@@ -300,10 +300,12 @@ void RenderViewObserverEfl::OnDoHitTest(int view_x, int view_y, tizen_webview::H
 
 void RenderViewObserverEfl::OnPrintToPdf(int width, int height, const base::FilePath& filename)
 {
+#if !(defined(EWK_BRINGUP) && defined(OS_TIZEN_MOBILE))
   blink::WebView* web_view = render_view()->GetWebView();
   DCHECK(web_view);
   PrintWebViewHelperEfl print_helper(render_view(), filename);
   print_helper.PrintToPdf(width, height);
+#endif
 }
 
 void RenderViewObserverEfl::OnGetMHTMLData(int callback_id)

diff --git a/tizen_src/impl/web_contents_delegate_efl.cc b/tizen_src/impl/web_contents_delegate_efl.cc
index c74025f..d19e1c2 100755 (executable)
--- a/tizen_src/impl/web_contents_delegate_efl.cc
+++ b/tizen_src/impl/web_contents_delegate_efl.cc
@@ -463,6 +463,7 @@ void WebContentsDelegateEfl::OnGetContentSecurityPolicy(IPC::Message* reply_msg)
 }
 
 void WebContentsDelegateEfl::OnPrintedMetafileReceived(const DidPrintPagesParams& params) {
+#if !(defined(EWK_BRINGUP) && defined(OS_TIZEN_MOBILE))
   base::SharedMemory shared_buf(params.metafile_data_handle, true);
   if (!shared_buf.Map(params.data_size)) {
      NOTREACHED() << "couldn't map";
@@ -475,6 +476,7 @@ void WebContentsDelegateEfl::OnPrintedMetafileReceived(const DidPrintPagesParams
   }
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
         base::Bind(&WritePdfDataToFile, metafile.release(), params.filename));
+#endif
 }
 
 void WebContentsDelegateEfl::NavigationEntryCommitted(const LoadCommittedDetails& load_details) {

diff --git a/tizen_src/sync_repos.sh b/tizen_src/sync_repos.sh
index 574ef94..ab1a8bb 100755 (executable)
--- a/tizen_src/sync_repos.sh
+++ b/tizen_src/sync_repos.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-BRANCH=dev/m38_2121
+BRANCH=dev/m38_2125
 URLBASE='ssh://165.213.202.130:29418/webplatform'
 REPOS=( "src|$URLBASE/s-chromium.git" \
         "src/third_party/WebKit|$URLBASE/s-blink" \