aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlo Landmeter <clandmeter@gmail.com>2015-09-20 01:18:37 +0200
committerCarlo Landmeter <clandmeter@gmail.com>2015-09-20 01:18:37 +0200
commitf10e2fac24e7e32da7447476e52db9023f78da72 (patch)
treec8bb6bfc46058bd79637870e4ae48394ef608137
parent6cbd218dd894296fd0db2d0b08a8566a2fcaff19 (diff)
downloadaports-f10e2fac24e7e32da7447476e52db9023f78da72.tar.bz2
aports-f10e2fac24e7e32da7447476e52db9023f78da72.tar.xz
main/chromium: upgrade to 45.0.2454.93
Diffstat
-rw-r--r--main/chromium/APKBUILD28
-rw-r--r--main/chromium/gcc5-fixes.patch402
-rw-r--r--main/chromium/no-mallinfo.patch23
3 files changed, 19 insertions, 434 deletions
diff --git a/main/chromium/APKBUILD b/main/chromium/APKBUILD
index 348f04f6b4..eb21562857 100644
--- a/main/chromium/APKBUILD
+++ b/main/chromium/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
pkgname=chromium
-pkgver=44.0.2403.157
+pkgver=45.0.2454.93
pkgrel=0
pkgdesc="chromium web browser"
url="http://www.chromium.org/"
@@ -29,7 +29,6 @@ source="https://commondatastorage.googleapis.com/chromium-browser-official/$pkgn
chromium.desktop
google-api.keys
- gcc5-fixes.patch
musl-fixes.patch
no-execinfo.patch
resolver.patch
@@ -68,8 +67,12 @@ prepare() {
build() {
cd "$_builddir"
-
- # reusable system library settings
+
+ # currently does not build with system vpx 1.4
+ # remoting/codec/video_encoder_vpx.cc:308:10: error:
+ # 'vpx_codec_control_VP9E_GET_ACTIVEMAP' was not declared in this scope
+ local vpx=0
+ # reusable system library settings
local use_system="
-Duse_system_bzip2=1
-Duse_system_flac=1
@@ -79,7 +82,7 @@ build() {
-Duse_system_libevent=1
-Duse_system_libjpeg=1
-Duse_system_libpng=1
- -Duse_system_libvpx=1
+ -Duse_system_libvpx=$vpx
-Duse_system_libxml=1
-Duse_system_snappy=1
-Duse_system_xdg_utils=1
@@ -210,44 +213,41 @@ chromedriver() {
"$subpkgdir"/usr/lib/$pkgname/chromedriver || return 1
}
-md5sums="426bb0101b53521c448f7b16d9165d29 chromium-44.0.2403.157.tar.xz
+md5sums="b41e0ab11c91b208ed12669af878d233 chromium-45.0.2454.93.tar.xz
b6d015c1da85aa65ee21bc974c7fc7d2 chromium-launcher.sh
c5aa73a87d4b88cce9f1a680ca691bb6 chromium.conf
2962ac6259e39a797d441daf43aa49c9 chromium.desktop
2d2ee5f22d65c756871301b4a407f4ca google-api.keys
-96277e7ddc26c8bdd50fb63eff2f4ce0 gcc5-fixes.patch
4d51f367a9220703f5f7dd962388b5a7 musl-fixes.patch
00ae59dd9d09c60a116fd0133f9f3a60 no-execinfo.patch
af047840f31e99aa36be04edc3482afd resolver.patch
-63cb370a0a1db204dece7c611c483395 no-mallinfo.patch
+5c69e07f1738f11632e8d9f27cc85826 no-mallinfo.patch
2c8de771a7c0e5e0e9fc68fa978785f7 no-getcontext.patch
4f22f0d05448c49d6501386523a081ba musl-sandbox.patch
97b1578585ab600ed9adef4f341ccd80 chromium-system-jinja-r7.patch
de717d6430532f34fe161035dfdafcdf chromium-widevine.patch"
-sha256sums="e1a4d5fd030842684d69e840d411f45b4e5ccf377d7f131fe37ce1a13439f3b4 chromium-44.0.2403.157.tar.xz
+sha256sums="0652aad95e6135ce03c6bfa13c4b023b1d70d65af9e0a24dc0e9fe45578d2ac7 chromium-45.0.2454.93.tar.xz
89f1eb19d1ed998a190045ea173959f01faee3490d58a6a34ca3fe21228e569f chromium-launcher.sh
b466559340a36998354a0577325fe533d9e6b74c24a15b7599671171506bf128 chromium.conf
3ae90cea7503d0039de53448ed112b9bc0cb5a09f6b0045506eb777fc23517e5 chromium.desktop
267ba8ff50574e51d2582c4fca9b9e14f7225c1fa064d135cbceff9cef2324ac google-api.keys
-ee32d8a89cc51cb71a8d4aa82b196b145f43a2fc3ba9687f9c06c053601d5fe7 gcc5-fixes.patch
55150c9f0671789b998d8f858e7c8640e30331b92912dea0a19458c9d0c3f31c musl-fixes.patch
505a55c28e971e067f189e3a1ce697d711cec82a765d81f78eb49ec1f6df56cf no-execinfo.patch
f16c63d4188fe56732dc6760307795ba4059452c4cf3de1460cbcb2616011511 resolver.patch
-a3687b773372b2f259929f39ccf9e8a79709a308e2630e352c30fdcf0df51c8a no-mallinfo.patch
+d746414cde6c7fc1836406cc2f954387dc75c755141b2dd0126eb885ab411638 no-mallinfo.patch
ea79f9a46116c8b56bbc69d226abd9252e4ae4d946ca695203f2298279cc2211 no-getcontext.patch
20fcb99022f3a737dceea7349da61e12a85834c0ab65a02009b6f56acb8b0f07 musl-sandbox.patch
872f5a38d8263b14308bb117828496a4093d0e6ad755d39d2c5e6857314fe071 chromium-system-jinja-r7.patch
1d1ead77250475228524770e57c17282aff9098c5efc3d7719b0df76229b8874 chromium-widevine.patch"
-sha512sums="c31dfa788fd1935c443d9684b3f4a10ea996eee9e00f672fa90f29ed955ce1c797e9c31e27f982d3194bba0ae1d099b567deeda7d752a0320b36d1abf0aa71cc chromium-44.0.2403.157.tar.xz
+sha512sums="0dc97f8cc57c29ae09aaea220766881ec98b9af3e53bb096241f9c2bc974970124ea0307ec48febe500e3d39dfc27b42b67af0908641e057dd1b3a9fdf466bc7 chromium-45.0.2454.93.tar.xz
b9a810416dd7a8ffc3a5ced85ad9acebda1665bd08a57eec7b189698cc5f74d2c3fd69044e20fcb83297a43214b2772a1312b2c6122ea0eb716abacf39524d60 chromium-launcher.sh
f6d962b9e4c22dd42183df3db5d3202dab33eccecafb1bf63ca678147289581262db1e5e64cbe8f9c212beefb0a6717bb8d311e497f56b55fe95b8bab2db493f chromium.conf
e182c998a43d22d1c76a86c561619afd1fca8c2be668265ad5e2f81a3806f7a154272cc027a2f8b370fb69446892c69e5967a4be76082325c14245ee7915234c chromium.desktop
2d8237a940ea691bd10b08315429677a587f7ef9692a0cca53bfd066eae82998a6c71f402a8669e9de39f94d7f3280745d1628ea6eac5d76ca7116844d4e0dac google-api.keys
-e2390cdeb2a75aad51d5da07819e1375fcf2092535eaa86545b9bc0160eff9e3981f946029ed8fc337df4c56a8b8cc7945821d2636b09e320dea2c8884022a59 gcc5-fixes.patch
47d2fa2e3cad35e6eca5de9ffad1eacdce7c82e4da4579aa08e7fde0fb5690b9925c8f925b484f012ce1eaf22b18350e2fbdd5f38301c45b390da4393158bf79 musl-fixes.patch
4f756d3e404033f7a36b38266176b7302f7e2a2e78c9f8b8d362a53a3dbdc675cdaa581393a70c23a29135b34566cf4109513cb13a289dc111bbce65ec065ebd no-execinfo.patch
987f18d37824676e5d874a6fde1099bcc558920e7781de5f34e612411013e4fac9ca421a3cce1ed5f82401c4d54212b6f47a0a856892a78543b8e400a4bb0489 resolver.patch
-5d6efa5800ec9d3680efa7946ecbadd4b8a63e56d4f94274a0afa61119f10aad6e4af0898b8724041869fade85a86980eabb94cbf120c8847a1386b33f0da55c no-mallinfo.patch
+c8ff8d3d2c5948a8c9ae0ccc8625ae6116071af19b1d7d2bc2597b0876084de42565537abcbb96b150176e04de7a288ab7a9116e038fe83dd6816c7c5b2ae235 no-mallinfo.patch
42d9a6ebea2d95cdc169b921cc1a1b846cf500997059fd3084de09e21f00b63b76e60c6124f4af247d402ff5ca3f4bf8867a6f2c78198c05b4273ca01fb29241 no-getcontext.patch
cc61407bae55523fd3d0b43be7cf827cd6a648314a81f8d78f830e60cb215ede6c585d8755e9c870bb98955a4d3679205cbefde6f4efcb0e48469169167823eb musl-sandbox.patch
10bcc6a467b6766d13b5e41e7b7dcdbd62de7c04daad16c83037e88043032a0c118627029f91ef8a2a57faaaebc8b6f4ee16e8d1fecb5921d0d49efd60a27863 chromium-system-jinja-r7.patch
diff --git a/main/chromium/gcc5-fixes.patch b/main/chromium/gcc5-fixes.patch
deleted file mode 100644
index 63a2a26d95..0000000000
--- a/main/chromium/gcc5-fixes.patch
+++ /dev/null
@@ -1,402 +0,0 @@
-::::::::::::::
-cld_generated_cjk_uni_prop_80.patch
-::::::::::::::
---- ./third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc 2014-10-29 21:17:01.352107691 -0400
-+++ ./third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc 2015-04-28 06:45:57.826546378 -0400
-@@ -4,7 +4,7 @@
- // you may not use this file except in compliance with the License.
- // You may obtain a copy of the License at
- //
--// http://www.apache.org/licenses/LICENSE-2.0
-+// http://www.apache.org/licenses/LICENSE_UC -2.0
- //
- // Unless required by applicable law or agreed to in writing, software
- // distributed under the License is distributed on an "AS IS" BASIS,
-@@ -17,14 +17,14 @@
- //
- // Maps properties of all codes from file:
- // cld_generated_ctjkvz.txt
--// Accepts all other UTF-8 codes 0000..10FFFF
-+// Accepts all other UTF_UC -8 codes 0000..10FFFF
- // Space optimized
- //
--// ** ASSUMES INPUT IS STRUCTURALLY VALID UTF-8 **
-+// ** ASSUMES INPUT IS STRUCTURALLY VALID UTF_UC -8 **
- //
--// Table offsets for byte 2-of-3 and byte 3-of-4 are
--// multiplied by 16; offsets for 3-of-3 and 4-of-4 are
--// relative +/-127 from previous state.
-+// Table offsets for byte 2_UC -of_UC -3 and byte 3_UC -of_UC -4 are
-+// multiplied by 16; offsets for 3_UC -of_UC -3 and 4_UC -of_UC -4 are
-+// relative +/_UC -127 from previous state.
-
- #include "utf8statetable.h"
-
-@@ -56,9 +56,11 @@
- static const unsigned int cld_generated_CjkUni_LOSUB = 0x80808080;
- static const unsigned int cld_generated_CjkUni_HIADD = 0x00000000;
-
--static const uint8 cld_generated_CjkUni[] = {
-+#define _UC (unsigned char)
-+//static const uint8 cld_generated_CjkUni[] = {
-+static const unsigned char cld_generated_CjkUni[] = {
- // state[0] 0x000000 Byte 1 (row Ex offsets 16x small)
-- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ _UC -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-@@ -165,8 +167,8 @@
- // state[16 + 2] 0x000000 Byte 2 of 3 (relative offsets)
- X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__,
- X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__,
---14,-14,-14,-14,-14,-14,-14,-14, -14,-14,-14,-14,-14,-14,-14,-14,
---14,-14,-14,-14,-14,-14,-14,-14, -14,-14,-14,-14,-14,-14,-14,-14,
-+_UC -14,_UC -14,_UC -14,_UC -14,_UC -14,_UC -14,_UC -14,_UC -14,_UC -14,_UC -14,_UC -14,_UC -14,_UC -14,_UC -14,_UC -14,_UC -14,
-+_UC -14,_UC -14,_UC -14,_UC -14,_UC -14,_UC -14,_UC -14,_UC -14,_UC -14,_UC -14,_UC -14,_UC -14,_UC -14,_UC -14,_UC -14,_UC -14,
-
- // state[17 + 2] 0x0031c0 Byte 3 of 3 (property)
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-@@ -259,10 +261,10 @@
- 229,229,229, 3,208, 0,229, 5, 233, 0,229,229,229,208,229,229,
-
- // state[32 + 2] 0x002000 Byte 2 of 3 (relative offsets)
---30,-30,-30,-30,-30,-30,-30,-30, -30,-30,-30,-30,-30,-30,-30,-30,
---30,-30,-30,-30,-30,-30,-30,-30, -30,-30,-30,-30,-30,-30,-30,-30,
---30,-30,-30,-30,-30,-30,-30,-30, -30,-30,-30,-30,-30,-30,-30,-30,
---30,-30,-30,-30,-30,-30,-30,-30, -30,-30,-30,-30,-30,-30,-30,-30,
-+_UC -30,_UC -30,_UC -30,_UC -30,_UC -30,_UC -30,_UC -30,_UC -30, _UC -30,_UC -30,_UC -30,_UC -30,_UC -30,_UC -30,_UC -30,_UC -30,
-+_UC -30,_UC -30,_UC -30,_UC -30,_UC -30,_UC -30,_UC -30,_UC -30, _UC -30,_UC -30,_UC -30,_UC -30,_UC -30,_UC -30,_UC -30,_UC -30,
-+_UC -30,_UC -30,_UC -30,_UC -30,_UC -30,_UC -30,_UC -30,_UC -30, _UC -30,_UC -30,_UC -30,_UC -30,_UC -30,_UC -30,_UC -30,_UC -30,
-+_UC -30,_UC -30,_UC -30,_UC -30,_UC -30,_UC -30,_UC -30,_UC -30, _UC -30,_UC -30,_UC -30,_UC -30,_UC -30,_UC -30,_UC -30,_UC -30,
-
- // state[33 + 2] 0x003780 Byte 3 of 3 (property)
- 229,208,229,229,208,229,229,229, 208,208,208,208,208, 4, 6,208,
-@@ -355,10 +357,10 @@
- 228,229,229,229,229,233,233, 6, 208,229, 3,229,233, 6, 6, 0,
-
- // state[48 + 2] 0x001000 Byte 2 of 3 (relative offsets)
---46,-46,-46,-46,-42,-41,-40,-39, -46,-46,-46,-46,-46,-46,-46,-46,
---46,-46,-46,-46,-46,-46,-46,-46, -46,-46,-46,-46,-46,-46,-46,-46,
---46,-46,-46,-46,-46,-46,-46,-46, -46,-46,-46,-46,-46,-46,-46,-46,
---46,-46,-46,-46,-46,-46,-46,-46, -46,-46,-46,-46,-46,-46,-46,-46,
-+_UC -46,_UC -46,_UC -46,_UC -46,_UC -42,_UC -41,_UC -40,_UC -39, _UC -46,_UC -46,_UC -46,_UC -46,_UC -46,_UC -46,_UC -46,_UC -46,
-+_UC -46,_UC -46,_UC -46,_UC -46,_UC -46,_UC -46,_UC -46,_UC -46, _UC -46,_UC -46,_UC -46,_UC -46,_UC -46,_UC -46,_UC -46,_UC -46,
-+_UC -46,_UC -46,_UC -46,_UC -46,_UC -46,_UC -46,_UC -46,_UC -46, _UC -46,_UC -46,_UC -46,_UC -46,_UC -46,_UC -46,_UC -46,_UC -46,
-+_UC -46,_UC -46,_UC -46,_UC -46,_UC -46,_UC -46,_UC -46,_UC -46, _UC -46,_UC -46,_UC -46,_UC -46,_UC -46,_UC -46,_UC -46,_UC -46,
-
- // state[49 + 2] 0x003b40 Byte 3 of 3 (property)
- 6,227,208,233,208, 3, 3,208, 208,229, 0,229,233,219, 0, 6,
-@@ -451,10 +453,10 @@
- 229,208,208,208,217,208,229,229, 229,229,208,217,208,229,229,229,
-
- // state[64 + 2] 0x003000 Byte 2 of 3 (relative offsets)
---54,-53,-52,-51,-50,-58,-49,-47, -62,-62,-62,-62,-62,-62,-62,-62,
---46,-45,-44,-43,-42,-41,-40,-39, -38,-37,-36,-35,-34,-33,-31,-30,
---29,-28,-27,-26,-25,-24,-23,-22, -21,-20,-19,-18,-17,-15,-14,-13,
---12,-11,-10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4,
-+_UC -54,_UC -53,_UC -52,_UC -51,_UC -50,_UC -58,_UC -49,_UC -47, _UC -62,_UC -62,_UC -62,_UC -62,_UC -62,_UC -62,_UC -62,_UC -62,
-+_UC -46,_UC -45,_UC -44,_UC -43,_UC -42,_UC -41,_UC -40,_UC -39, _UC -38,_UC -37,_UC -36,_UC -35,_UC -34,_UC -33,_UC -31,_UC -30,
-+_UC -29,_UC -28,_UC -27,_UC -26,_UC -25,_UC -24,_UC -23,_UC -22, _UC -21,_UC -20,_UC -19,_UC -18,_UC -17,_UC -15,_UC -14,_UC -13,
-+_UC -12,_UC -11,_UC -10, _UC -9, _UC -8, _UC -7, _UC -6, _UC -5, _UC -4, _UC -3, _UC -2, _UC -1, 1, 2, 3, 4,
-
- // state[65 + 2] 0x003f00 Byte 3 of 3 (property)
- 217,217,208, 3,208,217,208,208, 6,229,208,228,229,229,208,229,
-@@ -547,10 +549,10 @@
- 229,208,229,229,208,229,233, 0, 208,208,229,208,227,229,229,229,
-
- // state[80 + 2] 0x004000 Byte 2 of 3 (relative offsets)
---11,-10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5,
-+_UC -11,_UC -10, _UC -9, _UC -8, _UC -7, _UC -6, _UC -5, _UC -4, _UC -3, _UC -2, _UC -1, 1, 2, 3, 4, 5,
- 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
- 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
-- 38, 39, 40, 41, 42, 43, 44,-78, 45, 46, 47, 48, 49, 50, 51, 52,
-+ 38, 39, 40, 41, 42, 43, 44,_UC -78, 45, 46, 47, 48, 49, 50, 51, 52,
-
- // state[81 + 2] 0x0042c0 Byte 3 of 3 (property)
- 229, 0,229,229,229, 3, 4, 4, 229,229,229,229,208,229, 0,208,
-@@ -931,7 +933,7 @@
- 0,142, 98, 28,117,206,212,212, 220, 15, 0,231,199,231,111, 28,
-
- // state[144 + 2] 0x005000 Byte 2 of 3 (relative offsets)
---11,-10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5,
-+_UC -11,_UC -10, _UC -9, _UC -8, _UC -7, _UC -6, _UC -5, _UC -4, _UC -3, _UC -2, _UC -1, 1, 2, 3, 4, 5,
- 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
- 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
- 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
-@@ -1315,7 +1317,7 @@
- 16, 15,211,118, 0,231, 68,231, 0, 99,161, 0,115,221,144,140,
-
- // state[208 + 2] 0x006000 Byte 2 of 3 (relative offsets)
---10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5, 6,
-+_UC -10, _UC -9, _UC -8, _UC -7, _UC -6, _UC -5, _UC -4, _UC -3, _UC -2, _UC -1, 1, 2, 3, 4, 5, 6,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
- 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
- 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
-@@ -1699,7 +1701,7 @@
- 119, 16, 51, 0, 0, 68,136, 72, 144,118, 87,201,191,136, 78,233,
-
- // state[272 + 2] 0x007000 Byte 2 of 3 (relative offsets)
-- -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5, 6, 7,
-+ _UC -9, _UC -8, _UC -7, _UC -6, _UC -5, _UC -4, _UC -3, _UC -2, _UC -1, 1, 2, 3, 4, 5, 6, 7,
- 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
- 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
- 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
-@@ -2083,7 +2085,7 @@
- 212,212, 0,126,140,220,220, 0, 0, 0,127,118,106, 0,199, 0,
-
- // state[336 + 2] 0x008000 Byte 2 of 3 (relative offsets)
-- -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5, 6, 7, 8,
-+ _UC -8, _UC -7, _UC -6, _UC -5, _UC -4, _UC -3, _UC -2, _UC -1, 1, 2, 3, 4, 5, 6, 7, 8,
- 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
-@@ -2467,7 +2469,7 @@
- 0,122, 0,231,100,232, 0, 0, 117, 0,206,231, 0, 0,231, 0,
-
- // state[400 + 2] 0x009000 Byte 2 of 3 (relative offsets)
-- -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5, 6, 7, 8, 9,
-+ _UC -7, _UC -6, _UC -5, _UC -4, _UC -3, _UC -2, _UC -1, 1, 2, 3, 4, 5, 6, 7, 8, 9,
- 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
- 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
- 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
-@@ -2851,10 +2853,10 @@
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-
- // state[464 + 2] 0x00a000 Byte 2 of 3 (relative offsets)
-- -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6,
-- -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6,
-- -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6,
-- -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5,
-+ _UC -6, _UC -6, _UC -6, _UC -6, _UC -6, _UC -6, _UC -6, _UC -6, _UC -6, _UC -6, _UC -6, _UC -6, _UC -6, _UC -6, _UC -6, _UC -6,
-+ _UC -6, _UC -6, _UC -6, _UC -6, _UC -6, _UC -6, _UC -6, _UC -6, _UC -6, _UC -6, _UC -6, _UC -6, _UC -6, _UC -6, _UC -6, _UC -6,
-+ _UC -6, _UC -6, _UC -6, _UC -6, _UC -6, _UC -6, _UC -6, _UC -6, _UC -6, _UC -6, _UC -6, _UC -6, _UC -6, _UC -6, _UC -6, _UC -6,
-+ _UC -5, _UC -5, _UC -5, _UC -5, _UC -5, _UC -5, _UC -5, _UC -5, _UC -5, _UC -5, _UC -5, _UC -5, _UC -5, _UC -5, _UC -5, _UC -5,
-
- // state[465 + 2] 0x000080 Byte 2 of 2 (property)
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-@@ -2947,10 +2949,10 @@
- 208,208,208,208, 5, 6,208, 2, 0, 6, 6, 5,208,208,208, 6,
-
- // state[480 + 2] 0x00b000 Byte 2 of 3 (relative offsets)
---20,-20,-20,-20,-20,-20,-20,-20, -20,-20,-20,-20,-20,-20,-20,-20,
---20,-20,-20,-20,-20,-20,-20,-20, -20,-20,-20,-20,-20,-20,-20,-20,
---20,-20,-20,-20,-20,-20,-20,-20, -20,-20,-20,-20,-20,-20,-20,-20,
---20,-20,-20,-20,-20,-20,-20,-20, -20,-20,-20,-20,-20,-20,-20,-20,
-+_UC -20,_UC -20,_UC -20,_UC -20,_UC -20,_UC -20,_UC -20,_UC -20, _UC -20,_UC -20,_UC -20,_UC -20,_UC -20,_UC -20,_UC -20,_UC -20,
-+_UC -20,_UC -20,_UC -20,_UC -20,_UC -20,_UC -20,_UC -20,_UC -20, _UC -20,_UC -20,_UC -20,_UC -20,_UC -20,_UC -20,_UC -20,_UC -20,
-+_UC -20,_UC -20,_UC -20,_UC -20,_UC -20,_UC -20,_UC -20,_UC -20, _UC -20,_UC -20,_UC -20,_UC -20,_UC -20,_UC -20,_UC -20,_UC -20,
-+_UC -20,_UC -20,_UC -20,_UC -20,_UC -20,_UC -20,_UC -20,_UC -20, _UC -20,_UC -20,_UC -20,_UC -20,_UC -20,_UC -20,_UC -20,_UC -20,
-
- // state[481 + 2] 0x020100 Byte 4 of 4 (property)
- 2, 6, 5, 6, 5,229, 5,208, 208,208,208,208,208,208,208,229,
-@@ -3043,10 +3045,10 @@
- 208,208, 5, 5, 5,208,208, 2, 229, 5, 5, 5, 5, 5, 6,208,
-
- // state[496 + 2] 0x00d000 Byte 2 of 3 (relative offsets)
---35,-35,-35,-35,-35,-35,-35,-35, -35,-35,-35,-35,-35,-35,-35,-35,
---35,-35,-35,-35,-35,-35,-35,-35, -35,-35,-35,-35,-35,-35,-34,-33,
---33,-33,-33,-33,-33,-33,-33,-33, -33,-33,-33,-33,-33,-33,-33,-33,
---33,-33,-33,-33,-33,-33,-33,-33, -33,-33,-33,-33,-33,-33,-33,-33,
-+_UC -35,_UC -35,_UC -35,_UC -35,_UC -35,_UC -35,_UC -35,_UC -35, _UC -35,_UC -35,_UC -35,_UC -35,_UC -35,_UC -35,_UC -35,_UC -35,
-+_UC -35,_UC -35,_UC -35,_UC -35,_UC -35,_UC -35,_UC -35,_UC -35, _UC -35,_UC -35,_UC -35,_UC -35,_UC -35,_UC -35,_UC -34,_UC -33,
-+_UC -33,_UC -33,_UC -33,_UC -33,_UC -33,_UC -33,_UC -33,_UC -33, _UC -33,_UC -33,_UC -33,_UC -33,_UC -33,_UC -33,_UC -33,_UC -33,
-+_UC -33,_UC -33,_UC -33,_UC -33,_UC -33,_UC -33,_UC -33,_UC -33, _UC -33,_UC -33,_UC -33,_UC -33,_UC -33,_UC -33,_UC -33,_UC -33,
-
- // state[497 + 2] 0x0204c0 Byte 4 of 4 (property)
- 2, 2, 5, 5, 5, 2,208, 2, 5, 5, 6,208,208, 5, 5, 5,
-@@ -3139,10 +3141,10 @@
- 208,208, 5, 5, 5, 5, 6, 6, 208,208, 2,208,208,208,208,208,
-
- // state[512 + 2] 0x00f000 Byte 2 of 3 (relative offsets)
---47,-47,-47,-47,-47,-47,-47,-47, -47,-47,-47,-47,-47,-47,-47,-47,
---47,-47,-47,-47,-47,-47,-47,-47, -47,-47,-47,-47,-47,-47,-47,-47,
---47,-47,-47,-47,-46,-45,-44,-43, -42,-41,-44,-40,-47,-47,-47,-47,
---47,-47,-47,-47,-47,-47,-47,-47, -47,-47,-47,-47,-47,-39,-38,-37,
-+_UC -47,_UC -47,_UC -47,_UC -47,_UC -47,_UC -47,_UC -47,_UC -47, _UC -47,_UC -47,_UC -47,_UC -47,_UC -47,_UC -47,_UC -47,_UC -47,
-+_UC -47,_UC -47,_UC -47,_UC -47,_UC -47,_UC -47,_UC -47,_UC -47, _UC -47,_UC -47,_UC -47,_UC -47,_UC -47,_UC -47,_UC -47,_UC -47,
-+_UC -47,_UC -47,_UC -47,_UC -47,_UC -46,_UC -45,_UC -44,_UC -43, _UC -42,_UC -41,_UC -44,_UC -40,_UC -47,_UC -47,_UC -47,_UC -47,
-+_UC -47,_UC -47,_UC -47,_UC -47,_UC -47,_UC -47,_UC -47,_UC -47, _UC -47,_UC -47,_UC -47,_UC -47,_UC -47,_UC -39,_UC -38,_UC -37,
-
- // state[513 + 2] 0x020880 Byte 4 of 4 (property)
- 5, 5, 5, 6,208,208,208,208, 208,208, 5, 5, 6, 6,208,208,
-@@ -3235,10 +3237,10 @@
- 5, 6,208,218,208,208,208,218, 208, 6,227,229, 6, 6, 6,208,
-
- // state[528 + 2] 0x020000 Byte 3 of 4 (relative offsets)
---52,-51,-50,-49,-47,-46,-45,-44, -43,-42,-41,-40,-39,-38,-37,-36,
---35,-34,-33,-31,-30,-29,-28,-27, -26,-25,-24,-23,-22,-21,-20,-19,
---18,-17,-15,-14,-13,-12,-11,-10, -9, -8, -7, -6, -5, -4, -3, -2,
-- -1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-+_UC -52,_UC -51,_UC -50, _UC -49,_UC -47,_UC -46,_UC -45,_UC -44, _UC -43,_UC -42,_UC -41,_UC -40,_UC -39,_UC -38,_UC -37,_UC -36,
-+_UC -35,_UC -34,_UC -33,_UC -31,_UC -30,_UC -29,_UC -28,_UC -27, _UC -26,_UC -25,_UC -24,_UC -23,_UC -22,_UC -21,_UC -20,_UC -19,
-+_UC -18,_UC -17,_UC -15,_UC -14,_UC -13,_UC -12,_UC -11,_UC -10, _UC -9, _UC -8, _UC -7, _UC -6, _UC -5, _UC -4, _UC -3, _UC -2,
-+ _UC -1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-
- // state[529 + 2] 0x020c40 Byte 4 of 4 (property)
- 227, 5, 5, 5, 2, 2, 2, 2, 213, 2, 2, 2, 2, 2,208, 6,
-@@ -3427,7 +3429,7 @@
- 208,208,208,208,208,208,208,208, 208, 6, 6, 6, 6, 2, 5, 5,
-
- // state[560 + 2] 0x021000 Byte 3 of 4 (relative offsets)
---16,-15,-14,-13,-12,-11,-10, -9, -8, -7, -6, -5, -4, -3, -2, -1,
-+_UC -16,_UC -15,_UC -14,_UC -13,_UC -12,_UC -11,_UC -10, _UC -9, _UC -8, _UC -7, _UC -6, _UC -5, _UC -4, _UC -3, _UC -2, _UC -1,
- 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
- 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
-@@ -3811,7 +3813,7 @@
- 5, 5, 5, 6, 6, 6, 5,208, 208,229,208,208, 5, 5, 5, 5,
-
- // state[624 + 2] 0x022000 Byte 3 of 4 (relative offsets)
---15,-14,-13,-12,-11,-10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 1,
-+_UC -15,_UC -14,_UC -13,_UC -12,_UC -11,_UC -10, _UC -9, _UC -8, _UC -7, _UC -6, _UC -5, _UC -4, _UC -3, _UC -2, _UC -1, 1,
- 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
- 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
- 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
-@@ -4195,7 +4197,7 @@
- 6, 6, 4, 5,208,208,208,208, 208,208,229, 6, 5, 6, 6, 6,
-
- // state[688 + 2] 0x023000 Byte 3 of 4 (relative offsets)
---14,-13,-12,-11,-10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2,
-+_UC -14,_UC -13,_UC -12,_UC -11,_UC -10, _UC -9, _UC -8, _UC -7, _UC -6, _UC -5, _UC -4, _UC -3, _UC -2, _UC -1, 1, 2,
- 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
- 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
-@@ -4579,7 +4581,7 @@
- 5, 5, 5, 5, 5, 5, 5, 6, 208,208,208,208,208,208, 6, 6,
-
- // state[752 + 2] 0x024000 Byte 3 of 4 (relative offsets)
---13,-12,-11,-10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3,
-+_UC -13,_UC -12,_UC -11,_UC -10, _UC -9, _UC -8, _UC -7, _UC -6, _UC -5, _UC -4, _UC -3, _UC -2, _UC -1, 1, 2, 3,
- 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
- 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
- 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
-@@ -4963,7 +4965,7 @@
- 229, 6, 2, 2, 2, 2, 2, 2, 2, 2, 2, 5, 2, 2, 6,229,
-
- // state[816 + 2] 0x025000 Byte 3 of 4 (relative offsets)
---12,-11,-10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4,
-+_UC -12,_UC -11,_UC -10, _UC -9, _UC -8, _UC -7, _UC -6, _UC -5, _UC -4, _UC -3, _UC -2, _UC -1, 1, 2, 3, 4,
- 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
- 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
-@@ -5347,7 +5349,7 @@
- 6, 6, 6, 5, 5, 5, 5, 6, 6, 6, 3, 6,229,208,208,229,
-
- // state[880 + 2] 0x026000 Byte 3 of 4 (relative offsets)
---11,-10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5,
-+_UC -11,_UC -10, _UC -9, _UC -8, _UC -7, _UC -6, _UC -5, _UC -4, _UC -3, _UC -2, _UC -1, 1, 2, 3, 4, 5,
- 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
- 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
- 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
-@@ -5731,7 +5733,7 @@
- 208, 6, 6,208,208,208,208,208, 6, 6, 6,216, 5, 5, 5, 5,
-
- // state[944 + 2] 0x027000 Byte 3 of 4 (relative offsets)
---10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5, 6,
-+_UC -10, _UC -9, _UC -8, _UC -7, _UC -6, _UC -5, _UC -4, _UC -3, _UC -2, _UC -1, 1, 2, 3, 4, 5, 6,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
- 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
- 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
-@@ -6115,7 +6117,7 @@
- 5, 5, 5, 6,208,208, 6, 6, 208,229,208,208,208, 5, 5, 5,
-
- // state[1008 + 2] 0x028000 Byte 3 of 4 (relative offsets)
-- -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5, 6, 7,
-+ _UC -9, _UC -8, _UC -7, _UC -6, _UC -5, _UC -4, _UC -3, _UC -2, _UC -1, 1, 2, 3, 4, 5, 6, 7,
- 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
- 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
- 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
-@@ -6499,7 +6501,7 @@
- 208,208, 5, 5, 6,208,208, 5, 208,208,208, 6,208, 6,208,208,
-
- // state[1072 + 2] 0x029000 Byte 3 of 4 (relative offsets)
-- -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5, 6, 7, 8,
-+ _UC -8, _UC -7, _UC -6, _UC -5, _UC -4, _UC -3, _UC -2, _UC -1, 1, 2, 3, 4, 5, 6, 7, 8,
- 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
-@@ -6883,7 +6885,7 @@
- 229,229,229,229,208,208,208,229, 208,208,208,229, 0,229,208,208,
-
- // state[1136 + 2] 0x02a000 Byte 3 of 4 (relative offsets)
-- -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5, 6, 7, 8, 9,
-+ _UC -7, _UC -6, _UC -5, _UC -4, _UC -3, _UC -2, _UC -1, 1, 2, 3, 4, 5, 6, 7, 8, 9,
- 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 22, 22, 22,
- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-@@ -7075,10 +7077,10 @@
- 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-
- // state[1168 + 2] 0x02f000 Byte 3 of 4 (relative offsets)
-- -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9,
-- -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9,
-- -8, -7, -6, -5, -4, -3, -2, -1, 1, -9, -9, -9, -9, -9, -9, -9,
-- -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9,
-+ _UC -9, _UC -9, _UC -9, _UC -9, _UC -9, _UC -9, _UC -9, _UC -9, _UC -9, _UC -9, _UC -9, _UC -9, _UC -9, _UC -9, _UC -9, _UC -9,
-+ _UC -9, _UC -9, _UC -9, _UC -9, _UC -9, _UC -9, _UC -9, _UC -9, _UC -9, _UC -9, _UC -9, _UC -9, _UC -9, _UC -9, _UC -9, _UC -9,
-+ _UC -8, _UC -7, _UC -6, _UC -5, _UC -4, _UC -3, _UC -2, _UC -1, 1, _UC -9, _UC -9, _UC -9, _UC -9, _UC -9, _UC -9, _UC -9,
-+ _UC -9, _UC -9, _UC -9, _UC -9, _UC -9, _UC -9, _UC -9, _UC -9, _UC -9, _UC -9, _UC -9, _UC -9, _UC -9, _UC -9, _UC -9, _UC -9,
-
- // state[1169 + 2] 0x02fa00 Byte 4 of 4 (property)
- 217, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,217, 5, 5,
-@@ -7127,7 +7129,7 @@
- #undef D__
- #undef RJA
-
--// Table has 75008 bytes, Hash = E40D-2DFE
-+// Table has 75008 bytes, Hash = E40D_UC -2DFE
-
- } // End namespace CLD2
-
-::::::::::::::
-NodeFilter.idl.patch
-::::::::::::::
---- ./third_party/WebKit/Source/core/dom/NodeFilter.idl 2015-03-03 22:10:29.769371589 -0500
-+++ ./third_party/WebKit/Source/core/dom/NodeFilter.idl 2015-04-29 09:07:58.968615515 -0400
-@@ -32,7 +32,7 @@
- const short FILTER_SKIP = 3;
-
- // Constants for whatToShow
-- const unsigned long SHOW_ALL = 0xFFFFFFFF;
-+ const unsigned long SHOW_ALL = 256;
- const unsigned long SHOW_ELEMENT = 0x1;
- const unsigned long SHOW_ATTRIBUTE = 0x2; // historical
- const unsigned long SHOW_TEXT = 0x4;
-::::::::::::::
-WebGL2RenderingContextBase.idl.patch
-::::::::::::::
---- ./third_party/WebKit/Source/core/html/canvas/WebGL2RenderingContextBase.idl 2015-04-28 20:57:21.310895273 -0400
-+++ ./third_party/WebKit/Source/core/html/canvas/WebGL2RenderingContextBase.idl 2015-04-29 09:39:43.785081387 -0400
-@@ -259,7 +259,7 @@
- const GLenum UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES = 0x8A43;
- const GLenum UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER = 0x8A44;
- const GLenum UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER = 0x8A46;
-- const GLenum INVALID_INDEX = 0xFFFFFFFF;
-+ const GLenum INVALID_INDEX = 256;
- const GLenum MAX_VERTEX_OUTPUT_COMPONENTS = 0x9122;
- const GLenum MAX_FRAGMENT_INPUT_COMPONENTS = 0x9125;
- const GLenum MAX_SERVER_WAIT_TIMEOUT = 0x9111;
-@@ -308,7 +308,7 @@
- const GLenum TEXTURE_IMMUTABLE_LEVELS = 0x82DF;
-
- // FIXME: This currently differs from the WebGL2 spec.
-- const GLuint TIMEOUT_IGNORED = 0xFFFFFFFF;
-+ const GLuint TIMEOUT_IGNORED = 256;
-
- /* WebGL-specific enums */
- const GLenum MAX_CLIENT_WAIT_TIMEOUT_WEBGL = 0x9247;
-::::::::::::::
-NodeFilter.h.patch
-::::::::::::::
---- ./third_party/WebKit/Source/core/dom/NodeFilter.h 2015-02-26 20:53:10.945296273 -0500
-+++ ./third_party/WebKit/Source/core/dom/NodeFilter.h 2015-04-29 21:21:52.032029064 -0400
-@@ -52,7 +52,7 @@
- * to the value of NodeType for the equivalent node type.
- */
- enum {
-- SHOW_ALL = 0xFFFFFFFF,
-+ SHOW_ALL = 256,
- SHOW_ELEMENT = 0x00000001,
- SHOW_ATTRIBUTE = 0x00000002,
- SHOW_TEXT = 0x00000004,
diff --git a/main/chromium/no-mallinfo.patch b/main/chromium/no-mallinfo.patch
index c84d762402..6e1063084a 100644
--- a/main/chromium/no-mallinfo.patch
+++ b/main/chromium/no-mallinfo.patch
@@ -11,31 +11,18 @@
uint64_t mem_usage =
--- ./base/trace_event/malloc_dump_provider.cc.orig
+++ ./base/trace_event/malloc_dump_provider.cc
-@@ -26,9 +26,10 @@
+@@ -29,6 +29,7 @@
// Called at trace dump point time. Creates a snapshot the memory counters for
// the current process.
bool MallocDumpProvider::OnMemoryDump(ProcessMemoryDump* pmd) {
+#if defined(__GLIBC__)
struct mallinfo info = mallinfo();
DCHECK_GE(info.arena + info.hblkhd, info.uordblks);
--
-+#endif
- MemoryAllocatorDump* dump = pmd->CreateAllocatorDump("malloc");
- if (!dump)
- return false;
---- ./base/trace_event/malloc_dump_provider.cc.orig
-+++ ./base/trace_event/malloc_dump_provider.cc
-@@ -39,12 +39,14 @@
- // |arena| is 0 and the outer pages size is reported by |hblkhd|. In case of
- // dlmalloc the total is given by |arena| + |hblkhd|.
- // For more details see link: http://goo.gl/fMR8lF.
-+#if defined(__GLIBC__)
- dump->AddScalar(MemoryAllocatorDump::kNameOuterSize,
- MemoryAllocatorDump::kUnitsBytes, info.arena + info.hblkhd);
- // Total allocated space is given by |uordblks|.
- dump->AddScalar(MemoryAllocatorDump::kNameInnerSize,
- MemoryAllocatorDump::kUnitsBytes, info.uordblks);
+@@ -46,6 +47,7 @@
+ MemoryAllocatorDump* inner_dump = pmd->CreateAllocatorDump(kAllocatedObjects);
+ inner_dump->AddScalar(MemoryAllocatorDump::kNameSize,
+ MemoryAllocatorDump::kUnitsBytes, info.uordblks);
+#endif
return true;
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-10 12:28:29 +0000