chromium-browser:version bump

2016-06-13 20:18:22 +03:00
parent 68082396db
commit 6e61900f03
38 changed files with 282 additions and 1139 deletions
@@ -0,0 +1,11 @@
+--- a/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cppg	2016-05-01 15:22:46.103607522 +0800
+++ b/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp	2016-05-01 15:25:14.459753876 +0800
+@@ -234,7 +234,7 @@
+ #endif
+             png_uint_32 profileLength = 0;
+             if (png_get_iCCP(png, info, &profileName, &compressionType, &profile, &profileLength)) {
+-                setColorProfileAndTransform(profile, profileLength, imageHasAlpha, false /* useSRGB */);
+                setColorProfileAndTransform((const char*)profile, profileLength, imageHasAlpha, false /* useSRGB */);
+             }
+         }
+ #endif // PNG_iCCP_SUPPORTED
@@ -1,24 +0,0 @@
-diff --git a/Source/platform/fonts/shaping/HarfBuzzShaper.cpp b/Source/platform/fonts/shaping/HarfBuzzShaper.cpp
-index 87441d9..a90b925 100644
--- third_party/WebKit//Source/platform/fonts/shaping/HarfBuzzShaper.cpp
-+++ third_party/WebKit//Source/platform/fonts/shaping/HarfBuzzShaper.cpp
-@@ -702,7 +702,7 @@ static inline void resolveRunBasedOnScriptValue(Vector<CandidateRun>& runs,
- 
- static inline bool resolveCandidateRuns(Vector<CandidateRun>& runs)
- {
-    UScriptCode scriptExtensions[8];
-+    UScriptCode scriptExtensions[USCRIPT_CODE_LIMIT];
-     UErrorCode errorCode = U_ZERO_ERROR;
-     size_t length = runs.size();
-     size_t nextResolvedRun = 0;
-@@ -714,7 +714,8 @@ static inline bool resolveCandidateRuns(Vector<CandidateRun>& runs)
-             run.script = i > 0 ? runs[i - 1].script : USCRIPT_COMMON;
- 
-         int extensionsLength = uscript_getScriptExtensions(run.character,
-            scriptExtensions, sizeof(scriptExtensions), &errorCode);
-+            scriptExtensions, sizeof(scriptExtensions) / sizeof(scriptExtensions[0]),
-+            &errorCode);
-         if (U_FAILURE(errorCode))
-             return false;
- 
- 
@@ -1,3 +1,4 @@
+#!/usr/bin/env xdg-open
 [Desktop Entry]
 Version=1.0
 Encoding=UTF-8
@@ -102,7 +103,7 @@ Comment[vi]=Truy cập Internet
 Comment[zh_CN]=访问互联网
 Comment[zh_HK]=連線到網際網路
 Comment[zh_TW]=連線到網際網路
-Exec=chromium-browser %U --ppapi-flash-path=/usr/lib/chromium-browser/PepperFlash/libpepflashplayer.so --ppapi-flash-version=18.0.0.233
+Exec=chromium-browser %U
 Terminal=false
 Icon=chromium-browser 
 Type=Application
@@ -1,4 +1,4 @@
 #!/bin/sh
-export CHROME_WRAPPER=/usr/lib/chromium-browser/chromium-browser
-export CHROME_DESKTOP=chromium-browser.desktop
-exec /usr/lib/chromium-browser/chromium-browser "$@"
+export CHROME_WRAPPER=/usr/lib/chromium/chromium
+export CHROME_DESKTOP=chromium.desktop
+exec /usr/lib/chromium/chromium "$@"
@@ -0,0 +1,53 @@
+diff -upr chromium-48.0.2564.82.orig/chrome/common/chrome_content_client.cc chromium-48.0.2564.82/chrome/common/chrome_content_client.cc
+--- chromium-48.0.2564.82.orig/chrome/common/chrome_content_client.cc	2016-01-20 22:01:20.000000000 +0200
+++ chromium-48.0.2564.82/chrome/common/chrome_content_client.cc	2016-01-21 20:02:02.788936626 +0200
+@@ -158,7 +158,12 @@ void ComputeBuiltInPlugins(std::vector<c
+ #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && \
+     !defined(WIDEVINE_CDM_IS_COMPONENT)
+   static bool skip_widevine_cdm_file_check = false;
+-  if (PathService::Get(chrome::FILE_WIDEVINE_CDM_ADAPTER, &path)) {
+  bool widevine_cdm_present =
+      skip_widevine_cdm_file_check ||
+      (PathService::Get(chrome::FILE_WIDEVINE_CDM, &path) &&
+       base::PathExists(path));
+  if (widevine_cdm_present &&
+      PathService::Get(chrome::FILE_WIDEVINE_CDM_ADAPTER, &path)) {
+     if (skip_widevine_cdm_file_check || base::PathExists(path)) {
+       content::PepperPluginInfo widevine_cdm;
+       widevine_cdm.is_out_of_process = true;
+diff -upr chromium-48.0.2564.82.orig/chrome/common/chrome_paths.cc chromium-48.0.2564.82/chrome/common/chrome_paths.cc
+--- chromium-48.0.2564.82.orig/chrome/common/chrome_paths.cc	2016-01-20 22:01:20.000000000 +0200
+++ chromium-48.0.2564.82/chrome/common/chrome_paths.cc	2016-01-21 19:18:51.287978456 +0200
+@@ -375,6 +375,11 @@ bool PathProvider(int key, base::FilePat
+         return false;
+       cur = cur.AppendASCII(kWidevineCdmAdapterFileName);
+       break;
+    case chrome::FILE_WIDEVINE_CDM:
+      if (!GetInternalPluginsDirectory(&cur))
+        return false;
+      cur = cur.AppendASCII(kWidevineCdmFileName);
+      break;
+ #endif  // defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
+     case chrome::FILE_RESOURCES_PACK:
+ #if defined(OS_MACOSX) && !defined(OS_IOS)
+diff -upr chromium-48.0.2564.82.orig/chrome/common/chrome_paths.h chromium-48.0.2564.82/chrome/common/chrome_paths.h
+--- chromium-48.0.2564.82.orig/chrome/common/chrome_paths.h	2016-01-14 03:49:22.000000000 +0200
+++ chromium-48.0.2564.82/chrome/common/chrome_paths.h	2016-01-21 19:18:51.287978456 +0200
+@@ -99,6 +99,7 @@ enum {
+   DIR_COMPONENT_WIDEVINE_CDM,   // Directory that contains component-updated
+                                 // Widevine CDM files.
+   FILE_WIDEVINE_CDM_ADAPTER,    // Full path to the Widevine CDM adapter file.
+  FILE_WIDEVINE_CDM,            // Full path to the Widevine CDM file.
+   FILE_RESOURCES_PACK,          // Full path to the .pak file containing
+                                 // binary data (e.g., html files and images
+                                 // used by internal pages).
+diff -upr chromium-48.0.2564.82.orig/third_party/widevine/cdm/stub/widevine_cdm_version.h chromium-48.0.2564.82/third_party/widevine/cdm/stub/widevine_cdm_version.h
+--- chromium-48.0.2564.82.orig/third_party/widevine/cdm/stub/widevine_cdm_version.h	2016-01-14 01:05:17.000000000 +0200
+++ chromium-48.0.2564.82/third_party/widevine/cdm/stub/widevine_cdm_version.h	2016-01-21 19:18:51.287978456 +0200
+@@ -12,4 +12,6 @@
+ 
+ #define WIDEVINE_CDM_AVAILABLE
+ 
+#define WIDEVINE_CDM_VERSION_STRING "@WIDEVINE_VERSION@"
+
+ #endif  // WIDEVINE_CDM_VERSION_H_
@@ -1,11 +0,0 @@
-diff -up chromium-46.0.2490.80/chrome/test/data/webui_test_resources.grd.542819fix chromium-46.0.2490.80/chrome/test/data/webui_test_resources.grd
--- chromium-46.0.2490.80/chrome/test/data/webui_test_resources.grd.542819fix   2015-10-14 10:47:17.568757249 -0400
-+++ chromium-46.0.2490.80/chrome/test/data/webui_test_resources.grd     2015-10-14 10:48:01.196466805 -0400
-@@ -8,7 +8,6 @@
-   </outputs>
-   <release seq="1">
-     <includes>
-      <include name="IDR_WEBUI_TEST_I18N_PROCESS_CSS_TEST" file="webui/i18n_process_css_test.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
-     </includes>
-   </release>
- </grit> 
@@ -1,71 +0,0 @@
-Index: printing/backend/print_backend.h
-diff --git a/printing/backend/print_backend.h b/printing/backend/print_backend.h
-index e03ef42e37cf0785ba735f4a241310f70125a6e7..a8123325a613f527ba4e91a412ba09cd3225c8ec 100644
--- a/printing/backend/print_backend.h
-+++ b/printing/backend/print_backend.h
-@@ -111,7 +111,6 @@ class PRINTING_EXPORT PrintBackend
- 
-   // Allocate a print backend. If |print_backend_settings| is NULL, default
-   // settings will be used.
-  // Return NULL if no print backend available.
-   static scoped_refptr<PrintBackend> CreateInstance(
-       const base::DictionaryValue* print_backend_settings);
- 
-Index: printing/backend/print_backend_dummy.cc
-diff --git a/printing/backend/print_backend_dummy.cc b/printing/backend/print_backend_dummy.cc
-index c73e5370720eda7a2f989401f37dc62c5e438e24..db269a75920d3c44381c87d67b91d923f0bfd8dc 100644
--- a/printing/backend/print_backend_dummy.cc
-+++ b/printing/backend/print_backend_dummy.cc
-@@ -13,10 +13,49 @@
- 
- namespace printing {
- 
-+class DummyPrintBackend : public PrintBackend {
-+ public:
-+  DummyPrintBackend() {
-+  }
-+
-+  bool EnumeratePrinters(PrinterList* printer_list) override {
-+    return false;
-+  }
-+
-+  std::string GetDefaultPrinterName() override {
-+    return std::string();
-+  }
-+
-+  bool GetPrinterSemanticCapsAndDefaults(
-+      const std::string& printer_name,
-+      PrinterSemanticCapsAndDefaults* printer_info) override {
-+    return false;
-+  }
-+
-+  bool GetPrinterCapsAndDefaults(
-+      const std::string& printer_name,
-+      PrinterCapsAndDefaults* printer_info) override {
-+    return false;
-+  }
-+
-+  std::string GetPrinterDriverInfo(
-+      const std::string& printer_name) override {
-+    return std::string();
-+  }
-+
-+  bool IsValidPrinter(const std::string& printer_name) override {
-+    return false;
-+  }
-+
-+ private:
-+  ~DummyPrintBackend() {}
-+
-+  DISALLOW_COPY_AND_ASSIGN(DummyPrintBackend);
-+};
-+
- scoped_refptr<PrintBackend> PrintBackend::CreateInstance(
-     const base::DictionaryValue* print_backend_settings) {
-  NOTREACHED();
-  return NULL;
-+  return new DummyPrintBackend();
- }
- 
- }  // namespace printing
- 
@@ -1,13 +0,0 @@
--- mojo/public/c/system/macros.h.orig	2014-09-03 14:48:42.963665035 +0000
-+++ mojo/public/c/system/macros.h	2014-09-03 14:49:12.180255593 +0000
-@@ -76,7 +76,8 @@
- // Unlike the C++11 |alignas()|, |alignment| must be an integer. It may not be a
- // type, nor can it be an expression like |MOJO_ALIGNOF(type)| (due to the
- // non-C++11 MSVS version).
-#if __cplusplus >= 201103L
-+#if __cplusplus >= 201103L && \
-+	(defined(__clang__) || (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 >= 40800))
- #define MOJO_ALIGNAS(alignment) alignas(alignment)
- #elif defined(__GNUC__)
- #define MOJO_ALIGNAS(alignment) __attribute__((aligned(alignment)))
- 
@@ -1,40 +0,0 @@
-Index: ui/accessibility/platform/atk_util_auralinux.cc
-diff --git a/ui/accessibility/platform/atk_util_auralinux.cc b/ui/accessibility/platform/atk_util_auralinux.cc
-index a15df08137d874609305f90a6bca6e5c15e5c213..7fcaf219351289fe7eba1f670d7a6743a8b40ddc 100644
--- a/ui/accessibility/platform/atk_util_auralinux.cc
-+++ b/ui/accessibility/platform/atk_util_auralinux.cc
-@@ -3,7 +3,9 @@
- // found in the LICENSE file.
- 
- #include <atk/atk.h>
-+#if defined(USE_GCONF)
- #include <gconf/gconf-client.h>
-+#endif
- #include <glib-2.0/gmodule.h>
- 
- #include "base/files/file_path.h"
-@@ -14,6 +16,8 @@
- 
- namespace {
- 
-+#if defined(USE_GCONF)
-+
- const char kGnomeAccessibilityEnabledKey[] =
-     "/desktop/gnome/interface/accessibility";
- 
-@@ -39,6 +43,15 @@ bool ShouldEnableAccessibility() {
-   return value;
- }
- 
-+#else  // !defined(USE_GCONF)
-+
-+bool ShouldEnableAccessibility() {
-+  // TODO(k.czech): implement this for non-GNOME desktops.
-+  return false;
-+}
-+
-+#endif  // defined(USE_GCONF)
-+
- }  // namespace
- 
- G_BEGIN_DECLS 
@@ -1,146 +0,0 @@
-From c2a0c6df7d468da9864c56f2099aa947b07e2535 Mon Sep 17 00:00:00 2001
-From: amistry <amistry@chromium.org>
-Date: Tue, 9 Jun 2015 12:18:39 -0700
-Subject: [PATCH] Add build flag to disable hotwording.
-
-Hotwording downloads a shared module from the web store containing a NaCl module. There is a desire to build and distribute Chromium without this happening. This change adds an "enable_hotwording" build flag that is enabled by default, but can be disabled at compile time.
-
-BUG=491435
-
-Review URL: https://codereview.chromium.org/1160243004
-
-Cr-Commit-Position: refs/heads/master@{#333548}
-
-Conflicts:
-	chrome/browser/search/hotword_service.cc
---
- build/common.gypi                                 | 4 ++++
- chrome/browser/BUILD.gn                           | 9 +++++++++
- chrome/browser/search/hotword_service.cc          | 4 ++++
- chrome/browser/search/hotword_service_unittest.cc | 4 ++++
- chrome/chrome_browser.gypi                        | 3 +++
- 5 files changed, 24 insertions(+)
-
-diff --git a/build/common.gypi b/build/common.gypi
-index 339cc75..ddb075c 100644
--- a/build/common.gypi
-+++ b/build/common.gypi
-@@ -381,6 +381,9 @@
-       # Web speech is enabled by default. Set to 0 to disable.
-       'enable_web_speech%': 1,
- 
-+      # 'Ok Google' hotwording is enabled by default. Set to 0 to disable.
-+      'enable_hotwording%': 1,
-+
-       # Notifications are compiled in by default. Set to 0 to disable.
-       'notifications%' : 1,
- 
-@@ -1134,6 +1137,7 @@
-     'configuration_policy%': '<(configuration_policy)',
-     'safe_browsing%': '<(safe_browsing)',
-     'enable_web_speech%': '<(enable_web_speech)',
-+    'enable_hotwording%': '<(enable_hotwording)',
-     'notifications%': '<(notifications)',
-     'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)',
-     'mac_want_real_dsym%': '<(mac_want_real_dsym)',
-diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 5152d83..6ccb079 100644
--- a/chrome/browser/BUILD.gn
-+++ b/chrome/browser/BUILD.gn
-@@ -18,6 +18,11 @@ if (is_desktop_linux) {
-   import("//build/config/linux/pkg_config.gni")
- }
- 
-+declare_args() {
-+  # 'Ok Google' hotwording is enabled.
-+  enable_hotwording = true
-+}
-+
- about_credits_file = "$target_gen_dir/about_credits.html"
- additional_modules_list_file =
-     "$root_gen_dir/chrome/browser/internal/additional_modules_list.txt"
-@@ -455,6 +460,10 @@ source_set("browser") {
-     }
-   }
- 
-+  if (enable_hotwording) {
-+    defines += [ "ENABLE_HOTWORDING" ]
-+  }
-+
-   if (is_linux) {
-     deps += [
-       "//device/media_transfer_protocol",
-diff --git a/chrome/browser/search/hotword_service.cc b/chrome/browser/search/hotword_service.cc
-index 0cf3c60..e93789b 100644
--- a/chrome/browser/search/hotword_service.cc
-+++ b/chrome/browser/search/hotword_service.cc
-@@ -642,6 +642,7 @@ bool HotwordService::IsServiceAvailable() {
- }
- 
- bool HotwordService::IsHotwordAllowed() {
-+#if defined(ENABLE_HOTWORDING)
-   std::string group = base::FieldTrialList::FindFullName(
-       hotword_internal::kHotwordFieldTrialName);
-   // Allow hotwording by default, and only disable if the field trial has been
-@@ -650,6 +651,9 @@ bool HotwordService::IsHotwordAllowed() {
-     return false;
- 
-   return DoesHotwordSupportLanguage(profile_);
-+#else
-+  return false;
-+#endif
- }
- 
- bool HotwordService::IsOptedIntoAudioLogging() {
-diff --git a/chrome/browser/search/hotword_service_unittest.cc b/chrome/browser/search/hotword_service_unittest.cc
-index a3aef47..b0b5927 100644
--- a/chrome/browser/search/hotword_service_unittest.cc
-+++ b/chrome/browser/search/hotword_service_unittest.cc
-@@ -216,6 +216,7 @@ TEST_P(HotwordServiceTest, IsHotwordAllowedInvalidFieldTrial) {
- }
- 
- TEST_P(HotwordServiceTest, IsHotwordAllowedLocale) {
-+#if defined(ENABLE_HOTWORDING)
-   TestingProfile::Builder profile_builder;
-   scoped_ptr<TestingProfile> profile = profile_builder.Build();
- 
-@@ -246,6 +247,7 @@ TEST_P(HotwordServiceTest, IsHotwordAllowedLocale) {
-   Profile* otr_profile = profile->GetOffTheRecordProfile();
-   SetApplicationLocale(otr_profile, "en");
-   EXPECT_FALSE(HotwordServiceFactory::IsHotwordAllowed(otr_profile));
-+#endif  // defined(ENABLE_HOTWORDING)
- }
- 
- TEST_P(HotwordServiceTest, ShouldReinstallExtension) {
-@@ -302,6 +304,7 @@ TEST_P(HotwordServiceTest, PreviousLanguageSetOnInstall) {
- }
- 
- TEST_P(HotwordServiceTest, UninstallReinstallTriggeredCorrectly) {
-+#if defined(ENABLE_HOTWORDING)
-   InitializeEmptyExtensionService();
-   service_->Init();
- 
-@@ -372,6 +375,7 @@ TEST_P(HotwordServiceTest, UninstallReinstallTriggeredCorrectly) {
-   EXPECT_TRUE(HotwordServiceFactory::IsHotwordAllowed(profile()));
-   EXPECT_FALSE(hotword_service->MaybeReinstallHotwordExtension());
-   EXPECT_EQ(1, hotword_service->uninstall_count());  // no change
-+#endif  // defined(ENABLE_HOTWORDING)
- }
- 
- TEST_P(HotwordServiceTest, DisableAlwaysOnOnLanguageChange) {
-diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
-index 6d323eb..1aaedba 100644
--- a/chrome/chrome_browser.gypi
-+++ b/chrome/chrome_browser.gypi
-@@ -3529,6 +3529,9 @@
-         ['enable_session_service==1', {
-           'sources': [ '<@(chrome_browser_session_service_sources)' ],
-         }],
-+        ['enable_hotwording==1', {
-+          'defines': [ 'ENABLE_HOTWORDING' ],
-+        }],
-         ['OS!="android" and OS!="ios" and chromeos==0', {
-           'sources': [ '<@(chrome_browser_desktop_sources)' ],
-         }],
-- 
-2.4.4
@@ -1,15 +0,0 @@
-diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
-index af7c775..e32fd13 100644
--- a/chrome/chrome_browser.gypi
-+++ b/chrome/chrome_browser.gypi
-@@ -3246,6 +3246,9 @@
-           'defines': [
-             'USE_LIBSECRET',
-           ],
-+          'cflags': [
-+            '<!@(pkg-config --cflags libsecret-1)',
-+          ],
-         }],
-         ['use_aura==1', {
-           'sources': [ '<@(chrome_browser_aura_sources)' ],
- 
@@ -1,36 +0,0 @@
--- third_party/WebKit/Source/bindings/scripts/scripts.gyp.orig	2014-08-19 09:55:10.330972228 +0000
-+++ third_party/WebKit/Source/bindings/scripts/scripts.gyp	2014-08-19 09:55:26.387286232 +0000
-@@ -54,7 +54,6 @@
-     'actions': [{
-       'action_name': 'cache_jinja_templates',
-       'inputs': [
-        '<@(jinja_module_files)',
-         'code_generator_v8.py',
-         '<@(code_generator_template_files)',
-       ],
--- third_party/WebKit/Source/build/scripts/scripts.gypi.orig	2014-08-19 10:00:00.216521733 +0000
-+++ third_party/WebKit/Source/build/scripts/scripts.gypi	2014-08-19 10:00:11.464735099 +0000
-@@ -2,10 +2,6 @@
- {
-     'variables': {
-         'scripts_for_in_files': [
-            # jinja2/__init__.py contains version string, so sufficient as
-            # dependency for whole jinja2 package
-            '<(DEPTH)/third_party/jinja2/__init__.py',
-            '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-             'hasher.py',
-             'in_file.py',
-             'in_generator.py',
--- third_party/WebKit/Source/bindings/scripts/scripts.gypi.orig	2014-08-19 10:53:02.824618979 +0000
-+++ third_party/WebKit/Source/bindings/scripts/scripts.gypi	2014-08-19 10:53:20.784957370 +0000
-@@ -12,9 +12,6 @@
-       '<(DEPTH)/third_party/markupsafe/__init__.py',  # jinja2 dep
-     ],
-     'idl_lexer_parser_files': [
-      # PLY (Python Lex-Yacc)
-      '<(DEPTH)/third_party/ply/lex.py',
-      '<(DEPTH)/third_party/ply/yacc.py',
-       # Web IDL lexer/parser (base parser)
-       '<(DEPTH)/tools/idl_parser/idl_lexer.py',
-       '<(DEPTH)/tools/idl_parser/idl_node.py',
- 
@@ -1,10 +0,0 @@
--- build/linux/unbundle/libvpx.gyp.orig	2015-04-08 09:25:29.605925761 +0000
-+++ build/linux/unbundle/libvpx.gyp	2015-04-08 09:27:19.932142216 +0000
-@@ -24,6 +24,7 @@
-           'vpx/vpx_integer.h',
-           'vpx/vp8dx.h',
-           'vpx/vpx_encoder.h',
-+          'vpx/vpx_frame_buffer.h',
-         ],
-       },
-       'includes': [ 
@@ -1,31 +0,0 @@
--- chromium-39.0.2171.95/third_party/widevine/cdm/widevine_cdm_version.h.orig	2014-12-10 05:36:13.000000000 +0100
-+++ chromium-39.0.2171.95/third_party/widevine/cdm/widevine_cdm_version.h	2014-12-28 20:47:39.080795240 +0100
-@@ -14,4 +14,8 @@
- //  - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available
- //    as a string, e.g., "1.0.123.456").
- 
-+#include "third_party/widevine/cdm/widevine_cdm_common.h"
-+#define WIDEVINE_CDM_AVAILABLE
-+#define WIDEVINE_CDM_VERSION_STRING "@WIDEVINE_VERSION@"
-+
- #endif  // WIDEVINE_CDM_VERSION_H_
--- chromium-39.0.2171.95/third_party/widevine/cdm/widevine_cdm.gyp.orig	2014-12-10 05:54:35.000000000 +0100
-+++ chromium-39.0.2171.95/third_party/widevine/cdm/widevine_cdm.gyp	2014-12-28 20:50:48.163269989 +0100
-@@ -7,7 +7,7 @@
-     'widevine_cdm_version_h_file%': 'widevine_cdm_version.h',
-     'widevine_cdm_binary_files%': [],
-     'conditions': [
-      [ 'branding == "Chrome"', {
-+      [ 'branding == "Chromium"', {
-         'conditions': [
-           [ 'chromeos == 1', {
-             'widevine_cdm_version_h_file%':
-@@ -54,7 +54,7 @@
-       'target_name': 'widevinecdmadapter',
-       'type': 'none',
-       'conditions': [
-        [ 'branding == "Chrome" and enable_pepper_cdms==1', {
-+        [ 'branding == "Chromium" and enable_pepper_cdms==1', {
-           'dependencies': [
-             '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp',
-             '<(DEPTH)/media/media_cdm_adapter.gyp:cdmadapter', 
@@ -1 +0,0 @@
-33a38183e0f94df38e14b6ecff545d89fbc5fc26
@@ -1,17 +0,0 @@
--- chrome/chrome_exe.gypi.ldflags	2012-06-28 09:02:24.000000000 -0400
-+++ chrome/chrome_exe.gypi	2012-07-06 15:46:13.008003437 -0400
-@@ -25,6 +25,14 @@
-         '<(DEPTH)/content/app/startup_helper_win.cc',
-         '<(DEPTH)/content/public/common/content_switches.cc',
-       ],
-+      # Hey, I know what would be an awesome idea.
-+      # Let us statically compile EVERYTHING into one giant
-+      # freaking executable. Too bad this means we can't build
-+      # natively on an IA32 machine. If only someone would
-+      # invent shared library objects. Idiots.
-+      'ldflags': [
-+        '-Wl,--no-keep-memory'
-+      ],
-       'mac_bundle_resources': [
-         'app/app-Info.plist',
-       ],
@@ -1,25 +0,0 @@
-Index: chromium/src/base/debug/stack_trace.h
-===================================================================
--- base/debug/stack_trace.h
-+++ base/debug/stack_trace.h
-@@ -5,6 +5,7 @@
- #ifndef BASE_DEBUG_STACK_TRACE_H_
- #define BASE_DEBUG_STACK_TRACE_H_
- 
-+#include <stdint.h>
- #include <iosfwd>
- #include <string>
- 
-Index: chromium/src/third_party/skia/src/ports/SkFontHost_fontconfig.cpp
-===================================================================
--- third_party/skia/src/ports/SkFontHost_fontconfig.cpp
-+++ third_party/skia/src/ports/SkFontHost_fontconfig.cpp
-@@ -14,6 +14,7 @@
- #include "SkStream.h"
- #include "SkTypeface.h"
- #include "SkTypefaceCache.h"
-+#include <unistd.h>
-
- ///////////////////////////////////////////////////////////////////////////////
- ///////////////////////////////////////////////////////////////////////////////
-
@@ -1,14 +0,0 @@
-Index: chromium/src/chrome/browser/first_run/first_run_linux.cc
-===================================================================
--- chrome/browser/first_run/first_run_internal_linux.cc
-+++ chrome/browser/first_run/first_run_internal_linux.cc
-@@ -22,8 +22,7 @@
- base::FilePath MasterPrefsPath() {
-   // The standard location of the master prefs is next to the chrome binary.
-   base::FilePath master_prefs;
-  if (!PathService::Get(base::DIR_EXE, &master_prefs))
-    return base::FilePath();
-+  master_prefs = base::FilePath("/etc/chromium");
-   return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
- }
-
@@ -1,17 +0,0 @@
-Index: src/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp
-===================================================================
--- third_party/WebKit/Source/wtf/text/TextCodecICU.cpp	(revision 101168)
-+++ third_party/WebKit/Source/wtf/text/TextCodecICU.cpp	(working copy)
-@@ -203,7 +203,11 @@
-     registrar("iso_8859-6", "ISO-8859-6");
-     registrar("iso_8859-7", "ISO-8859-7");
-     registrar("iso_8859-8", "ISO-8859-8");
-+    registrar("ISO_8859-8-I", "ISO-8859-8-I");
-     registrar("iso_8859-9", "windows-1254");
-+    registrar("ISO_8859-10", "ISO-8859-10");
-+    registrar("ISO_8859-13", "ISO-8859-13");
-+    registrar("ISO_8859-14", "ISO-8859-14");
-     registrar("iso_8859-15", "ISO-8859-15");
-     registrar("koi8_r", "KOI8-R");
-     registrar("x-cp1253", "windows-1253");
-
@@ -1,14 +0,0 @@
--- sandbox/linux/sandbox_linux.gypi	2011-11-15 19:35:11.119851877 +0100
-+++ sandbox/linux/sandbox_linux.gypi	2012-01-25 23:24:53.914568688 +0100
-@@ -85,7 +85,10 @@
-       ],
-       'cflags': [
-         # For ULLONG_MAX
-        '-std=gnu99',
-+        '-std=gnu99 -fPIE',
-+      ],
-+      'ldflags': [
-+        '-pie',
-       ],
-       'include_dirs': [
-         '../..',
@@ -1,10 +0,0 @@
--- net/base/mime_util.cc	2013-08-25 10:12:05.428599992 +0200
-+++ net/base/mime_util.cc	2013-08-25 10:12:05.428599992 +0200
-@@ -376,6 +376,7 @@
-   "text/x-csv",
-   "text/x-vcf",
-   "text/rtf",
-+  "text/x-pisi-ymp",
-   "text/comma-separated-values",
-   "text/csv",
-   "text/tab-separated-values",
@@ -1,20 +0,0 @@
--- build/common.gypi	2014-08-29 13:04:19.000000000 +0200
-+++ build/common.gypi	2014-08-29 13:04:19.000000000 +0200
-@@ -2440,7 +2440,7 @@
-         }],
-       ],
-       'clang_warning_flags': [
-        '-Wheader-hygiene',
-+        # '-Wheader-hygiene',
- 
-         # Don't die on dtoa code that uses a char as an array index.
-         # This is required solely for base/third_party/dmg_fp/dtoa.cc.
-@@ -2456,7 +2456,7 @@
-         '-Wno-covered-switch-default',
- 
-         # Warns when a const char[] is converted to bool.
-        '-Wstring-conversion',
-+        # '-Wstring-conversion',
- 
-         # C++11-related flags:
- 
@@ -0,0 +1,57 @@
+
+diff --git a/third_party/WebKit/Source/wtf/dtoa/bignum.cc b/third_party/WebKit/S
+ index a000b46..6c6d336 100644
+ --- a/third_party/WebKit/Source/wtf/dtoa/bignum.cc
+ +++ b/third_party/WebKit/Source/wtf/dtoa/bignum.cc
+-@@ -109,7 +109,10 @@ namespace double_conversion {
+-         int length = value.length();
+-         int pos = 0;
+-         // Let's just say that each digit needs 4 bits.
+@@ -102,7 +102,10 @@
+     }
+ 
+ 
+ +#pragma GCC diagnostic push
+ +#pragma GCC diagnostic warning "-Wstrict-overflow"
+-         while (length >= kMaxUint64DecimalDigits) {
+     void Bignum::AssignDecimalString(Vector<const char> value) {
+ +#pragma GCC diagnostic pop
+-             uint64_t digits = ReadUInt64(value, pos, kMaxUint64DecimalDigits);
+-             pos += kMaxUint64DecimalDigits;
+-             length -= kMaxUint64DecimalDigits;
+         // 2^64 = 18446744073709551616 > 10^19
+         const int kMaxUint64DecimalDigits = 19;
+         Zero();
+ -- 
+ 1.8.4.5
+-
+
+
+diff --git a/ui/gfx/image/image_util.cc b/ui/gfx/image/image_util.cc
+ index 89a3f8c..d595da3 100644
+ --- a/ui/gfx/image/image_util.cc
+ +++ b/ui/gfx/image/image_util.cc
+-@@ -68,7 +68,10 @@ bool VisibleMargins(const ImageSkia& image, int* leading, int* trailing) {
+-   int inner_min = bitmap.width();
+-   for (int x = 0; x < bitmap.width(); ++x) {
+-     for (int y = 0; y < bitmap.height(); ++y) {
+@@ -47,7 +47,10 @@
+ }
+ #endif  // !defined(OS_IOS)
+ 
+ +#pragma GCC diagnostic push
+ +#pragma GCC diagnostic warning "-Wstrict-overflow"
+-       if (SkColorGetA(bitmap.getColor(x, y)) > kMinimumVisibleOpacity) {
+ bool VisibleMargins(const ImageSkia& image, int* leading, int* trailing) {
+ +#pragma GCC diagnostic pop
+-         inner_min = x;
+-         break;
+-       }
+   *leading = 0;
+   *trailing = std::max(1, image.width()) - 1;
+   if (!image.HasRepresentation(1.0))
+ -- 
+ 1.8.4.5
+-
+-- 
+2.7.1
@@ -0,0 +1,48 @@
+diff -Naur orig/ui/gfx/codec/jpeg_codec.cc patched/ui/gfx/codec/jpeg_codec.cc
+--- orig/ui/gfx/codec/jpeg_codec.cc	2016-04-24 21:31:31.000000000 +0200
+++ patched/ui/gfx/codec/jpeg_codec.cc	2016-06-13 23:43:36.809948082 +0200
+@@ -120,7 +120,7 @@
+   // tell libjpeg where to write the next data
+   cinfo->dest->next_output_byte = &(*state->out)[state->image_buffer_used];
+   cinfo->dest->free_in_buffer = state->out->size() - state->image_buffer_used;
+-  return 1;
+  return TRUE;
+ }
+
+ // Cleans up the JpegEncoderState to prepare for returning in the final form.
+@@ -266,7 +266,7 @@
+   cinfo.data_precision = 8;
+
+   jpeg_set_defaults(&cinfo);
+-  jpeg_set_quality(&cinfo, quality, 1);  // quality here is 0-100
+  jpeg_set_quality(&cinfo, quality, TRUE);  // quality here is 0-100
+
+   // set up the destination manager
+   jpeg_destination_mgr destmgr;
+@@ -278,7 +278,7 @@
+   JpegEncoderState state(output);
+   cinfo.client_data = &state;
+
+-  jpeg_start_compress(&cinfo, 1);
+  jpeg_start_compress(&cinfo, TRUE);
+
+   // feed it the rows, doing necessary conversions for the color format
+ #ifdef JCS_EXTENSIONS
+@@ -364,7 +364,7 @@
+ //   set to a positive value if TRUE is returned. A FALSE return should only
+ //   be used when I/O suspension is desired."
+ boolean FillInputBuffer(j_decompress_ptr cinfo) {
+-  return false;
+  return FALSE;
+ }
+
+ // Skip data in the buffer. Since we have all the data at once, this operation
+@@ -496,7 +496,7 @@
+   cinfo.client_data = &state;
+
+   // fill the file metadata into our buffer
+-  if (jpeg_read_header(&cinfo, true) != JPEG_HEADER_OK)
+  if (jpeg_read_header(&cinfo, TRUE) != JPEG_HEADER_OK)
+     return false;
+
+   // we want to always get RGB data out
@@ -1,12 +0,0 @@
--- chromium-browser-42.0.2311.82/third_party/angle/src/angle.gyp~	2015-04-09 00:14:43.000000000 +0300
-+++ chromium-browser-42.0.2311.82/third_party/angle/src/angle.gyp	2015-04-21 22:02:35.668680845 +0300
-@@ -104,8 +104,7 @@
-                         {
-                             'action_name': 'Generate ANGLE Commit ID Header',
-                             'message': 'Generating ANGLE Commit ID',
-                            # reference the git index as an input, so we rebuild on changes to the index
-                            'inputs': [ '<(angle_id_script)', '<(angle_path)/.git/index' ],
-+                            'inputs': [ '<(angle_id_script)' ],
-                             'outputs': [ '<(angle_id_header)' ],
-                             'msvs_cygwin_shell': 0,
-                             'action': 
@@ -1,11 +0,0 @@
--- chromium-browser-38.0.2125.111/media/cast/logging/encoding_event_subscriber.cc~	2014-10-02 19:39:47.000000000 +0200
-+++ chromium-browser-38.0.2125.111/media/cast/logging/encoding_event_subscriber.cc	2014-11-05 06:35:45.611057986 +0100
-@@ -6,6 +6,7 @@
- 
- #include <cstring>
- #include <utility>
-+#include <algorithm>
- 
- #include "base/logging.h"
- #include "media/cast/logging/proto/proto_utils.h"
- 
@@ -1,17 +0,0 @@
-dlopen the sonamed libs directly, like it has already been done for libGL.so.1,
-as we don't want to Depend on the -devel packages for the .so files:
- libOSMesa.so.8: Mesa-libOSMesa-9.2.0-2
- libGLESv2.so.2: Mesa-libGLES-9.2.0-2
- libEGL.so.1: Mesa-libEGL-9.2.0-2
--- chromium-browser-36.0.1985.143/ui/gl/gl_implementation_osmesa.cc~	2014-08-12 22:02:27.000000000 +0300
-+++ chromium-browser-36.0.1985.143/ui/gl/gl_implementation_osmesa.cc	2014-08-18 23:09:25.208179075 +0300
-@@ -37,7 +37,7 @@
-     return false;
-   }
- 
-  base::FilePath library_path = module_path.Append("libosmesa.so");
-+  base::FilePath library_path = module_path.Append("libOSMesa.so.8");
-   base::NativeLibrary library = LoadLibraryAndPrintError(library_path);
-   if (!library)
-     return false;
- 
@@ -1,72 +0,0 @@
-fix error reporting:
-
-...
-  File "chromium/scripts/generate_gyp.py", line 757, in GetIncludedSources
-    exit('Failed to find file', include_file_path)
-TypeError: __call__() takes at most 2 arguments (3 given)
-
--- ./third_party/ffmpeg/chromium/scripts/generate_gyp.py~	2015-07-27 07:15:51.000000000 +0300
-+++ ./third_party/ffmpeg/chromium/scripts/generate_gyp.py	2015-07-27 07:15:55.928135410 +0300
-@@ -79,6 +79,7 @@
- import string
- import subprocess
- import shutil
-+import sys
- 
- COPYRIGHT = """# Copyright %d The Chromium Authors. All rights reserved.
- # Use of this source code is governed by a BSD-style license that can be
-@@ -149,6 +150,9 @@
- # Mac doesn't have any platform specific files, so just use linux and win.
- SUPPORTED_PLATFORMS = ['linux', 'win']
- 
-+def die(error):
-+    print >> sys.stderr, error
-+    sys.exit(1)
- 
- def NormalizeFilename(name):
-   """ Removes leading path separators in an attempt to normalize paths."""
-@@ -753,7 +757,7 @@
-     elif include_file_path in IGNORED_INCLUDE_FILES:
-       continue
-     else:
-      exit('Failed to find file', include_file_path)
-+      die('Failed to find file: ' + include_file_path)
- 
-     # At this point we've found the file. Check if its in our ignore list which
-     # means that the list should be updated to no longer mention this file.
-@@ -772,7 +776,7 @@
-   licensecheck_path = os.path.abspath(os.path.join(
-       source_root, 'third_party', 'devscripts', 'licensecheck.pl'));
-   if not os.path.exists(licensecheck_path):
-    exit('Could not find licensecheck.pl: ' + str(licensecheck_path))
-+    die('Could not find licensecheck.pl: ' + str(licensecheck_path))
- 
-   check_process = subprocess.Popen([licensecheck_path,
-                                     '-l', '100',
-@@ -838,7 +842,7 @@
- 
-       # Sanity check: source set should not have any renames prior to this step.
-       if RENAME_PREFIX in basename:
-        exit('Found unexpected renamed file in SourceSet: %s' % basename)
-+        die('Found unexpected renamed file in SourceSet: %s' % basename)
- 
-       # Craft a new unique basename from the path of the colliding file
-       if basename in known_basenames:
-@@ -896,7 +900,7 @@
-   sets = CreatePairwiseDisjointSets(sets)
- 
-   if not sets:
-    exit('ERROR: failed to find any source sets. ' +
-+    die('ERROR: failed to find any source sets. ' +
-          'Are build_dir (%s) and/or source_dir (%s) options correct?' %
-               (options.build_dir, options.source_dir))
- 
-@@ -904,7 +908,7 @@
- 
-   if not CheckLicensesForStaticLinking(sets, source_dir,
-                                        options.print_licenses):
-    exit ('GENERATE FAILED: invalid licenses detected.')
-+    die('GENERATE FAILED: invalid licenses detected.')
-   print 'License checks passed.'
- 
-   # Open for writing. 
@@ -1,22 +0,0 @@
--- chromium-browser-44.0.2403.107/third_party/ffmpeg/chromium/scripts/generate_gyp.py~	2015-07-27 07:21:59.000000000 +0300
-+++ chromium-browser-44.0.2403.107/third_party/ffmpeg/chromium/scripts/generate_gyp.py	2015-07-27 07:22:03.210572817 +0300
-@@ -757,7 +757,8 @@
-     elif include_file_path in IGNORED_INCLUDE_FILES:
-       continue
-     else:
-      die('Failed to find file: ' + include_file_path)
-+      print('Failed to find file: ' + include_file_path)
-+      continue
- 
-     # At this point we've found the file. Check if its in our ignore list which
-     # means that the list should be updated to no longer mention this file.
-@@ -776,7 +777,8 @@
-   licensecheck_path = os.path.abspath(os.path.join(
-       source_root, 'third_party', 'devscripts', 'licensecheck.pl'));
-   if not os.path.exists(licensecheck_path):
-    die('Could not find licensecheck.pl: ' + str(licensecheck_path))
-+    print('Could not find licensecheck.pl: ' + str(licensecheck_path))
-+    return True
- 
-   check_process = subprocess.Popen([licensecheck_path,
-                                     '-l', '100', 
@@ -1,19 +0,0 @@
-In PLD Linux, browser-plugins framework symlinks enabled plugins to plugins/ dir
-access directly from there, instead of symlinking in google-chrome.spec
-
--- chromium-browser-20.0.1132.57/./src/chrome/common/chrome_paths.cc~	2012-07-13 21:13:51.000000000 +0300
-+++ chromium-browser-20.0.1132.57/./src/chrome/common/chrome_paths.cc	2012-07-13 21:14:41.799431216 +0300
-@@ -255,9 +255,11 @@
-       cur = cur.Append(chrome::kPepperFlashPluginFilename);
-       break;
-     case chrome::FILE_PDF_PLUGIN:
-      if (!GetInternalPluginsDirectory(&cur))
-+      if (!PathService::Get(base::DIR_MODULE, &cur))
-         return false;
-      cur = cur.Append(kInternalPDFPluginFileName);
-+
-+      cur = cur.Append(FILE_PATH_LITERAL("plugins"))
-+               .Append(kInternalPDFPluginFileName);
-       break;
-     case chrome::FILE_NACL_PLUGIN:
-       if (!GetInternalPluginsDirectory(&cur))
@@ -1,29 +0,0 @@
--- chromium-browser-31.0.1650.57/build/linux/unbundle/remove_bundled_libraries.py	2013-11-16 22:18:32.618209221 +0200
-+++ chromium-browser-31.0.1650.57/build/linux/unbundle/remove_bundled_libraries.py	2013-11-16 23:34:12.718095629 +0200
-@@ -27,6 +27,7 @@
- 
-   parser = optparse.OptionParser()
-   parser.add_option('--do-remove', action='store_true')
-+  parser.add_option('--do-print', action='store_true')
- 
-   options, args = parser.parse_args(argv)
- 
-@@ -62,6 +63,8 @@
- 
-       if options.do_remove:
-         # Delete the file - best way to ensure it's not used during build.
-+        if options.do_print:
-+            print relpath
-         os.remove(path)
-       else:
-         # By default just print paths that would be removed.
-@@ -74,7 +77,7 @@
-   for exclusion, used in exclusion_used.iteritems():
-     if not used:
-       print '%s does not exist' % exclusion
-      exit_code = 1
-+      exit_code = 0
- 
-   if not options.do_remove:
-     print ('To actually remove files printed above, please pass ' +
- 
@@ -1,14 +0,0 @@
-in PLD Linux, windows includes are not packaged
-http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2013-February/023459.html
-
--- chromium-browser-42.0.2311.82/ui/gl/generate_bindings.py~	2015-04-09 00:14:31.000000000 +0300
-+++ chromium-browser-42.0.2311.82/ui/gl/generate_bindings.py	2015-04-19 23:32:27.601618454 +0300
-@@ -1616,7 +1616,7 @@
-       'EGL_ANGLE_surface_d3d_texture_2d_share_handle',
-     ],
-   ],
-  [WGL_FUNCTIONS, 'wgl', ['noninclude/GL/wglext.h'], []],
-+#  [WGL_FUNCTIONS, 'wgl', ['noninclude/GL/wglext.h'], []],
-   [GLX_FUNCTIONS, 'glx', ['GL/glx.h', 'noninclude/GL/glxext.h'], []],
- ]
- 
@@ -0,0 +1,11 @@
+--- a/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cppg	2016-05-01 15:22:46.103607522 +0800
+++ b/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp	2016-05-01 15:25:14.459753876 +0800
+@@ -234,7 +234,7 @@
+ #endif
+             png_uint_32 profileLength = 0;
+             if (png_get_iCCP(png, info, &profileName, &compressionType, &profile, &profileLength)) {
+-                setColorProfileAndTransform(profile, profileLength, imageHasAlpha, false /* useSRGB */);
+                setColorProfileAndTransform((const char*)profile, profileLength, imageHasAlpha, false /* useSRGB */);
+             }
+         }
+ #endif // PNG_iCCP_SUPPORTED