diff options
| author | rene <rene@FreeBSD.org> | 2016-08-13 02:51:46 +0800 |
|---|---|---|
| committer | rene <rene@FreeBSD.org> | 2016-08-13 02:51:46 +0800 |
| commit | b6e4fff912e3b66e671cb81f5fc406192319e83a (patch) | |
| tree | 03cbd36ec5856b2da7d4e4e802f030412156fb3e /www/chromium | |
| parent | 76ac62b8a2607a26d17adb8e4d795d6cef6d8ebf (diff) | |
| download | freebsd-ports-gnome-b6e4fff912e3b66e671cb81f5fc406192319e83a.tar.gz freebsd-ports-gnome-b6e4fff912e3b66e671cb81f5fc406192319e83a.tar.zst freebsd-ports-gnome-b6e4fff912e3b66e671cb81f5fc406192319e83a.zip | |
www/chromium: update to 52.0.2743.116
Mark BROKEN on FreeBSD 9 for now, does not patch
Submitted by: "LeFroid" via GitHub
MFH: 2016Q3
Security: https://vuxml.freebsd.org/freebsd/6fae9fe1-5048-11e6-8aa7-3065ec8fd3ec.html
Diffstat (limited to 'www/chromium')
55 files changed, 458 insertions, 871 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index fcf38ea3cc1f..13559a95cc2d 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 51.0.2704.106 -PORTREVISION= 2 +PORTVERSION= 52.0.2743.116 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on @@ -14,6 +13,8 @@ COMMENT= Google web browser based on WebKit LICENSE= BSD3CLAUSE LGPL21 MPL LICENSE_COMB= multi +BROKEN_FreeBSD_9=does not patch + CFLAGS+= -isystem${LOCALBASE}/include -I${PREFIX}/include/atk-1.0 BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:devel/gperf \ @@ -101,7 +102,7 @@ GYP_DEFINES+= \ enable_webrtc=1 \ werror= \ no_gc_sections=1 \ - OS=freebsd \ + OS=freebsd \ os_ver=${OSVERSION} \ prefix_dir=${LOCALBASE} \ python_ver=${PYTHON_VER} \ @@ -255,8 +256,8 @@ pre-everything:: post-patch: @${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|" \ ${WRKSRC}/crypto/crypto.gyp \ - ${WRKSRC}/v8/tools/gyp/v8.gyp \ - ${WRKSRC}/v8/build/toolchain.gypi + ${WRKSRC}/v8/src/v8.gyp \ + ${WRKSRC}/v8/gypfiles/toolchain.gypi @${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|" \ ${WRKSRC}/chrome/common/chrome_paths.cc \ ${WRKSRC}/base/base.gyp @@ -279,7 +280,6 @@ pre-configure: 'chrome/third_party/mock4js' \ 'chrome/third_party/mozilla_security_manager' \ 'courgette/third_party' \ - 'crypto/third_party/nss' \ 'net/third_party/mozilla_security_manager' \ 'net/third_party/nss' \ 'third_party/WebKit' \ @@ -291,7 +291,7 @@ pre-configure: 'third_party/boringssl' \ 'third_party/cacheinvalidation' \ 'third_party/catapult' \ - 'third_party/catapult/third_party/beautifulsoup' \ + 'third_party/catapult/third_party/beautifulsoup4' \ 'third_party/catapult/third_party/py_vulcanize' \ 'third_party/catapult/third_party/py_vulcanize/py_vulcanize' \ 'third_party/catapult/third_party/py_vulcanize/third_party/rcssmin' \ @@ -341,6 +341,8 @@ pre-configure: 'third_party/ply' \ 'third_party/polymer' \ 'third_party/protobuf' \ + 'third_party/protobuf/third_party' \ + 'third_party/protobuf/third_party/six' \ 'third_party/pywebsocket' \ 'third_party/qcms' \ 'third_party/qunit' \ diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 5f61835b5544..ef5a70364f99 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1466791065 -SHA256 (chromium-51.0.2704.106.tar.xz) = fb97a6a3119ec2c8cc4ad9a0bd6c4d306516769039a2633633f7d0c770012cfd -SIZE (chromium-51.0.2704.106.tar.xz) = 448656636 -SHA256 (chromium-51.0.2704.106-testdata.tar.xz) = 926b44fd0020922ce50b4b838391ae0c531ba4ee3fc6915c4c8b7fd95db765e5 -SIZE (chromium-51.0.2704.106-testdata.tar.xz) = 121454396 +TIMESTAMP = 1470404034 +SHA256 (chromium-52.0.2743.116.tar.xz) = a194ae1edb041024b3d4b6ba438f32fefdb6f1ecb24a96c50248a486b237a101 +SIZE (chromium-52.0.2743.116.tar.xz) = 458156660 +SHA256 (chromium-52.0.2743.116-testdata.tar.xz) = d3d059e1215702d8665f02b47a10e14458f54f423c323a9fcc987e6e43767c0b +SIZE (chromium-52.0.2743.116-testdata.tar.xz) = 122423496 diff --git a/www/chromium/files/extra-patch-clang b/www/chromium/files/extra-patch-clang index de61d708d5f7..034863ece00a 100644 --- a/www/chromium/files/extra-patch-clang +++ b/www/chromium/files/extra-patch-clang @@ -62,22 +62,6 @@ GetSession(session_tag)->windows[window_id]); GetSession(session_tag)->windows[window_id] = window_ptr; } ---- content/browser/frame_host/render_widget_host_view_guest.cc 2015-04-15 00:31:22.000000000 +0200 -+++ content/browser/frame_host/render_widget_host_view_guest.cc 2015-04-18 22:10:28.000000000 +0200 -@@ -315,11 +315,11 @@ - - gfx::NativeViewId RenderWidgetHostViewGuest::GetNativeViewId() const { - if (!guest_) -- return static_cast<gfx::NativeViewId>(NULL); -+ return reinterpret_cast<gfx::NativeViewId>(NULL); - - RenderWidgetHostView* rwhv = guest_->GetOwnerRenderWidgetHostView(); - if (!rwhv) -- return static_cast<gfx::NativeViewId>(NULL); -+ return reinterpret_cast<gfx::NativeViewId>(NULL); - return rwhv->GetNativeViewId(); - } - --- media/audio/audio_output_proxy_unittest.cc 2015-04-15 00:18:55.000000000 +0200 +++ media/audio/audio_output_proxy_unittest.cc 2015-04-18 22:02:38.000000000 +0200 @@ -387,7 +387,7 @@ @@ -167,14 +151,3 @@ tasks_.erase(it, tasks_.end()); ---- third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig 2015-10-14 22:17:57.580250000 +0200 -+++ third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp 2015-10-14 22:18:13.766229000 +0200 -@@ -358,7 +358,7 @@ - { - RefPtr<SharedBuffer> buffer; - -- SkFontTableTag tag = WTF::bswap32(table); -+ SkFontTableTag tag = bswap32(table); - const size_t tableSize = m_typeface->getTableSize(tag); - if (tableSize) { - Vector<char> tableBuffer(tableSize); diff --git a/www/chromium/files/patch-base_base.gyp b/www/chromium/files/patch-base_base.gyp index b05b70e6a8f2..7cf562ded0bd 100644 --- a/www/chromium/files/patch-base_base.gyp +++ b/www/chromium/files/patch-base_base.gyp @@ -1,6 +1,6 @@ ---- base/base.gyp.orig 2016-05-11 19:02:11 UTC -+++ base/base.gyp -@@ -113,7 +113,7 @@ +--- ./base/base.gyp.orig 2016-07-22 00:06:49.000000000 -0400 ++++ ./base/base.gyp 2016-08-05 08:28:39.441243000 -0400 +@@ -114,7 +114,7 @@ ], 'link_settings': { 'libraries': [ @@ -9,7 +9,24 @@ ], }, }], -@@ -748,6 +748,11 @@ +@@ -286,13 +286,13 @@ + ], + }], + ['icu_use_data_file_flag==1', { +- 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE'], ++ 'defines': ['ICU_UTIL_DATA_IMPL=0'], + }, { # else icu_use_data_file_flag !=1 + 'conditions': [ + ['OS=="win"', { +- 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_SHARED'], ++ 'defines': ['ICU_UTIL_DATA_IMPL=1'], + }, { +- 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC'], ++ 'defines': ['ICU_UTIL_DATA_IMPL=2'], + }], + ], + }], +@@ -773,6 +773,11 @@ 'sync_socket_unittest.cc', ], }], diff --git a/www/chromium/files/patch-base_i18n_icu__util.cc b/www/chromium/files/patch-base_i18n_icu__util.cc deleted file mode 100644 index d9065581122a..000000000000 --- a/www/chromium/files/patch-base_i18n_icu__util.cc +++ /dev/null @@ -1,13 +0,0 @@ ---- base/i18n/icu_util.cc.orig 2016-05-21 17:18:09 UTC -+++ base/i18n/icu_util.cc -@@ -36,10 +36,6 @@ - #include "base/mac/foundation_util.h" - #endif - --#define ICU_UTIL_DATA_FILE 0 --#define ICU_UTIL_DATA_SHARED 1 --#define ICU_UTIL_DATA_STATIC 2 -- - namespace base { - namespace i18n { - diff --git a/www/chromium/files/patch-base_i18n_icu__util.h b/www/chromium/files/patch-base_i18n_icu__util.h deleted file mode 100644 index 80df222449e7..000000000000 --- a/www/chromium/files/patch-base_i18n_icu__util.h +++ /dev/null @@ -1,13 +0,0 @@ ---- base/i18n/icu_util.h.orig 2016-05-21 17:19:29 UTC -+++ base/i18n/icu_util.h -@@ -11,6 +11,10 @@ - #include "base/i18n/base_i18n_export.h" - #include "build/build_config.h" - -+#define ICU_UTIL_DATA_FILE 0 -+#define ICU_UTIL_DATA_SHARED 1 -+#define ICU_UTIL_DATA_STATIC 2 -+ - namespace base { - namespace i18n { - diff --git a/www/chromium/files/patch-build_common.gypi b/www/chromium/files/patch-build_common.gypi index d68046c5c9e8..309c5810d63e 100644 --- a/www/chromium/files/patch-build_common.gypi +++ b/www/chromium/files/patch-build_common.gypi @@ -1,31 +1,6 @@ ---- build/common.gypi.orig 2016-05-11 19:02:12 UTC -+++ build/common.gypi -@@ -112,7 +112,7 @@ - - 'conditions': [ - # Windows and Linux use Aura, but not Ash. -- ['OS=="win" or OS=="linux"', { -+ ['OS=="win" or OS=="linux" or OS=="freebsd" or OS=="openbsd"', { - 'use_aura%': 1, - }], - -@@ -254,13 +254,13 @@ - }], - - # Enable HiDPI on Mac OS, Windows and Linux (including Chrome OS). -- ['OS=="mac" or OS=="win" or OS=="linux"', { -+ ['OS=="mac" or OS=="win" or OS=="linux" or OS=="freebsd" or OS=="openbsd"', { - 'enable_hidpi%': 1, - }], - - # Enable Top Chrome Material Design on Chrome OS, Windows, and Linux, - # and Mac. -- ['chromeos==1 or OS=="win" or OS=="linux" or OS=="mac"', { -+ ['chromeos==1 or OS=="win" or OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd"', { - 'enable_topchrome_md%': 1, - }], - -@@ -733,6 +733,12 @@ +--- build/common.gypi.orig 2016-07-22 00:06:49.000000000 -0400 ++++ build/common.gypi 2016-08-03 11:18:18.437811000 -0400 +@@ -726,6 +726,12 @@ 'os_bsd%': 0, }], @@ -38,34 +13,7 @@ # NSS usage. ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris")', { 'use_nss_certs%': 1, -@@ -778,7 +784,7 @@ - }], - - # DBus usage. -- ['OS=="linux" and embedded==0', { -+ ['(OS=="linux" or OS=="freebsd") and embedded==0', { - 'use_dbus%': 1, - }, { - 'use_dbus%': 0, -@@ -881,7 +887,7 @@ - - # Use GPU accelerated cross process image transport by default - # on linux builds with the Aura window manager -- ['use_aura==1 and OS=="linux"', { -+ ['use_aura==1 and (OS=="linux" or OS=="freebsd" or OS=="openbsd")', { - 'ui_compositor_image_transport%': 1, - }, { - 'ui_compositor_image_transport%': 0, -@@ -1003,7 +1009,7 @@ - }, { - 'use_openmax_dl_fft%': 0, - }], -- ['OS=="win" or OS=="linux"', { -+ ['OS=="win" or OS=="linux" or OS=="freebsd"', { - 'enable_mdns%' : 1, - }], - -@@ -1300,6 +1306,10 @@ +@@ -1303,6 +1309,10 @@ # able to turn it off for various reasons. 'linux_disable_pie%': 0, @@ -76,7 +24,7 @@ # The release channel that this build targets. This is used to restrict # channel-specific build options, like which installer packages to create. # The default is 'all', which does no channel-specific filtering. -@@ -4715,6 +4725,13 @@ +@@ -4709,6 +4719,13 @@ 'ldflags': [ '-Wl,--no-keep-memory', ], diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc b/www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc index f441ac6fcd95..59aa32401d15 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/messaging/message_service.cc.orig 2016-05-21 16:16:28 UTC -+++ chrome/browser/extensions/api/messaging/message_service.cc -@@ -118,7 +118,7 @@ MessageService::PolicyPermission Message +--- chrome/browser/extensions/api/messaging/message_service.cc.orig 2016-07-22 00:06:51.000000000 -0400 ++++ chrome/browser/extensions/api/messaging/message_service.cc 2016-08-03 11:20:56.579570000 -0400 +@@ -119,7 +119,7 @@ const char kReceivingEndDoesntExistError[] = "Could not establish connection. Receiving end does not exist."; @@ -9,12 +9,12 @@ const char kMissingPermissionError[] = "Access to native messaging requires nativeMessaging permission."; const char kProhibitedByPoliciesError[] = -@@ -415,7 +415,7 @@ void MessageService::OpenChannelToNative +@@ -415,7 +415,7 @@ if (!source) return; -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - Profile* profile = - Profile::FromBrowserContext(source->GetProcess()->GetBrowserContext()); - ExtensionService* extension_service = + content::WebContents* web_contents = + content::WebContents::FromRenderFrameHost(source); + ExtensionWebContentsObserver* extension_web_contents_observer = diff --git a/www/chromium/files/patch-chrome_browser_platform__util.h b/www/chromium/files/patch-chrome_browser_platform__util.h new file mode 100644 index 000000000000..a06c47d1bb0a --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_platform__util.h @@ -0,0 +1,11 @@ +--- chrome/browser/platform_util.h.orig 2016-08-04 11:19:03.775212000 -0400 ++++ chrome/browser/platform_util.h 2016-08-04 11:19:15.839097000 -0400 +@@ -40,7 +40,7 @@ + enum OpenItemType { + OPEN_FILE, + OPEN_FOLDER, +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + SHOW_ITEM_IN_FOLDER + #endif + }; diff --git a/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py b/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py new file mode 100644 index 000000000000..1bb1444dee15 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py @@ -0,0 +1,19 @@ +--- chrome/browser/resources/safe_browsing/gen_file_type_proto.py.orig 2016-08-04 11:13:17.290964000 -0400 ++++ chrome/browser/resources/safe_browsing/gen_file_type_proto.py 2016-08-04 11:13:54.901432000 -0400 +@@ -39,6 +39,7 @@ + "android": config_pb2.DownloadFileType.PLATFORM_ANDROID, + "chromeos": config_pb2.DownloadFileType.PLATFORM_CHROME_OS, + "linux": config_pb2.DownloadFileType.PLATFORM_LINUX, ++ "freebsd": config_pb2.DownloadFileType.PLATFORM_LINUX, + "mac": config_pb2.DownloadFileType.PLATFORM_MAC, + "win": config_pb2.DownloadFileType.PLATFORM_WINDOWS, + } +@@ -157,7 +158,7 @@ + 'fix for http://crbug.com/605592') + parser.add_option('-t', '--type', + help='The platform type. One of android, chromeos, ' + +- 'linux, mac, win') ++ 'linux, freebsd, mac, win') + parser.add_option('-i', '--infile', + help='The ASCII DownloadFileType-proto file to read.') + parser.add_option('-o', '--outfile', diff --git a/www/chromium/files/patch-chrome_chrome__resources.gyp b/www/chromium/files/patch-chrome_chrome__resources.gyp new file mode 100644 index 000000000000..c47c033d99f0 --- /dev/null +++ b/www/chromium/files/patch-chrome_chrome__resources.gyp @@ -0,0 +1,11 @@ +--- chrome/chrome_resources.gyp.orig 2016-08-04 11:15:29.707642000 -0400 ++++ chrome/chrome_resources.gyp 2016-08-04 11:17:02.866434000 -0400 +@@ -321,6 +321,8 @@ + 'platform': 'chromeos' + }, 'OS=="linux"', { + 'platform': 'linux' ++ }, 'OS=="freebsd"', { ++ 'platform': 'freebsd' + }, 'OS=="mac"', { + 'platform': 'mac' + }, 'OS=="win"', { diff --git a/www/chromium/files/patch-components_dom__distiller_core_page__features.cc b/www/chromium/files/patch-components_dom__distiller_core_page__features.cc index 12de0adb0c26..0bff4b553c5e 100644 --- a/www/chromium/files/patch-components_dom__distiller_core_page__features.cc +++ b/www/chromium/files/patch-components_dom__distiller_core_page__features.cc @@ -1,15 +1,15 @@ ---- components/dom_distiller/core/page_features.cc.orig 2016-05-25 15:00:59.000000000 -0400 -+++ components/dom_distiller/core/page_features.cc 2016-05-27 10:13:11.588307000 -0400 +--- components/dom_distiller/core/page_features.cc.orig 2016-07-22 00:06:53.000000000 -0400 ++++ components/dom_distiller/core/page_features.cc 2016-08-03 11:25:37.908892000 -0400 @@ -10,7 +10,11 @@ + #include <string> #include "base/json/json_reader.h" - #include "base/memory/scoped_ptr.h" -#include "third_party/re2/src/re2/re2.h" -+#if defined(OS_BSD) ++#if defined(OS_FREEBSD) +# include <re2/re2.h> +#else +# include "third_party/re2/src/re2/re2.h" -+#endif // defined(OS_BSD) ++#endif // defined(OS_FREEBSD) #include "url/gurl.h" namespace dom_distiller { diff --git a/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h b/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h index d61d3b9d15c6..cd4b7fe73716 100644 --- a/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h +++ b/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h @@ -1,6 +1,6 @@ ---- components/storage_monitor/storage_monitor_freebsd.h.orig 2016-05-20 17:18:26 UTC -+++ components/storage_monitor/storage_monitor_freebsd.h -@@ -0,0 +1,46 @@ +--- components/storage_monitor/storage_monitor_freebsd.h.orig 2016-08-04 10:46:30.556442000 -0400 ++++ components/storage_monitor/storage_monitor_freebsd.h 2016-08-04 14:57:59.255434000 -0400 +@@ -0,0 +1,45 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -20,7 +20,6 @@ +#include "base/compiler_specific.h" +#include "base/files/file_path.h" +#include "base/files/file_path_watcher.h" -+#include "base/memory/scoped_ptr.h" +#include "base/memory/weak_ptr.h" +#include "components/storage_monitor/storage_monitor.h" +#include "content/public/browser/browser_thread.h" diff --git a/www/chromium/files/patch-content_browser_geolocation_wifi__data__provider__freebsd.cc b/www/chromium/files/patch-content_browser_geolocation_wifi__data__provider__freebsd.cc index 4b019d35566b..c1995a7c64be 100644 --- a/www/chromium/files/patch-content_browser_geolocation_wifi__data__provider__freebsd.cc +++ b/www/chromium/files/patch-content_browser_geolocation_wifi__data__provider__freebsd.cc @@ -1,5 +1,5 @@ ---- content/browser/geolocation/wifi_data_provider_freebsd.cc.orig 2016-05-20 17:18:26 UTC -+++ content/browser/geolocation/wifi_data_provider_freebsd.cc +--- content/browser/geolocation/wifi_data_provider_freebsd.cc.orig 2016-08-04 10:46:30.800769000 -0400 ++++ content/browser/geolocation/wifi_data_provider_freebsd.cc 2016-08-04 21:41:58.417450000 -0400 @@ -0,0 +1,201 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be @@ -187,7 +187,7 @@ + +WifiDataProviderCommon::WlanApiInterface* WifiDataProviderFreeBSD::NewWlanApi() { + -+ scoped_ptr<AccessPointDataFreeBSD> wlan_api(new AccessPointDataFreeBSD); ++ std::unique_ptr<AccessPointDataFreeBSD> wlan_api(new AccessPointDataFreeBSD); + if (wlan_api->Init()) + return wlan_api.release(); + diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc b/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc index 56a5da9a93e3..c48819c1be8f 100644 --- a/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc +++ b/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_internals_ui.cc.orig 2016-05-11 19:02:20 UTC -+++ content/browser/gpu/gpu_internals_ui.cc -@@ -37,7 +37,7 @@ +--- content/browser/gpu/gpu_internals_ui.cc.orig 2016-07-22 00:06:54.000000000 -0400 ++++ content/browser/gpu/gpu_internals_ui.cc 2016-08-03 12:29:59.399353000 -0400 +@@ -39,7 +39,7 @@ #include "third_party/angle/src/common/version.h" #include "ui/gl/gpu_switching_manager.h" @@ -9,16 +9,16 @@ #include <X11/Xlib.h> #endif #if defined(OS_WIN) -@@ -45,7 +45,7 @@ +@@ -47,7 +47,7 @@ #include "ui/gfx/win/physical_size.h" #endif -#if defined(OS_LINUX) && defined(USE_X11) +#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(USE_X11) - #include "ui/base/x/x11_util.h" - #include "ui/gfx/x/x11_atom_cache.h" + #include "ui/base/x/x11_util.h" // nogncheck + #include "ui/gfx/x/x11_atom_cache.h" // nogncheck #endif -@@ -198,7 +198,7 @@ base::DictionaryValue* GpuInfoAsDictiona +@@ -200,7 +200,7 @@ gpu_info.gl_ws_version)); basic_info->Append(NewDescriptionValuePair("Window system binding extensions", gpu_info.gl_ws_extensions)); diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc index a66100291da3..242f4c8cbcad 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc @@ -1,7 +1,7 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2016-05-11 19:02:20 UTC -+++ content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -107,7 +107,7 @@ - #include "ui/gfx/win/dpi.h" +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2016-07-22 00:06:54.000000000 -0400 ++++ content/browser/renderer_host/render_widget_host_view_aura.cc 2016-08-03 12:34:00.357612000 -0400 +@@ -105,7 +105,7 @@ + #include "ui/gfx/gdi_util.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) @@ -9,16 +9,7 @@ #include "content/common/input_messages.h" #include "ui/events/linux/text_edit_command_auralinux.h" #include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h" -@@ -734,7 +734,7 @@ gfx::NativeViewId RenderWidgetHostViewAu - if (host) - return reinterpret_cast<gfx::NativeViewId>(host->GetAcceleratedWidget()); - #endif -- return static_cast<gfx::NativeViewId>(NULL); -+ return static_cast<gfx::NativeViewId>(0); - } - - gfx::NativeViewAccessible RenderWidgetHostViewAura::GetNativeViewAccessible() { -@@ -2626,7 +2626,7 @@ bool RenderWidgetHostViewAura::NeedsInpu +@@ -2376,7 +2376,7 @@ } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -27,7 +18,7 @@ return NeedsInputGrab(); #endif return false; -@@ -2859,7 +2859,7 @@ void RenderWidgetHostViewAura::ForwardKe +@@ -2608,7 +2608,7 @@ if (!target_host) return; diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc index daff262b902d..7e9e8c9ec584 100644 --- a/www/chromium/files/patch-content_gpu_gpu__main.cc +++ b/www/chromium/files/patch-content_gpu_gpu__main.cc @@ -1,6 +1,6 @@ ---- content/gpu/gpu_main.cc.orig 2016-05-11 19:02:21 UTC -+++ content/gpu/gpu_main.cc -@@ -99,7 +99,7 @@ void GetGpuInfoFromCommandLine(gpu::GPUI +--- content/gpu/gpu_main.cc.orig 2016-07-22 00:06:54.000000000 -0400 ++++ content/gpu/gpu_main.cc 2016-08-03 12:37:05.590978000 -0400 +@@ -102,7 +102,7 @@ const base::CommandLine& command_line); bool WarmUpSandbox(const base::CommandLine& command_line); @@ -9,7 +9,7 @@ bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info); #endif -@@ -187,13 +187,13 @@ int GpuMain(const MainFunctionParams& pa +@@ -192,13 +192,13 @@ // Use a UI message loop because ANGLE and the desktop GL platform can // create child windows to render to. base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI); @@ -18,14 +18,14 @@ // We need a UI loop so that we can grab the Expose events. See GLSurfaceGLX // and https://crbug.com/326995. base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI); - scoped_ptr<ui::PlatformEventSource> event_source = + std::unique_ptr<ui::PlatformEventSource> event_source = ui::PlatformEventSource::CreateDefault(); -#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) ++#elif (defined(OS_LINUX) || defined(OS_BSD)) base::MessageLoop main_message_loop(base::MessageLoop::TYPE_DEFAULT); #elif defined(OS_MACOSX) // This is necessary for CoreAnimation layers hosted in the GPU process to be -@@ -304,7 +304,7 @@ int GpuMain(const MainFunctionParams& pa +@@ -309,7 +309,7 @@ // and we already registered them through SetGpuInfo() above. base::TimeTicks before_collect_context_graphics_info = base::TimeTicks::Now(); @@ -34,7 +34,7 @@ if (!CollectGraphicsInfo(gpu_info)) dead_on_arrival = true; -@@ -467,7 +467,7 @@ bool WarmUpSandbox(const base::CommandLi +@@ -491,7 +491,7 @@ return true; } diff --git a/www/chromium/files/patch-content_renderer_media_webrtc__audio__capturer.cc b/www/chromium/files/patch-content_renderer_media_webrtc__audio__capturer.cc deleted file mode 100644 index d7f49d4029e0..000000000000 --- a/www/chromium/files/patch-content_renderer_media_webrtc__audio__capturer.cc +++ /dev/null @@ -1,13 +0,0 @@ ---- content/renderer/media/webrtc_audio_capturer.cc.orig 2016-05-11 19:02:21 UTC -+++ content/renderer/media/webrtc_audio_capturer.cc -@@ -476,8 +476,8 @@ void WebRtcAudioCapturer::Capture(const - // CaptureCallback. - #if defined(OS_WIN) || defined(OS_MACOSX) - DCHECK_LE(volume, 1.0); --#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_OPENBSD) -- // We have a special situation on Linux where the microphone volume can be -+#elif defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) -+ // We have a special situation on POSIX where the microphone volume can be - // "higher than maximum". The input volume slider in the sound preference - // allows the user to set a scaling that is higher than 100%. It means that - // even if the reported maximum levels is N, the actual microphone level can diff --git a/www/chromium/files/patch-content_renderer_media_webrtc__audio__renderer.cc b/www/chromium/files/patch-content_renderer_media_webrtc__audio__renderer.cc new file mode 100644 index 000000000000..d5c000fba7bc --- /dev/null +++ b/www/chromium/files/patch-content_renderer_media_webrtc__audio__renderer.cc @@ -0,0 +1,11 @@ +--- content/renderer/media/webrtc_audio_renderer.cc.orig 2016-06-08 12:04:14.328279000 -0400 ++++ content/renderer/media/webrtc_audio_renderer.cc 2016-06-08 12:04:28.210758000 -0400 +@@ -162,7 +162,7 @@ + // Windows below. + int frames_per_buffer = hardware_buffer_size; + +-#if defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) + // On Linux and MacOS, the low level IO implementations on the browser side + // supports all buffer size the clients want. We use the native peer + // connection buffer size (10ms) to achieve best possible performance. diff --git a/www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc b/www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc new file mode 100644 index 000000000000..46c453cfd5f8 --- /dev/null +++ b/www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc @@ -0,0 +1,11 @@ +--- ./content/renderer/media/webrtc/processed_local_audio_source.cc.orig 2016-08-03 12:48:04.721257000 -0400 ++++ ./content/renderer/media/webrtc/processed_local_audio_source.cc 2016-08-03 12:48:34.201210000 -0400 +@@ -269,7 +269,7 @@ + bool key_pressed) { + #if defined(OS_WIN) || defined(OS_MACOSX) + DCHECK_LE(volume, 1.0); +-#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_OPENBSD) ++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // We have a special situation on Linux where the microphone volume can be + // "higher than maximum". The input volume slider in the sound preference + // allows the user to set a scaling that is higher than 100%. It means that diff --git a/www/chromium/files/patch-content_renderer_render__thread__impl.cc b/www/chromium/files/patch-content_renderer_render__thread__impl.cc index f45119472e31..09cfb360e816 100644 --- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc +++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc @@ -1,11 +1,11 @@ ---- content/renderer/render_thread_impl.cc.orig 2016-05-25 15:01:02.000000000 -0400 -+++ content/renderer/render_thread_impl.cc 2016-05-27 11:01:14.634236000 -0400 -@@ -1468,7 +1468,7 @@ - const bool enable_video_accelerator = - !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode); - const bool enable_gpu_memory_buffer_video_frames = +--- content/renderer/render_thread_impl.cc.orig 2016-07-22 00:06:54.000000000 -0400 ++++ content/renderer/render_thread_impl.cc 2016-08-03 14:17:16.736255000 -0400 +@@ -1424,7 +1424,7 @@ + const bool enable_video_accelerator = + !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode); + const bool enable_gpu_memory_buffer_video_frames = -#if defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames) && - !cmd_line->HasSwitch(switches::kDisableGpuCompositing) && - !gpu_channel_host->gpu_info().software_rendering; + !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames) && + !cmd_line->HasSwitch(switches::kDisableGpuCompositing) && + !gpu_channel_host->gpu_info().software_rendering; diff --git a/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc b/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc index 22d7a5811247..1f930f0de54b 100644 --- a/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc +++ b/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc @@ -1,5 +1,5 @@ ---- content/shell/browser/shell_browser_context.cc.orig 2016-05-11 19:02:22 UTC -+++ content/shell/browser/shell_browser_context.cc +--- content/shell/browser/shell_browser_context.cc.orig 2016-07-22 00:06:54.000000000 -0400 ++++ content/shell/browser/shell_browser_context.cc 2016-08-03 15:17:20.501518000 -0400 @@ -24,7 +24,7 @@ #if defined(OS_WIN) @@ -9,12 +9,12 @@ #include "base/nix/xdg_util.h" #elif defined(OS_MACOSX) #include "base/base_paths_mac.h" -@@ -79,7 +79,7 @@ void ShellBrowserContext::InitWhileIOAll +@@ -80,7 +80,7 @@ #if defined(OS_WIN) CHECK(PathService::Get(base::DIR_LOCAL_APP_DATA, &path_)); path_ = path_.Append(std::wstring(L"content_shell")); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) - scoped_ptr<base::Environment> env(base::Environment::Create()); + std::unique_ptr<base::Environment> env(base::Environment::Create()); base::FilePath config_dir( base::nix::GetXDGDirectory(env.get(), diff --git a/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc b/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc index 8d02a3abb95d..ba7d75caef7c 100644 --- a/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc +++ b/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc @@ -1,11 +1,11 @@ ---- extensions/browser/api/serial/serial_api.cc.orig 2016-05-25 15:01:02.000000000 -0400 -+++ extensions/browser/api/serial/serial_api.cc 2016-05-27 11:12:01.060235000 -0400 +--- extensions/browser/api/serial/serial_api.cc.orig 2016-07-22 00:06:55.000000000 -0400 ++++ extensions/browser/api/serial/serial_api.cc 2016-08-03 15:23:41.022195000 -0400 @@ -86,11 +86,13 @@ void SerialGetDevicesFunction::Work() { DCHECK_CURRENTLY_ON(BrowserThread::FILE); +#if !defined(OS_BSD) - scoped_ptr<device::SerialDeviceEnumerator> enumerator = + std::unique_ptr<device::SerialDeviceEnumerator> enumerator = device::SerialDeviceEnumerator::Create(); mojo::Array<device::serial::DeviceInfoPtr> devices = enumerator->GetDevices(); results_ = serial::GetDevices::Results::Create( diff --git a/www/chromium/files/patch-media_audio_audio__manager.cc b/www/chromium/files/patch-media_audio_audio__manager.cc index 1d839e627075..b4a2f727dd80 100644 --- a/www/chromium/files/patch-media_audio_audio__manager.cc +++ b/www/chromium/files/patch-media_audio_audio__manager.cc @@ -1,16 +1,16 @@ ---- media/audio/audio_manager.cc.orig 2016-05-11 19:02:23 UTC -+++ media/audio/audio_manager.cc -@@ -193,7 +193,7 @@ class AudioManagerHelper : public base:: +--- media/audio/audio_manager.cc.orig 2016-07-22 00:06:55.000000000 -0400 ++++ media/audio/audio_manager.cc 2016-08-03 15:25:47.683860000 -0400 +@@ -92,7 +92,7 @@ } #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_FREEBSD) - void set_app_name(const std::string& app_name) { - app_name_ = app_name; - } -@@ -243,7 +243,7 @@ class AudioManagerHelper : public base:: - scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_for_testing_; + void set_app_name(const std::string& app_name) { app_name_ = app_name; } + const std::string& app_name() const { return app_name_; } + #endif +@@ -250,7 +250,7 @@ + std::unique_ptr<base::win::ScopedCOMInitializer> com_initializer_for_testing_; #endif -#if defined(OS_LINUX) @@ -18,7 +18,7 @@ std::string app_name_; #endif -@@ -321,7 +321,7 @@ void AudioManager::EnableCrashKeyLogging +@@ -359,7 +359,7 @@ g_helper.Pointer()->enable_crash_key_logging(); } diff --git a/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc b/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc index 4a662aeb8da0..16eb11d6224d 100644 --- a/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc +++ b/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc @@ -1,6 +1,6 @@ ---- media/capture/video/linux/video_capture_device_linux.cc.orig 2016-05-11 19:02:23 UTC -+++ media/capture/video/linux/video_capture_device_linux.cc -@@ -44,6 +44,7 @@ static bool ReadIdFile(const std::string +--- media/capture/video/linux/video_capture_device_linux.cc.orig 2016-07-22 00:06:55.000000000 -0400 ++++ media/capture/video/linux/video_capture_device_linux.cc 2016-08-04 15:59:29.808311000 -0400 +@@ -44,6 +44,7 @@ return true; } @@ -8,7 +8,7 @@ // Translates Video4Linux pixel formats to Chromium pixel formats. // static VideoPixelFormat VideoCaptureDeviceLinux::V4l2FourCcToChromiumPixelFormat( -@@ -57,6 +58,7 @@ std::list<uint32_t> VideoCaptureDeviceLi +@@ -57,6 +58,7 @@ bool favour_mjpeg) { return V4L2CaptureDelegate::GetListOfUsableFourCcs(favour_mjpeg); } @@ -16,29 +16,29 @@ const std::string VideoCaptureDevice::Name::GetModel() const { // |unique_id| is of the form "/dev/video2". |file_name| is "video2". -@@ -90,6 +92,7 @@ VideoCaptureDeviceLinux::~VideoCaptureDe +@@ -90,6 +92,7 @@ v4l2_thread_.Stop(); } +#if !defined(OS_FREEBSD) void VideoCaptureDeviceLinux::AllocateAndStart( const VideoCaptureParams& params, - scoped_ptr<VideoCaptureDevice::Client> client) { -@@ -113,7 +116,13 @@ void VideoCaptureDeviceLinux::AllocateAn + std::unique_ptr<VideoCaptureDevice::Client> client) { +@@ -113,7 +116,13 @@ params.requested_format.frame_size.height(), params.requested_format.frame_rate, base::Passed(&client))); } +#else // !defined(OS_FREEBSD) +void VideoCaptureDeviceLinux::AllocateAndStart( + const VideoCaptureParams& params, -+ scoped_ptr<VideoCaptureDevice::Client> client) {} ++ std::unique_ptr<VideoCaptureDevice::Client> client) {} +#endif // !defined(OS_FREEBSD) +#if !defined(OS_FREEBSD) void VideoCaptureDeviceLinux::StopAndDeAllocate() { if (!v4l2_thread_.IsRunning()) return; // Wrong state. -@@ -124,7 +133,11 @@ void VideoCaptureDeviceLinux::StopAndDeA +@@ -124,7 +133,11 @@ capture_impl_ = NULL; } @@ -50,7 +50,7 @@ void VideoCaptureDeviceLinux::SetRotation(int rotation) { if (v4l2_thread_.IsRunning()) { v4l2_thread_.message_loop()->PostTask( -@@ -132,6 +145,9 @@ void VideoCaptureDeviceLinux::SetRotatio +@@ -132,6 +145,9 @@ base::Bind(&V4L2CaptureDelegate::SetRotation, capture_impl_, rotation)); } } diff --git a/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc index 96b3f3d1a77a..89d551be3bee 100644 --- a/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc +++ b/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc @@ -1,18 +1,18 @@ ---- media/capture/video/video_capture_device_factory.cc.orig 2016-05-11 19:02:23 UTC -+++ media/capture/video/video_capture_device_factory.cc -@@ -17,6 +17,10 @@ namespace media { - // static - scoped_ptr<VideoCaptureDeviceFactory> VideoCaptureDeviceFactory::CreateFactory( +--- media/capture/video/video_capture_device_factory.cc.orig 2016-07-22 00:06:55.000000000 -0400 ++++ media/capture/video/video_capture_device_factory.cc 2016-08-04 16:01:12.907434000 -0400 +@@ -18,6 +18,10 @@ + std::unique_ptr<VideoCaptureDeviceFactory> + VideoCaptureDeviceFactory::CreateFactory( scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { +#if defined(OS_BSD) -+ return scoped_ptr<VideoCaptureDeviceFactory>(new ++ return std::unique_ptr<VideoCaptureDeviceFactory>(new + media::FakeVideoCaptureDeviceFactory()); +#else const base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); // Use a Fake or File Video Device Factory if the command line flags are -@@ -35,6 +39,7 @@ scoped_ptr<VideoCaptureDeviceFactory> Vi - return scoped_ptr<VideoCaptureDeviceFactory>( +@@ -36,6 +40,7 @@ + return std::unique_ptr<VideoCaptureDeviceFactory>( CreateVideoCaptureDeviceFactory(ui_task_runner)); } +#endif diff --git a/www/chromium/files/patch-net_base_address__tracker__linux.h b/www/chromium/files/patch-net_base_address__tracker__linux.h index 3ef11c4e032d..f7549a49be2a 100644 --- a/www/chromium/files/patch-net_base_address__tracker__linux.h +++ b/www/chromium/files/patch-net_base_address__tracker__linux.h @@ -1,10 +1,10 @@ ---- net/base/address_tracker_linux.h.orig 2016-05-25 15:01:03.000000000 -0400 -+++ net/base/address_tracker_linux.h 2016-05-27 11:17:51.228810000 -0400 +--- net/base/address_tracker_linux.h.orig 2016-07-22 00:06:56.000000000 -0400 ++++ net/base/address_tracker_linux.h 2016-08-04 16:22:00.122898000 -0400 @@ -6,10 +6,12 @@ #define NET_BASE_ADDRESS_TRACKER_LINUX_H_ #include <sys/socket.h> // Needed to include netlink. -+#if !defined(OS_FREEBSD) ++#if !defined(__FreeBSD__) // Mask superfluous definition of |struct net|. This is fixed in Linux 2.6.38. #define net net_kernel #include <linux/rtnetlink.h> @@ -17,7 +17,7 @@ class NET_EXPORT_PRIVATE AddressTrackerLinux : public base::MessageLoopForIO::Watcher { public: -+#if !defined(OS_FREEBSD) ++#if !defined(__FreeBSD__) typedef std::map<IPAddress, struct ifaddrmsg> AddressMap; - +#else diff --git a/www/chromium/files/patch-net_proxy_proxy__service.cc b/www/chromium/files/patch-net_proxy_proxy__service.cc index f8a4295602f7..a62b22850592 100644 --- a/www/chromium/files/patch-net_proxy_proxy__service.cc +++ b/www/chromium/files/patch-net_proxy_proxy__service.cc @@ -1,6 +1,6 @@ ---- net/proxy/proxy_service.cc.orig 2016-05-11 19:02:24 UTC -+++ net/proxy/proxy_service.cc -@@ -47,7 +47,7 @@ +--- net/proxy/proxy_service.cc.orig 2016-07-22 00:06:56.000000000 -0400 ++++ net/proxy/proxy_service.cc 2016-08-03 15:29:21.017256000 -0400 +@@ -48,7 +48,7 @@ #elif defined(OS_MACOSX) #include "net/proxy/proxy_config_service_mac.h" #include "net/proxy/proxy_resolver_mac.h" @@ -9,12 +9,12 @@ #include "net/proxy/proxy_config_service_linux.h" #elif defined(OS_ANDROID) #include "net/proxy/proxy_config_service_android.h" -@@ -1503,7 +1503,7 @@ scoped_ptr<ProxyConfigService> ProxyServ +@@ -1542,7 +1542,7 @@ << "profile_io_data.cc::CreateProxyConfigService and this should " << "be used only for examples."; - return make_scoped_ptr(new UnsetProxyConfigService); + return base::WrapUnique(new UnsetProxyConfigService); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_FREEBSD) - scoped_ptr<ProxyConfigServiceLinux> linux_config_service( + std::unique_ptr<ProxyConfigServiceLinux> linux_config_service( new ProxyConfigServiceLinux()); diff --git a/www/chromium/files/patch-mojo_shell_public_cpp_initialize__base__and__icu.cc b/www/chromium/files/patch-services_shell_public_cpp_lib_initialize__base__and__icu.cc index 0ae943eba5bc..e331fafc1152 100644 --- a/www/chromium/files/patch-mojo_shell_public_cpp_initialize__base__and__icu.cc +++ b/www/chromium/files/patch-services_shell_public_cpp_lib_initialize__base__and__icu.cc @@ -1,15 +1,17 @@ ---- mojo/shell/public/cpp/initialize_base_and_icu.cc.orig 2016-05-21 17:21:25 UTC -+++ mojo/shell/public/cpp/initialize_base_and_icu.cc -@@ -33,11 +33,13 @@ InitializeBase(const uint8_t* icu_data) +--- services/shell/public/cpp/lib/initialize_base_and_icu.cc.orig 2016-08-05 14:07:55.178818000 -0400 ++++ services/shell/public/cpp/lib/initialize_base_and_icu.cc 2016-08-05 14:08:22.862094000 -0400 +@@ -35,6 +35,7 @@ base::SysInfo::MaxSharedMemorySize(); #endif -+#if !defined(OS_FREEBSD) ++#if !defined(__FreeBSD__) + #if ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE // Initialize core ICU. We must perform the full initialization before we // initialize icu::TimeZone subsystem because otherwise ICU gets in a state - // where the timezone data is disconnected from the locale data which can +@@ -42,6 +43,7 @@ // cause crashes. CHECK(base::i18n::InitializeICUFromRawMemory(icu_data)); + #endif // ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE +#endif #if !defined(OS_ANDROID) diff --git a/www/chromium/files/patch-mojo_shell_runner_init.cc b/www/chromium/files/patch-services_shell_runner_init.cc index ee3f62f2c8d9..41879efdde77 100644 --- a/www/chromium/files/patch-mojo_shell_runner_init.cc +++ b/www/chromium/files/patch-services_shell_runner_init.cc @@ -1,18 +1,17 @@ ---- mojo/shell/runner/init.cc.orig 2016-05-21 17:23:12 UTC -+++ mojo/shell/runner/init.cc -@@ -68,6 +68,8 @@ void WaitForDebuggerIfNecessary() { - +--- services/shell/runner/init.cc.orig 2016-08-05 14:09:25.990401000 -0400 ++++ services/shell/runner/init.cc 2016-08-05 14:09:42.644514000 -0400 +@@ -77,6 +77,7 @@ void CallLibraryEarlyInitialization(base::NativeLibrary app_library) { // Do whatever warming that the mojo application wants. -+ -+#if !defined(OS_FREEBSD) + ++#if !defined(__FreeBSD__) + #if ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE typedef void (*LibraryEarlyInitFunction)(const uint8_t*); LibraryEarlyInitFunction init_function = - reinterpret_cast<LibraryEarlyInitFunction>( -@@ -79,6 +81,7 @@ void CallLibraryEarlyInitialization(base - const uint8_t* icu_data = base::i18n::GetRawIcuMemory(); +@@ -90,6 +91,7 @@ init_function(icu_data); } + #endif // ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE +#endif // TODO(erg): All chromium binaries load base. We might want to make a diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp new file mode 100644 index 000000000000..07f516a6adbe --- /dev/null +++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp @@ -0,0 +1,47 @@ +--- third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig 2016-08-04 11:20:01.382167000 -0400 ++++ third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp 2016-08-04 11:21:00.605035000 -0400 +@@ -93,7 +93,7 @@ + , m_syntheticBold(source.m_syntheticBold) + , m_syntheticItalic(source.m_syntheticItalic) + , m_orientation(source.m_orientation) +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + , m_style(source.m_style) + #endif + , m_harfBuzzFace(nullptr) +@@ -115,7 +115,7 @@ + , m_syntheticBold(src.m_syntheticBold) + , m_syntheticItalic(src.m_syntheticItalic) + , m_orientation(src.m_orientation) +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + , m_style(FontRenderStyle::querySystem(m_family, m_textSize, m_typeface->style())) + #endif + , m_harfBuzzFace(nullptr) +@@ -142,7 +142,7 @@ + , m_syntheticBold(syntheticBold) + , m_syntheticItalic(syntheticItalic) + , m_orientation(orientation) +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + , m_style(FontRenderStyle::querySystem(m_family, m_textSize, m_typeface->style())) + #endif + , m_isHashTableDeletedValue(false) +@@ -188,7 +188,7 @@ + m_syntheticItalic = other.m_syntheticItalic; + m_harfBuzzFace = nullptr; + m_orientation = other.m_orientation; +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + m_style = other.m_style; + #endif + +@@ -216,7 +216,7 @@ + && m_isHashTableDeletedValue == a.m_isHashTableDeletedValue + && m_syntheticBold == a.m_syntheticBold + && m_syntheticItalic == a.m_syntheticItalic +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + && m_style == a.m_style + #endif + && m_orientation == a.m_orientation; diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h new file mode 100644 index 000000000000..de5b1e659765 --- /dev/null +++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h @@ -0,0 +1,32 @@ +--- third_party/WebKit/Source/platform/fonts/FontPlatformData.h.orig 2016-08-04 11:21:45.907982000 -0400 ++++ third_party/WebKit/Source/platform/fonts/FontPlatformData.h 2016-08-04 11:22:32.571069000 -0400 +@@ -46,9 +46,9 @@ + #include "wtf/text/CString.h" + #include "wtf/text/StringImpl.h" + +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + #include "platform/fonts/linux/FontRenderStyle.h" +-#endif // OS(LINUX) || OS(ANDROID) ++#endif // OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + + #if OS(MACOSX) + OBJC_CLASS NSFont; +@@ -126,7 +126,7 @@ + PassRefPtr<OpenTypeVerticalData> verticalData() const; + PassRefPtr<SharedBuffer> openTypeTable(SkFontTableTag) const; + +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + // The returned styles are all actual styles without FontRenderStyle::NoPreference. + const FontRenderStyle& getFontRenderStyle() const { return m_style; } + #endif +@@ -152,7 +152,7 @@ + bool m_syntheticItalic; + FontOrientation m_orientation; + private: +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + FontRenderStyle m_style; + #endif + diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp index 269befb980ce..cb8109f87eae 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp +++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp @@ -1,5 +1,5 @@ ---- third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp.orig 2016-05-25 15:01:11.000000000 -0400 -+++ third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp 2016-05-27 11:26:01.202711000 -0400 +--- third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp.orig 2016-07-22 00:07:09.000000000 -0400 ++++ third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp 2016-08-03 15:39:36.482884000 -0400 @@ -60,7 +60,7 @@ namespace blink { @@ -9,21 +9,12 @@ // Android special locale for retrieving the color emoji font // based on the proposed changes in UTR #51 for introducing // an Emoji script code: -@@ -171,7 +171,7 @@ - return fontDataFromFontPlatformData(fontPlatformData, shouldRetain); - } - --#if OS(WIN) || OS(LINUX) -+#if OS(WIN) || OS(LINUX) || OS(FREEBSD) - static inline SkFontStyle fontStyle(const FontDescription& fontDescription) - { - int width = static_cast<int>(fontDescription.stretch()); -@@ -232,7 +232,7 @@ +@@ -183,7 +183,7 @@ } #endif --#if OS(LINUX) -+#if OS(LINUX) || OS(FREEBSD) +-#if OS(LINUX) || OS(WIN) ++#if OS(LINUX) || OS(WIN) || OS(FREEBSD) // On linux if the fontManager has been overridden then we should be calling the embedder // provided font Manager rather than calling SkTypeface::CreateFromName which may redirect the // call to the default font Manager. diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_text_Character.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_text_Character.cpp deleted file mode 100644 index 7133ab438c4a..000000000000 --- a/www/chromium/files/patch-third__party_WebKit_Source_platform_text_Character.cpp +++ /dev/null @@ -1,22 +0,0 @@ ---- third_party/WebKit/Source/platform/text/Character.cpp.orig 2016-05-27 12:28:21.057082000 -0400 -+++ third_party/WebKit/Source/platform/text/Character.cpp 2016-05-27 18:52:20.104602000 -0400 -@@ -36,8 +36,8 @@ - #include <unicode/uobject.h> - #include <unicode/uscript.h> - --#if defined(USING_SYSTEM_ICU) --#include "platform/fonts/CharacterPropertyDataGenerator.h" -+#if defined(__FreeBSD__) -+#include "platform/text/CharacterPropertyDataGenerator.h" - #include <unicode/uniset.h> - #else - #define MUTEX_H // Prevent compile failure of utrie2.h on Windows -@@ -49,7 +49,7 @@ - - namespace blink { - --#if defined(USING_SYSTEM_ICU) -+#if defined(__FreeBSD__) - static icu::UnicodeSet* createUnicodeSet( - const UChar32* characters, size_t charactersCount, - const UChar32* ranges, size_t rangesCount) diff --git a/www/chromium/files/patch-third__party_flac_flac.gyp b/www/chromium/files/patch-third__party_flac_flac.gyp deleted file mode 100644 index 735b7cdd1768..000000000000 --- a/www/chromium/files/patch-third__party_flac_flac.gyp +++ /dev/null @@ -1,116 +0,0 @@ ---- third_party/flac/flac.gyp.orig 2016-05-20 17:19:03 UTC -+++ third_party/flac/flac.gyp -@@ -1,4 +1,4 @@ --# Copyright (c) 2011 The Chromium Authors. All rights reserved. -+# Copyright 2013 The Chromium Authors. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - -@@ -6,85 +6,32 @@ - 'targets': [ - { - 'target_name': 'libflac', -- 'product_name': 'flac', -- 'type': 'static_library', -- 'sources': [ -- 'include/FLAC/all.h', -- 'include/FLAC/assert.h', -- 'include/FLAC/callback.h', -- 'include/FLAC/export.h', -- 'include/FLAC/format.h', -- 'include/FLAC/metadata.h', -- 'include/FLAC/ordinals.h', -- 'include/FLAC/stream_decoder.h', -- 'include/FLAC/stream_encoder.h', -- 'include/share/alloc.h', -- 'src/libFLAC/alloc.c', -- 'src/libFLAC/bitmath.c', -- 'src/libFLAC/bitreader.c', -- 'src/libFLAC/bitwriter.c', -- 'src/libFLAC/cpu.c', -- 'src/libFLAC/crc.c', -- 'src/libFLAC/fixed.c', -- 'src/libFLAC/float.c', -- 'src/libFLAC/format.c', -- 'src/libFLAC/lpc.c', -- 'src/libFLAC/md5.c', -- 'src/libFLAC/memory.c', -- 'src/libFLAC/stream_decoder.c', -- 'src/libFLAC/stream_encoder.c', -- 'src/libFLAC/stream_encoder_framing.c', -- 'src/libFLAC/window.c', -- 'src/libFLAC/include/private/all.h', -- 'src/libFLAC/include/private/bitmath.h', -- 'src/libFLAC/include/private/bitreader.h', -- 'src/libFLAC/include/private/bitwriter.h', -- 'src/libFLAC/include/private/cpu.h', -- 'src/libFLAC/include/private/crc.h', -- 'src/libFLAC/include/private/fixed.h', -- 'src/libFLAC/include/private/float.h', -- 'src/libFLAC/include/private/format.h', -- 'src/libFLAC/include/private/lpc.h', -- 'src/libFLAC/include/private/md5.h', -- 'src/libFLAC/include/private/memory.h', -- 'src/libFLAC/include/private/metadata.h', -- 'src/libFLAC/include/private/stream_encoder_framing.h', -- 'src/libFLAC/include/private/window.h', -- 'src/libFLAC/include/protected/all.h', -- 'src/libFLAC/include/protected/stream_decoder.h', -- 'src/libFLAC/include/protected/stream_encoder.h', -- ], -- 'defines': [ -- 'FLAC__NO_DLL', -- 'FLAC__OVERFLOW_DETECT', -- 'VERSION="1.2.1"', -- ], -- 'include_dirs': [ -- 'include', -- 'src/libFLAC/include', -- ], -- 'direct_dependent_settings': { -- 'defines': [ -- 'FLAC__NO_DLL', -+ 'type': 'none', -+ 'variables': { -+ 'headers_root_path': 'include', -+ 'header_filenames': [ -+ 'FLAC/callback.h', -+ 'FLAC/metadata.h', -+ 'FLAC/assert.h', -+ 'FLAC/export.h', -+ 'FLAC/format.h', -+ 'FLAC/stream_decoder.h', -+ 'FLAC/stream_encoder.h', -+ 'FLAC/ordinals.h', -+ 'FLAC/all.h', - ], - }, -- 'variables': { -- 'clang_warning_flags': [ -- # libflac converts between FLAC__StreamDecoderState and -- # FLAC__StreamDecoderInitStatus a lot in stream_decoder.c. -- '-Wno-conversion', -- # libflac contains constants that are only used in certain -- # compile-time cases, which triggers unused-const-variable warnings in -- # other cases. -- '-Wno-unused-const-variable', -+ 'includes': [ -+ '../../build/shim_headers.gypi', -+ ], -+ 'link_settings': { -+ 'ldflags': [ -+ '<!@(pkg-config --libs-only-L --libs-only-other flac)', -+ ], -+ 'libraries': [ -+ '<!@(pkg-config --libs-only-l flac)', - ], - }, - }, - ], - } -- --# Local Variables: --# tab-width:2 --# indent-tabs-mode:nil --# End: --# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/www/chromium/files/patch-third__party_libwebp_libwebp.gyp b/www/chromium/files/patch-third__party_libwebp_libwebp.gyp deleted file mode 100644 index 3a2ea0a98632..000000000000 --- a/www/chromium/files/patch-third__party_libwebp_libwebp.gyp +++ /dev/null @@ -1,311 +0,0 @@ ---- third_party/libwebp/libwebp.gyp.orig 2016-05-20 17:19:03 UTC -+++ third_party/libwebp/libwebp.gyp -@@ -1,298 +1,22 @@ --# Copyright (c) 2012 The Chromium Authors. All rights reserved. -+# Copyright 2013 The Chromium Authors. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - - { -- 'target_defaults': { -- 'conditions': [ -- ['os_posix==1 and (target_arch=="arm" or target_arch=="arm64")', { -- 'cflags!': [ '-Os' ], -- 'cflags': [ '-O2' ], -- }], -- ], -- }, - 'targets': [ - { -- 'target_name': 'libwebp_dec', -- 'type': 'static_library', -- 'dependencies' : [ -- 'libwebp_dsp', -- 'libwebp_dsp_neon', -- 'libwebp_utils', -- ], -- 'include_dirs': ['.'], -- 'sources': [ -- 'dec/alpha.c', -- 'dec/buffer.c', -- 'dec/frame.c', -- 'dec/idec.c', -- 'dec/io.c', -- 'dec/quant.c', -- 'dec/tree.c', -- 'dec/vp8.c', -- 'dec/vp8l.c', -- 'dec/webp.c', -- ], -- }, -- { -- 'target_name': 'libwebp_demux', -- 'type': 'static_library', -- 'include_dirs': ['.'], -- 'sources': [ -- 'demux/demux.c', -- ], -- 'dependencies' : [ -- 'libwebp_utils', -- ], -- }, -- { -- 'target_name': 'libwebp_dsp', -- 'type': 'static_library', -- 'include_dirs': ['.'], -- 'sources': [ -- 'dsp/alpha_processing.c', -- 'dsp/alpha_processing_mips_dsp_r2.c', -- 'dsp/argb.c', -- 'dsp/argb_mips_dsp_r2.c', -- 'dsp/cost.c', -- 'dsp/cost_mips32.c', -- 'dsp/cost_mips_dsp_r2.c', -- 'dsp/cpu.c', -- 'dsp/dec.c', -- 'dsp/dec_clip_tables.c', -- 'dsp/dec_mips32.c', -- 'dsp/dec_mips_dsp_r2.c', -- 'dsp/enc.c', -- 'dsp/enc_avx2.c', -- 'dsp/enc_mips32.c', -- 'dsp/enc_mips_dsp_r2.c', -- 'dsp/filters.c', -- 'dsp/filters_mips_dsp_r2.c', -- 'dsp/lossless.c', -- 'dsp/lossless_enc.c', -- 'dsp/lossless_enc_mips32.c', -- 'dsp/lossless_enc_mips_dsp_r2.c', -- 'dsp/lossless_mips_dsp_r2.c', -- 'dsp/rescaler.c', -- 'dsp/rescaler_mips32.c', -- 'dsp/rescaler_mips_dsp_r2.c', -- 'dsp/upsampling.c', -- 'dsp/upsampling_mips_dsp_r2.c', -- 'dsp/yuv.c', -- 'dsp/yuv_mips32.c', -- 'dsp/yuv_mips_dsp_r2.c', -- ], -- 'dependencies' : [ -- 'libwebp_dsp_sse2', -- 'libwebp_dsp_sse41', -- 'libwebp_utils', -- ], -- 'conditions': [ -- ['OS == "android"', { -- 'dependencies': [ '../../build/android/ndk.gyp:cpu_features' ], -- }], -- # iOS uses the same project to generate build project for both device -- # and simulator and do not use "target_arch" variable. Other platform -- # set it correctly. -- ['OS!="ios" and (target_arch=="ia32" or target_arch=="x64")', { -- 'defines': [ 'WEBP_HAVE_SSE2', 'WEBP_HAVE_SSE41' ], -- }], -- ['order_profiling != 0', { -- 'target_conditions' : [ -- ['_toolset=="target"', { -- 'cflags!': [ '-finstrument-functions' ], -- }], -- ], -- }], -- ], -- }, -- { -- 'target_name': 'libwebp_dsp_sse2', -- 'type': 'static_library', -- 'include_dirs': ['.'], -- 'sources': [ -- 'dsp/alpha_processing_sse2.c', -- 'dsp/argb_sse2.c', -- 'dsp/cost_sse2.c', -- 'dsp/dec_sse2.c', -- 'dsp/enc_sse2.c', -- 'dsp/filters_sse2.c', -- 'dsp/lossless_enc_sse2.c', -- 'dsp/lossless_sse2.c', -- 'dsp/rescaler_sse2.c', -- 'dsp/upsampling_sse2.c', -- 'dsp/yuv_sse2.c', -- ], -- 'conditions': [ -- # iOS uses the same project to generate build project for both device -- # and simulator and do not use "target_arch" variable. Other platform -- # set it correctly. -- ['OS!="ios" and (target_arch=="ia32" or target_arch=="x64") and msan==0', { -- 'cflags': [ '-msse2', ], -- 'xcode_settings': { 'OTHER_CFLAGS': [ '-msse2' ] }, -- }], -- ['order_profiling != 0', { -- 'target_conditions' : [ -- ['_toolset=="target"', { -- 'cflags!': [ '-finstrument-functions' ], -- }], -- ], -- }], -- ], -- }, -- { -- 'target_name': 'libwebp_dsp_sse41', -- 'type': 'static_library', -- 'include_dirs': ['.'], -- 'sources': [ -- 'dsp/alpha_processing_sse41.c', -- 'dsp/dec_sse41.c', -- 'dsp/enc_sse41.c', -- 'dsp/lossless_enc_sse41.c', -- ], -- 'conditions': [ -- ['OS=="win" and clang==1', { -- # cl.exe's /arch flag doesn't have a setting for SSSE3/4, and cl.exe -- # doesn't need it for intrinsics. clang-cl does need it, though. -- 'msvs_settings': { -- 'VCCLCompilerTool': { 'AdditionalOptions': [ '-msse4.1' ] }, -- }, -- }], -- # iOS uses the same project to generate build project for both device -- # and simulator and do not use "target_arch" variable. Other platform -- # set it correctly. -- ['OS!="ios" and (target_arch=="ia32" or target_arch=="x64") and msan==0', { -- 'cflags': [ '-msse4.1', ], -- 'xcode_settings': { 'OTHER_CFLAGS': [ '-msse4.1' ] }, -- }], -- ['order_profiling != 0', { -- 'target_conditions' : [ -- ['_toolset=="target"', { -- 'cflags!': [ '-finstrument-functions' ], -- }], -- ], -- }], -- ], -- }, -- { -- 'target_name': 'libwebp_dsp_neon', -- 'includes' : [ -- # Disable LTO due to Neon issues. -- # crbug.com/408997 -- '../../build/android/disable_gcc_lto.gypi', -- ], -- 'conditions': [ -- # iOS uses the same project to generate build project for both device -- # and simulator and do not use "target_arch" variable. Other platform -- # set it correctly. -- ['OS == "ios" or (target_arch == "arm" and arm_version >= 7 and (arm_neon == 1 or arm_neon_optional == 1)) or (target_arch == "arm64")', { -- 'type': 'static_library', -- 'include_dirs': ['.'], -- 'sources': [ -- 'dsp/dec_neon.c', -- 'dsp/enc_neon.c', -- 'dsp/lossless_enc_neon.c', -- 'dsp/lossless_neon.c', -- 'dsp/rescaler_neon.c', -- 'dsp/upsampling_neon.c', -- ], -- 'conditions': [ -- ['target_arch == "arm" and arm_version >= 7 and (arm_neon == 1 or arm_neon_optional == 1)', { -- # behavior similar to *.c.neon in an Android.mk -- 'cflags!': [ '-mfpu=vfpv3-d16' ], -- 'cflags': [ '-mfpu=neon' ], -- }], -- ['target_arch == "arm64"', { -- # avoid an ICE with gcc-4.9: b/15574841 -- 'cflags': [ '-frename-registers' ], -- }], -- ] -- }, { -- 'type': 'none', -- }], -- ['order_profiling != 0', { -- 'target_conditions' : [ -- ['_toolset=="target"', { -- 'cflags!': [ '-finstrument-functions' ], -- }], -- ], -- }], -- ], -- }, -- { -- 'target_name': 'libwebp_enc', -- 'type': 'static_library', -- 'include_dirs': ['.'], -- 'sources': [ -- 'enc/alpha.c', -- 'enc/analysis.c', -- 'enc/backward_references.c', -- 'enc/config.c', -- 'enc/cost.c', -- 'enc/delta_palettization.c', -- 'enc/filter.c', -- 'enc/frame.c', -- 'enc/histogram.c', -- 'enc/iterator.c', -- 'enc/near_lossless.c', -- 'enc/picture.c', -- 'enc/picture_csp.c', -- 'enc/picture_psnr.c', -- 'enc/picture_rescale.c', -- 'enc/picture_tools.c', -- 'enc/quant.c', -- 'enc/syntax.c', -- 'enc/token.c', -- 'enc/tree.c', -- 'enc/vp8l.c', -- 'enc/webpenc.c', -- ], -- 'dependencies' : [ -- 'libwebp_utils', -- ], -- }, -- { -- 'target_name': 'libwebp_utils', -- 'type': 'static_library', -- 'include_dirs': ['.'], -- 'sources': [ -- 'utils/bit_reader.c', -- 'utils/bit_writer.c', -- 'utils/color_cache.c', -- 'utils/filters.c', -- 'utils/huffman.c', -- 'utils/huffman_encode.c', -- 'utils/quant_levels.c', -- 'utils/quant_levels_dec.c', -- 'utils/random.c', -- 'utils/rescaler.c', -- 'utils/thread.c', -- 'utils/utils.c', -- ], -- 'variables': { -- 'clang_warning_flags': [ -- # See https://code.google.com/p/webp/issues/detail?id=253. -- '-Wno-incompatible-pointer-types', -- ] -- }, -- }, -- { - 'target_name': 'libwebp', - 'type': 'none', -- 'dependencies' : [ -- 'libwebp_dec', -- 'libwebp_demux', -- 'libwebp_dsp', -- 'libwebp_dsp_neon', -- 'libwebp_enc', -- 'libwebp_utils', -- ], - 'direct_dependent_settings': { -- 'include_dirs': ['.'], -+ 'defines': [ -+ 'ENABLE_WEBP', -+ ], - }, -- 'conditions': [ -- ['OS!="win"', {'product_name': 'webp'}], -- ], -- }, -+ 'link_settings': { -+ 'libraries': [ -+ '-lwebp -lwebpdemux', -+ ], -+ }, -+ } - ], - } diff --git a/www/chromium/files/patch-third__party_pdfium_build_standalone.gypi b/www/chromium/files/patch-third__party_pdfium_build__gyp_standalone.gypi index 0cf17da4a874..57364a627b0f 100644 --- a/www/chromium/files/patch-third__party_pdfium_build_standalone.gypi +++ b/www/chromium/files/patch-third__party_pdfium_build__gyp_standalone.gypi @@ -1,6 +1,6 @@ ---- third_party/pdfium/build/standalone.gypi.orig 2016-05-11 19:03:45 UTC -+++ third_party/pdfium/build/standalone.gypi -@@ -18,7 +18,7 @@ +--- third_party/pdfium/build_gyp/standalone.gypi.orig 2016-08-03 16:25:54.875923000 -0400 ++++ third_party/pdfium/build_gyp/standalone.gypi 2016-08-03 16:28:57.583883000 -0400 +@@ -19,7 +19,7 @@ 'variables': { 'variables': { 'conditions': [ @@ -9,7 +9,7 @@ # This handles the Unix platforms we generally deal with. # Anything else gets passed through, which probably won't work # very well; such hosts should pass an explicit target_arch -@@ -31,7 +31,7 @@ +@@ -32,7 +32,7 @@ s/aarch64/arm64/;\ s/mips.*/mipsel/")', }, { @@ -18,12 +18,21 @@ 'host_arch%': 'ia32', }], ], -@@ -264,7 +264,7 @@ - # means we have to turn off this warning (and be careful about how - # object destruction happens in such cases). - 4611, -- -+} - # TODO(thestig): These warnings are level 4. They will be slowly - # removed as code is fixed. - 4100, # Unreferenced formal parameter +@@ -59,7 +59,7 @@ + }, { + 'os_posix%': 1, + }], +- ['OS=="linux" or OS=="mac"', { ++ ['OS=="linux" or OS=="mac" or OS=="freebsd"', { + 'clang%': 1, + 'host_clang%': 1, + }, { +@@ -141,7 +141,7 @@ + }, + }, + 'conditions': [ +- ['OS=="linux"', { ++ ['OS=="linux" or OS=="freebsd"', { + 'cflags': [ + '-fdata-sections', + '-ffunction-sections', diff --git a/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp b/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp index 091f0be63040..7e02b2f556d8 100644 --- a/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp +++ b/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp @@ -1,8 +1,8 @@ ---- third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp.orig 2016-05-27 13:05:16.571632000 -0400 -+++ third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp 2016-05-27 13:32:36.441412000 -0400 -@@ -61,6 +61,103 @@ - L"May", L"June", L"July", L"August", - L"September", L"October", L"November", L"December"}; +--- third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp.orig 2016-07-22 00:09:02.000000000 -0400 ++++ third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp 2016-08-03 16:33:48.931305000 -0400 +@@ -62,6 +62,103 @@ + L"July", L"August", L"September", + L"October", L"November", L"December"}; +#if defined(__FreeBSD__) +/* @@ -101,6 +101,6 @@ +} +#endif // defined(__FreeBSD__) + - bool CJS_PublicMethods::IsNumber(const FX_WCHAR* str) { - CFX_WideString sTrim = StrTrim(str); - const FX_WCHAR* pTrim = sTrim.c_str(); + CFX_ByteString StrTrim(const CFX_ByteString& pStr) { + CFX_ByteString result(pStr); + result.TrimLeft(' '); diff --git a/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h b/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h new file mode 100644 index 000000000000..96789ec58acd --- /dev/null +++ b/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h @@ -0,0 +1,11 @@ +--- third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig 2016-08-04 11:23:35.218593000 -0400 ++++ third_party/protobuf/src/google/protobuf/stubs/platform_macros.h 2016-08-04 11:24:32.984837000 -0400 +@@ -111,7 +111,7 @@ + + #undef GOOGLE_PROTOBUF_PLATFORM_ERROR + +-#if defined(GOOGLE_PROTOBUF_OS_ANDROID) || defined(GOOGLE_PROTOBUF_OS_APPLE) ++#if defined(GOOGLE_PROTOBUF_OS_ANDROID) || defined(GOOGLE_PROTOBUF_OS_APPLE) || defined(__OpenBSD__) || defined(__FreeBSD__) + // Android ndk does not support the __thread keyword very well yet. Here + // we use pthread_key_create()/pthread_getspecific()/... methods for + // TLS support on android. diff --git a/www/chromium/files/patch-ui_base_ime_input__method__factory.cc b/www/chromium/files/patch-ui_base_ime_input__method__factory.cc index 22447744b9bf..1ce4caeb3050 100644 --- a/www/chromium/files/patch-ui_base_ime_input__method__factory.cc +++ b/www/chromium/files/patch-ui_base_ime_input__method__factory.cc @@ -1,6 +1,6 @@ ---- ui/base/ime/input_method_factory.cc.orig 2016-05-11 19:02:35 UTC -+++ ui/base/ime/input_method_factory.cc -@@ -14,7 +14,7 @@ +--- ui/base/ime/input_method_factory.cc.orig 2016-07-22 00:07:12.000000000 -0400 ++++ ui/base/ime/input_method_factory.cc 2016-08-03 16:35:19.855521000 -0400 +@@ -15,7 +15,7 @@ #elif defined(OS_MACOSX) #include "ui/base/ime/input_method_mac.h" #elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11) && \ @@ -9,12 +9,12 @@ #include "ui/base/ime/input_method_auralinux.h" #elif defined(OS_ANDROID) #include "ui/base/ime/input_method_android.h" -@@ -56,7 +56,7 @@ scoped_ptr<InputMethod> CreateInputMetho +@@ -57,7 +57,7 @@ #elif defined(OS_MACOSX) - return make_scoped_ptr(new InputMethodMac(delegate)); + return base::WrapUnique(new InputMethodMac(delegate)); #elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11) && \ - !defined(OS_CHROMEOS) + !defined(OS_CHROMEOS) || defined(OS_BSD) - return make_scoped_ptr(new InputMethodAuraLinux(delegate)); + return base::WrapUnique(new InputMethodAuraLinux(delegate)); #elif defined(OS_ANDROID) - return make_scoped_ptr(new InputMethodAndroid(delegate)); + return base::WrapUnique(new InputMethodAndroid(delegate)); diff --git a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc index c31981d8fe8f..f55f3b15efa2 100644 --- a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc +++ b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc @@ -1,6 +1,6 @@ ---- ui/base/resource/resource_bundle.cc.orig 2016-05-11 19:02:35 UTC -+++ ui/base/resource/resource_bundle.cc -@@ -612,7 +612,7 @@ void ResourceBundle::ReloadFonts() { +--- ui/base/resource/resource_bundle.cc.orig 2016-07-22 00:07:12.000000000 -0400 ++++ ui/base/resource/resource_bundle.cc 2016-08-03 16:45:43.939993000 -0400 +@@ -626,7 +626,7 @@ } ScaleFactor ResourceBundle::GetMaxScaleFactor() const { @@ -9,12 +9,12 @@ return max_scale_factor_; #else return GetSupportedScaleFactors().back(); -@@ -674,7 +674,7 @@ void ResourceBundle::InitSharedInstance( - #elif defined(OS_MACOSX) - if (base::mac::IsOSLionOrLater()) - supported_scale_factors.push_back(SCALE_FACTOR_200P); --#elif defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) -+#elif defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) +@@ -686,7 +686,7 @@ + supported_scale_factors.push_back(SCALE_FACTOR_100P); + } + #elif defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_LINUX) || \ +- defined(OS_WIN) ++ defined(OS_WIN) || defined(OS_BSD) supported_scale_factors.push_back(SCALE_FACTOR_200P); #endif ui::SetSupportedScaleFactors(supported_scale_factors); diff --git a/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc b/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc index e0971f3db0b5..deb1518d0ed8 100644 --- a/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc +++ b/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc @@ -1,5 +1,5 @@ ---- ui/gl/sync_control_vsync_provider.cc.orig 2016-05-11 19:02:35 UTC -+++ ui/gl/sync_control_vsync_provider.cc +--- ui/gl/sync_control_vsync_provider.cc.orig 2016-07-22 00:07:12.000000000 -0400 ++++ ui/gl/sync_control_vsync_provider.cc 2016-08-04 11:26:39.590057000 -0400 @@ -11,7 +11,7 @@ #include "base/trace_event/trace_event.h" #include "build/build_config.h" @@ -9,7 +9,16 @@ // These constants define a reasonable range for a calculated refresh interval. // Calculating refreshes out of this range will be considered a fatal error. const int64_t kMinVsyncIntervalUs = base::Time::kMicrosecondsPerSecond / 400; -@@ -38,7 +38,7 @@ SyncControlVSyncProvider::~SyncControlVS +@@ -26,7 +26,7 @@ + namespace gfx { + + SyncControlVSyncProvider::SyncControlVSyncProvider() : VSyncProvider() { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // On platforms where we can't get an accurate reading on the refresh + // rate we fall back to the assumption that we're displaying 60 frames + // per second. +@@ -39,7 +39,7 @@ void SyncControlVSyncProvider::GetVSyncParameters( const UpdateVSyncCallback& callback) { TRACE_EVENT0("gpu", "SyncControlVSyncProvider::GetVSyncParameters"); @@ -18,7 +27,7 @@ base::TimeTicks timebase; // The actual clock used for the system time returned by glXGetSyncValuesOML -@@ -154,7 +154,7 @@ void SyncControlVSyncProvider::GetVSyncP +@@ -155,7 +155,7 @@ last_timebase_ = timebase; last_media_stream_counter_ = media_stream_counter; callback.Run(timebase, last_good_interval_); diff --git a/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h b/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h new file mode 100644 index 000000000000..426789abcc76 --- /dev/null +++ b/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h @@ -0,0 +1,11 @@ +--- ui/gl/sync_control_vsync_provider.h.orig 2016-08-04 11:25:35.143308000 -0400 ++++ ui/gl/sync_control_vsync_provider.h 2016-08-04 11:25:53.646783000 -0400 +@@ -31,7 +31,7 @@ + virtual bool GetMscRate(int32_t* numerator, int32_t* denominator) = 0; + + private: +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + base::TimeTicks last_timebase_; + uint64_t last_media_stream_counter_ = 0; + base::TimeDelta last_good_interval_; diff --git a/www/chromium/files/patch-ui_message__center_views_message__center__view.cc b/www/chromium/files/patch-ui_message__center_views_message__center__view.cc deleted file mode 100644 index 04e4e1ad8373..000000000000 --- a/www/chromium/files/patch-ui_message__center_views_message__center__view.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- ui/message_center/views/message_center_view.cc.orig 2016-05-11 19:02:35 UTC -+++ ui/message_center/views/message_center_view.cc -@@ -44,7 +44,7 @@ namespace message_center { - namespace { - - const SkColor kNoNotificationsTextColor = SkColorSetRGB(0xb4, 0xb4, 0xb4); --#if defined(OS_LINUX) && defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(OS_CHROMEOS) - const SkColor kTransparentColor = SkColorSetARGB(0, 0, 0, 0); - #endif - -@@ -82,7 +82,7 @@ NoNotificationMessageView::NoNotificatio - label_->SetEnabledColor(kNoNotificationsTextColor); - // Set transparent background to ensure that subpixel rendering - // is disabled. See crbug.com/169056 --#if defined(OS_LINUX) && defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(OS_CHROMEOS) - label_->SetBackgroundColor(kTransparentColor); - #endif - AddChildView(label_); diff --git a/www/chromium/files/patch-ui_message__center_views_message__view__factory.cc b/www/chromium/files/patch-ui_message__center_views_message__view__factory.cc new file mode 100644 index 000000000000..fb83ced1fa1a --- /dev/null +++ b/www/chromium/files/patch-ui_message__center_views_message__view__factory.cc @@ -0,0 +1,11 @@ +--- ui/message_center/views/message_view_factory.cc.orig 2016-08-03 16:51:43.884486000 -0400 ++++ ui/message_center/views/message_view_factory.cc 2016-08-03 16:51:59.171721000 -0400 +@@ -43,7 +43,7 @@ + notification_view = new NotificationView(controller, notification); + } + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // Don't create shadows for notification toasts on linux wih aura. + if (top_level) + return notification_view; diff --git a/www/chromium/files/patch-ui_message__center_views_notification__view.cc b/www/chromium/files/patch-ui_message__center_views_notification__view.cc deleted file mode 100644 index e81df85cfe8c..000000000000 --- a/www/chromium/files/patch-ui_message__center_views_notification__view.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/message_center/views/notification_view.cc.orig 2016-05-11 19:02:35 UTC -+++ ui/message_center/views/notification_view.cc -@@ -199,7 +199,7 @@ NotificationView* NotificationView::Crea - NotificationView* notification_view = - new NotificationView(controller, notification); - --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - // Don't create shadows for notification toasts on linux wih aura. - if (top_level) - return notification_view; diff --git a/www/chromium/files/patch-ui_views_bubble_bubble__delegate.cc b/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate.cc index 1dd279f82574..445487981064 100644 --- a/www/chromium/files/patch-ui_views_bubble_bubble__delegate.cc +++ b/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate.cc @@ -1,6 +1,6 @@ ---- ui/views/bubble/bubble_delegate.cc.orig 2016-05-11 19:02:36 UTC -+++ ui/views/bubble/bubble_delegate.cc -@@ -96,7 +96,7 @@ Widget* BubbleDelegateView::CreateBubble +--- ui/views/bubble/bubble_dialog_delegate.cc.orig 2016-08-03 16:59:43.426393000 -0400 ++++ ui/views/bubble/bubble_dialog_delegate.cc 2016-08-03 17:00:10.585958000 -0400 +@@ -72,7 +72,7 @@ // the parent frame and let DWM handle compositing. If not, then we don't // want to allow the bubble to extend the frame because it will be clipped. bubble_delegate->set_adjust_if_offscreen(ui::win::IsAeroGlassEnabled()); diff --git a/www/chromium/files/patch-ui_views_controls_button_label__button.cc b/www/chromium/files/patch-ui_views_controls_button_label__button.cc deleted file mode 100644 index 3b3c6ad92456..000000000000 --- a/www/chromium/files/patch-ui_views_controls_button_label__button.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- ui/views/controls/button/label_button.cc.orig 2016-05-11 19:02:36 UTC -+++ ui/views/controls/button/label_button.cc -@@ -30,7 +30,7 @@ namespace { - // The default spacing between the icon and text. - const int kSpacing = 5; - --#if !(defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#if !((defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)) - // Default text and shadow colors for STYLE_BUTTON. - const SkColor kStyleButtonTextColor = SK_ColorBLACK; - const SkColor kStyleButtonShadowColor = SK_ColorWHITE; -@@ -482,7 +482,7 @@ void LabelButton::ResetColorsFromNativeT - // confusion. These details should either be pushed into ui::NativeThemeWin - // or should be obsoleted by rendering buttons with paint calls instead of - // with static assets. http://crbug.com/350498 --#if !(defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#if !((defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)) - constant_text_color = true; - colors[STATE_NORMAL] = kStyleButtonTextColor; - label_->SetBackgroundColor(theme->GetSystemColor( diff --git a/www/chromium/files/patch-ui_views_controls_scrollbar_base__scroll__bar.cc b/www/chromium/files/patch-ui_views_controls_scrollbar_base__scroll__bar.cc deleted file mode 100644 index 7742a6384d4a..000000000000 --- a/www/chromium/files/patch-ui_views_controls_scrollbar_base__scroll__bar.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/views/controls/scrollbar/base_scroll_bar.cc.orig 2016-05-11 19:02:36 UTC -+++ ui/views/controls/scrollbar/base_scroll_bar.cc -@@ -24,7 +24,7 @@ - #include "ui/views/controls/scrollbar/base_scroll_bar_thumb.h" - #include "ui/views/widget/widget.h" - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "ui/gfx/screen.h" - #endif - diff --git a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc index a6ec31a9c5ce..bfebeb7ee029 100644 --- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc +++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc @@ -1,6 +1,6 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2016-05-11 19:02:36 UTC -+++ ui/views/controls/textfield/textfield.cc -@@ -47,7 +47,7 @@ +--- ui/views/controls/textfield/textfield.cc.orig 2016-08-04 09:54:43.724487000 -0400 ++++ ui/views/controls/textfield/textfield.cc 2016-08-04 09:57:23.923660000 -0400 +@@ -48,7 +48,7 @@ #include "base/win/win_util.h" #endif @@ -9,25 +9,24 @@ #include "base/strings/utf_string_conversions.h" #include "ui/events/linux/text_edit_command_auralinux.h" #include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h" -@@ -130,7 +130,7 @@ int GetCommandForKeyEvent(const ui::KeyE +@@ -131,14 +131,14 @@ case ui::VKEY_BACK: - if (!control || has_selection) + if (!control) return IDS_DELETE_BACKWARD; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Only erase by line break on Linux and ChromeOS. if (shift) return IDS_DELETE_TO_BEGINNING_OF_LINE; -@@ -139,7 +139,7 @@ int GetCommandForKeyEvent(const ui::KeyE + #endif + return IDS_DELETE_WORD_BACKWARD; case ui::VKEY_DELETE: - if (!control || has_selection) - return (shift && has_selection) ? IDS_APP_CUT : IDS_DELETE_FORWARD; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Only erase by line break on Linux and ChromeOS. - if (shift) + if (shift && control) return IDS_DELETE_TO_END_OF_LINE; -@@ -154,7 +154,7 @@ int GetCommandForKeyEvent(const ui::KeyE +@@ -155,7 +155,7 @@ } } @@ -36,7 +35,7 @@ // Convert a custom text edit |command| to the equivalent views command ID. int GetViewsCommand(const ui::TextEditCommandAuraLinux& command, bool rtl) { const bool select = command.extend_selection(); -@@ -642,7 +642,7 @@ bool Textfield::OnMousePressed(const ui: +@@ -643,7 +643,7 @@ OnAfterUserAction(); } @@ -45,7 +44,7 @@ if (event.IsOnlyMiddleMouseButton()) { if (GetRenderText()->IsPointInSelection(event.location())) { OnBeforeUserAction(); -@@ -711,7 +711,7 @@ bool Textfield::OnKeyPressed(const ui::K +@@ -712,7 +712,7 @@ if (!textfield) return handled; @@ -54,7 +53,7 @@ ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); std::vector<ui::TextEditCommandAuraLinux> commands; -@@ -846,7 +846,7 @@ void Textfield::AboutToRequestFocusFromT +@@ -847,7 +847,7 @@ } bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { @@ -63,8 +62,8 @@ // Skip any accelerator handling that conflicts with custom keybindings. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); -@@ -1105,7 +1105,7 @@ void Textfield::WriteDragDataForView(Vie - scoped_ptr<gfx::Canvas> canvas( +@@ -1106,7 +1106,7 @@ + std::unique_ptr<gfx::Canvas> canvas( GetCanvasForDragImage(GetWidget(), label.size())); label.SetEnabledColor(GetTextColor()); -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) @@ -72,7 +71,7 @@ // Desktop Linux Aura does not yet support transparency in drag images. canvas->DrawColor(GetBackgroundColor()); #endif -@@ -1880,7 +1880,7 @@ void Textfield::CreateTouchSelectionCont +@@ -1908,7 +1908,7 @@ } void Textfield::UpdateSelectionClipboard() const { diff --git a/www/chromium/files/patch-ui_views_style_platform__style.cc b/www/chromium/files/patch-ui_views_style_platform__style.cc index dead73f8c8c6..75689f078c62 100644 --- a/www/chromium/files/patch-ui_views_style_platform__style.cc +++ b/www/chromium/files/patch-ui_views_style_platform__style.cc @@ -1,11 +1,11 @@ ---- ui/views/style/platform_style.cc.orig 2016-05-11 19:02:36 UTC -+++ ui/views/style/platform_style.cc -@@ -34,7 +34,7 @@ scoped_ptr<ScrollBar> PlatformStyle::Cre +--- ui/views/style/platform_style.cc.orig 2016-07-22 00:07:12.000000000 -0400 ++++ ui/views/style/platform_style.cc 2016-08-04 10:02:49.187133000 -0400 +@@ -17,7 +17,7 @@ + #include "ui/views/controls/focusable_border.h" + #include "ui/views/controls/scrollbar/native_scroll_bar.h" +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + #define DESKTOP_LINUX #endif --#if !defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if (!defined(OS_LINUX) && !defined(OS_BSD)) || defined(OS_CHROMEOS) - // static - scoped_ptr<Border> PlatformStyle::CreateThemedLabelButtonBorder( - LabelButton* button) { diff --git a/www/chromium/files/patch-ui_webui_resources_js_icon.js b/www/chromium/files/patch-ui_webui_resources_js_icon.js new file mode 100644 index 000000000000..1ce1cd0e04b0 --- /dev/null +++ b/www/chromium/files/patch-ui_webui_resources_js_icon.js @@ -0,0 +1,11 @@ +--- ui/webui/resources/js/icon.js.orig 2016-08-04 10:04:19.233504000 -0400 ++++ ui/webui/resources/js/icon.js 2016-08-04 10:04:37.016751000 -0400 +@@ -9,7 +9,7 @@ + */ + function getSupportedScaleFactors() { + var supportedScaleFactors = []; +- if (cr.isMac || cr.isChromeOS || cr.isWindows || cr.isLinux) { ++ if (cr.isMac || cr.isChromeOS || cr.isWindows || cr.isLinux || cr.isBSD) { + // All desktop platforms support zooming which also updates the + // renderer's device scale factors (a.k.a devicePixelRatio), and + // these platforms has high DPI assets for 2.0x. Use 1x and 2x in diff --git a/www/chromium/files/patch-ui_webui_resources_js_util.js b/www/chromium/files/patch-ui_webui_resources_js_util.js deleted file mode 100644 index 742b11644c5c..000000000000 --- a/www/chromium/files/patch-ui_webui_resources_js_util.js +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/webui/resources/js/util.js.orig 2016-05-11 19:02:36 UTC -+++ ui/webui/resources/js/util.js -@@ -52,7 +52,7 @@ function announceAccessibleMessage(msg) - */ - function getSupportedScaleFactors() { - var supportedScaleFactors = []; -- if (cr.isMac || cr.isChromeOS || cr.isWindows || cr.isLinux) { -+ if (cr.isMac || cr.isChromeOS || cr.isWindows || cr.isLinux || cr.isBSD) { - // All desktop platforms support zooming which also updates the - // renderer's device scale factors (a.k.a devicePixelRatio), and - // these platforms has high DPI assets for 2.0x. Use 1x and 2x in diff --git a/www/chromium/files/patch-v8_src_profiler_sampler.cc b/www/chromium/files/patch-v8_src_profiler_sampler.cc new file mode 100644 index 000000000000..cb948582f337 --- /dev/null +++ b/www/chromium/files/patch-v8_src_profiler_sampler.cc @@ -0,0 +1,11 @@ +--- v8/src/profiler/sampler.cc.orig 2016-08-04 11:28:06.738852000 -0400 ++++ v8/src/profiler/sampler.cc 2016-08-04 11:28:29.356607000 -0400 +@@ -210,7 +210,7 @@ + + // Returns hash value for hash map. + uint32_t ThreadHash(pthread_t thread_id) { +-#if V8_OS_MACOSX ++#if defined(V8_OS_MACOSX) || defined(__OpenBSD__) || defined(__FreeBSD__) + return static_cast<uint32_t>(reinterpret_cast<intptr_t>(thread_id)); + #else + return static_cast<uint32_t>(thread_id); diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist index 0c0d72e0ef1b..0214d81afb5d 100644 --- a/www/chromium/pkg-plist +++ b/www/chromium/pkg-plist @@ -64,6 +64,12 @@ share/applications/chromium-browser.desktop %%DATADIR%%/pseudo_locales/fake-bidi.pak %%DATADIR%%/resources.pak %%DATADIR%%/resources/extension/demo/library.js +%%DATADIR%%/resources/inspector/Images/accelerometer-back.png +%%DATADIR%%/resources/inspector/Images/accelerometer-bottom.png +%%DATADIR%%/resources/inspector/Images/accelerometer-front.png +%%DATADIR%%/resources/inspector/Images/accelerometer-left.png +%%DATADIR%%/resources/inspector/Images/accelerometer-right.png +%%DATADIR%%/resources/inspector/Images/accelerometer-top.png %%DATADIR%%/resources/inspector/Images/applicationCache.png %%DATADIR%%/resources/inspector/Images/breakpoint.png %%DATADIR%%/resources/inspector/Images/breakpointConditional.png @@ -77,9 +83,6 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/Images/chromeRight.png %%DATADIR%%/resources/inspector/Images/chromeSelect.png %%DATADIR%%/resources/inspector/Images/chromeSelect_2x.png -%%DATADIR%%/resources/inspector/Images/cookie.png -%%DATADIR%%/resources/inspector/Images/database.png -%%DATADIR%%/resources/inspector/Images/databaseTable.png %%DATADIR%%/resources/inspector/Images/deleteIcon.png %%DATADIR%%/resources/inspector/Images/domain.png %%DATADIR%%/resources/inspector/Images/errorWave.png @@ -91,10 +94,6 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/Images/graphLabelCalloutRight.png %%DATADIR%%/resources/inspector/Images/ic_info_black_18dp.svg %%DATADIR%%/resources/inspector/Images/ic_warning_black_18dp.svg -%%DATADIR%%/resources/inspector/Images/indexedDB.png -%%DATADIR%%/resources/inspector/Images/indexedDBIndex.png -%%DATADIR%%/resources/inspector/Images/indexedDBObjectStore.png -%%DATADIR%%/resources/inspector/Images/localStorage.png %%DATADIR%%/resources/inspector/Images/navigationControls.png %%DATADIR%%/resources/inspector/Images/navigationControls_2x.png %%DATADIR%%/resources/inspector/Images/paneAddButtons.png @@ -114,6 +113,8 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/Images/resourceCSSIcon.png %%DATADIR%%/resources/inspector/Images/resourceDocumentIcon.png %%DATADIR%%/resources/inspector/Images/resourceDocumentIconSmall.png +%%DATADIR%%/resources/inspector/Images/resourceGlyphs.png +%%DATADIR%%/resources/inspector/Images/resourceGlyphs_2x.png %%DATADIR%%/resources/inspector/Images/resourceJSIcon.png %%DATADIR%%/resources/inspector/Images/resourcePlainIcon.png %%DATADIR%%/resources/inspector/Images/resourcePlainIconSmall.png @@ -128,8 +129,6 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/Images/securityStateInsecure.svg %%DATADIR%%/resources/inspector/Images/securityStateNeutral.svg %%DATADIR%%/resources/inspector/Images/securityStateSecure.svg -%%DATADIR%%/resources/inspector/Images/serviceWorker.svg -%%DATADIR%%/resources/inspector/Images/sessionStorage.png %%DATADIR%%/resources/inspector/Images/settingsListRemove.png %%DATADIR%%/resources/inspector/Images/settingsListRemove_2x.png %%DATADIR%%/resources/inspector/Images/speech.png @@ -156,7 +155,10 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/elements_module.js %%DATADIR%%/resources/inspector/emulated_devices_module.js %%DATADIR%%/resources/inspector/es_tree_module.js -%%DATADIR%%/resources/inspector/formatter_worker_module.js +%%DATADIR%%/resources/inspector/emulated_devices/Nexus5X-landscape.svg +%%DATADIR%%/resources/inspector/emulated_devices/Nexus5X-portrait.svg +%%DATADIR%%/resources/inspector/emulated_devices/Nexus6P-landscape.svg +%%DATADIR%%/resources/inspector/emulated_devices/Nexus6P-portrait.svg %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-default-1x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-default-2x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-keyboard-1x.png @@ -181,7 +183,17 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-vertical-keyboard-2x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-vertical-navigation-1x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-vertical-navigation-2x.png -%%DATADIR%%/resources/inspector/heap_snapshot_worker_module.js +%%DATADIR%%/resources/inspector/emulated_devices/iPad-landscape.svg +%%DATADIR%%/resources/inspector/emulated_devices/iPad-portrait.svg +%%DATADIR%%/resources/inspector/emulated_devices/iPhone5-landscape.svg +%%DATADIR%%/resources/inspector/emulated_devices/iPhone5-portrait.svg +%%DATADIR%%/resources/inspector/emulated_devices/iPhone6-landscape.svg +%%DATADIR%%/resources/inspector/emulated_devices/iPhone6-portrait.svg +%%DATADIR%%/resources/inspector/emulated_devices/iPhone6Plus-landscape.svg +%%DATADIR%%/resources/inspector/emulated_devices/iPhone6Plus-portrait.svg +%%DATADIR%%/resources/inspector/formatter_worker.js +%%DATADIR%%/resources/inspector/gonzales_module.js +%%DATADIR%%/resources/inspector/heap_snapshot_worker.js %%DATADIR%%/resources/inspector/inspector.html %%DATADIR%%/resources/inspector/inspector.js %%DATADIR%%/resources/inspector/layers_module.js @@ -195,7 +207,7 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/snippets_module.js %%DATADIR%%/resources/inspector/source_frame_module.js %%DATADIR%%/resources/inspector/sources_module.js -%%DATADIR%%/resources/inspector/temp_storage_shared_worker_module.js +%%DATADIR%%/resources/inspector/temp_storage_shared_worker.js %%DATADIR%%/resources/inspector/timeline_module.js %%DATADIR%%/resources/inspector/toolbox.html %%DATADIR%%/resources/inspector/toolbox.js |