testing/chromium: multiple fixes

fix typo in config
fix another bug in sanbox
fix gpu issue: https://codereview.chromium.org/1107683002/

4 files changed, 47 insertions, 11 deletions

diff --git a/testing/chromium/APKBUILD b/testing/chromium/APKBUILD
index 6ae7eab483..c206056186 100644
--- a/testing/chromium/APKBUILD
+++ b/testing/chromium/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:
 pkgname=chromium
 pkgver=43.0.2357.132
-pkgrel=3
+pkgrel=4
 pkgdesc="chromium web browser"
 url="http://www.chromium.org/"
 arch="x86_64"
@@ -40,6 +40,7 @@ source="https://commondatastorage.googleapis.com/chromium-browser-official/$pkgn
 	chromium-system-libvpx-r0.patch
 	chromium-system-jinja-r7.patch
 	chromium-widevine.patch
+	issue1107683002_20001_30001.patch
 	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -214,7 +215,7 @@ package() {
 
 md5sums="aba8a1b9945d2c0f203294e43b68cdab  chromium-43.0.2357.132.tar.xz
 b6d015c1da85aa65ee21bc974c7fc7d2  chromium-launcher.sh
-dcec0dd51529f595b62910bd255ede16  chromium.conf
+c5aa73a87d4b88cce9f1a680ca691bb6  chromium.conf
 2962ac6259e39a797d441daf43aa49c9  chromium.desktop
 2d2ee5f22d65c756871301b4a407f4ca  google-api.keys
 96277e7ddc26c8bdd50fb63eff2f4ce0  gcc5-fixes.patch
@@ -223,14 +224,15 @@ dcec0dd51529f595b62910bd255ede16  chromium.conf
 af047840f31e99aa36be04edc3482afd  resolver.patch
 a11a60155a9faf6ca648aaa06c81f29e  no-mallinfo.patch
 2c8de771a7c0e5e0e9fc68fa978785f7  no-getcontext.patch
-f99bb2ee8947418720a270ffa027c189  musl-sandbox.patch
+4f22f0d05448c49d6501386523a081ba  musl-sandbox.patch
 2b7291195c467f8135473e543c1c7dad  chromium-hotwording-2403.patch
 9a73cf075dc321dfe781f5bed4920d6c  chromium-system-libvpx-r0.patch
 97b1578585ab600ed9adef4f341ccd80  chromium-system-jinja-r7.patch
-de717d6430532f34fe161035dfdafcdf  chromium-widevine.patch"
+de717d6430532f34fe161035dfdafcdf  chromium-widevine.patch
+eb577b0daae37843d70844020d46f9d5  issue1107683002_20001_30001.patch"
 sha256sums="405f52c6649f1d2937952fbcfcd238ba058db7d13edf4705f7027805f3ce1809  chromium-43.0.2357.132.tar.xz
 89f1eb19d1ed998a190045ea173959f01faee3490d58a6a34ca3fe21228e569f  chromium-launcher.sh
-feb7c7d77f328da41e61ff6370d376f936a773b67a0d9264963020dba7d69061  chromium.conf
+b466559340a36998354a0577325fe533d9e6b74c24a15b7599671171506bf128  chromium.conf
 3ae90cea7503d0039de53448ed112b9bc0cb5a09f6b0045506eb777fc23517e5  chromium.desktop
 267ba8ff50574e51d2582c4fca9b9e14f7225c1fa064d135cbceff9cef2324ac  google-api.keys
 ee32d8a89cc51cb71a8d4aa82b196b145f43a2fc3ba9687f9c06c053601d5fe7  gcc5-fixes.patch
@@ -239,14 +241,15 @@ ac38e2d1238b7062ee8c99ff7772477fa2d5328a750eab47553687e3782dc7a9  musl-fixes.pat
 f16c63d4188fe56732dc6760307795ba4059452c4cf3de1460cbcb2616011511  resolver.patch
 3e732ba5bbe324932a06a782bae655003089f5dc52a7bb2b790aa4837e20be8e  no-mallinfo.patch
 ea79f9a46116c8b56bbc69d226abd9252e4ae4d946ca695203f2298279cc2211  no-getcontext.patch
-8ed74cce08d0825e46eb21500a787d38ff2ac536b2ac1dff0bffc08d1257d278  musl-sandbox.patch
+20fcb99022f3a737dceea7349da61e12a85834c0ab65a02009b6f56acb8b0f07  musl-sandbox.patch
 7d20f05bbd2b9ba363b28ed591cd0c770b4d7365a7ca9d20b5f6a268f6af2122  chromium-hotwording-2403.patch
 06b26f3459e2f60866eb28803f129c59e064b082eae76126de60463706739f8c  chromium-system-libvpx-r0.patch
 872f5a38d8263b14308bb117828496a4093d0e6ad755d39d2c5e6857314fe071  chromium-system-jinja-r7.patch
-1d1ead77250475228524770e57c17282aff9098c5efc3d7719b0df76229b8874  chromium-widevine.patch"
+1d1ead77250475228524770e57c17282aff9098c5efc3d7719b0df76229b8874  chromium-widevine.patch
+f634567b717568ca2e06b2e10862f31c6cc5a86e09214bc771a94030167ed222  issue1107683002_20001_30001.patch"
 sha512sums="077539f267a8a196a251334546219f3459b30dff3e56d2573b011464cef3b60da49243a123834bd59ad32c78d82b6a90fb2cea95f57bf50a440f689b251a4eba  chromium-43.0.2357.132.tar.xz
 b9a810416dd7a8ffc3a5ced85ad9acebda1665bd08a57eec7b189698cc5f74d2c3fd69044e20fcb83297a43214b2772a1312b2c6122ea0eb716abacf39524d60  chromium-launcher.sh
-7045daf26a2a155b98daa28e271f3fbde8e0ab87cb629a4afd25319ae1616327760c8bcc44766e0346d13da60bd25e55fa8cc69fad9f3dca8a71b14eec8c51f5  chromium.conf
+f6d962b9e4c22dd42183df3db5d3202dab33eccecafb1bf63ca678147289581262db1e5e64cbe8f9c212beefb0a6717bb8d311e497f56b55fe95b8bab2db493f  chromium.conf
 e182c998a43d22d1c76a86c561619afd1fca8c2be668265ad5e2f81a3806f7a154272cc027a2f8b370fb69446892c69e5967a4be76082325c14245ee7915234c  chromium.desktop
 2d8237a940ea691bd10b08315429677a587f7ef9692a0cca53bfd066eae82998a6c71f402a8669e9de39f94d7f3280745d1628ea6eac5d76ca7116844d4e0dac  google-api.keys
 e2390cdeb2a75aad51d5da07819e1375fcf2092535eaa86545b9bc0160eff9e3981f946029ed8fc337df4c56a8b8cc7945821d2636b09e320dea2c8884022a59  gcc5-fixes.patch
@@ -255,8 +258,9 @@ febb6a204bcffda8dc3d80e75563710745e383cb30e460db5d8c5ded3d40f8a872461719283260f5
 987f18d37824676e5d874a6fde1099bcc558920e7781de5f34e612411013e4fac9ca421a3cce1ed5f82401c4d54212b6f47a0a856892a78543b8e400a4bb0489  resolver.patch
 511a3852d6172c14c651c316f1f874cfd23be0fde1c4285565dfead02e5865a1b240c40e270c940a23c55e2d3f2cfecbf3b5477bf9e6d3cf920d7c60331dc3c3  no-mallinfo.patch
 42d9a6ebea2d95cdc169b921cc1a1b846cf500997059fd3084de09e21f00b63b76e60c6124f4af247d402ff5ca3f4bf8867a6f2c78198c05b4273ca01fb29241  no-getcontext.patch
-4075743c74a58e207eea77c2d1e25c7b7b4e5351d3bb2ed47cf9ac620dbe3b55e0f847c955d9d96d49db536fdd36b9f220aded337813d4ccfbd80c4ae7737f11  musl-sandbox.patch
+cc61407bae55523fd3d0b43be7cf827cd6a648314a81f8d78f830e60cb215ede6c585d8755e9c870bb98955a4d3679205cbefde6f4efcb0e48469169167823eb  musl-sandbox.patch
 38dcbae0d9bc63c044d50bd395692007642af705e1bbb9b704f3f349a48e45ca2b7f8495dbafbb4333b8bdb84ac53e5611eba4fe3d4fc7e841b319b4d744c324  chromium-hotwording-2403.patch
 fe5801b63e7cb58c4653e6f4542de070cb5bf88e0d99fdd0bb7b45ba928be065ebda41fb1f5fa32f4a55d321b8765df53a977bf2d1418b030846a9e2b2fd1c1d  chromium-system-libvpx-r0.patch
 10bcc6a467b6766d13b5e41e7b7dcdbd62de7c04daad16c83037e88043032a0c118627029f91ef8a2a57faaaebc8b6f4ee16e8d1fecb5921d0d49efd60a27863  chromium-system-jinja-r7.patch
-4a11b46afa8ce84bd23a8c506301b5848ee4291a764f3aed282b8a98706ece16cf9346dec6cc71b1e17812b15f43a5cbc7bc6d38ed4dcc88c12d6fcb03bd9295  chromium-widevine.patch"
+4a11b46afa8ce84bd23a8c506301b5848ee4291a764f3aed282b8a98706ece16cf9346dec6cc71b1e17812b15f43a5cbc7bc6d38ed4dcc88c12d6fcb03bd9295  chromium-widevine.patch
+c2015fd83c1cb659c275d18cc457882c97e53d7a4649effe1d7107325313f50eaabd70e5b562d619fa51b980481b8daa0a15277dc9bf2472941293a8c444ddf2  issue1107683002_20001_30001.patch"
diff --git a/testing/chromium/chromium.conf b/testing/chromium/chromium.conf
index f88d35898d..a8b8db37f5 100644
--- a/testing/chromium/chromium.conf
+++ b/testing/chromium/chromium.conf
@@ -1,4 +1,4 @@
-# Default settings for chromium. This file is sourced by /bin.sh from
+# Default settings for chromium. This file is sourced by /bin/sh from
 # the chromium launcher.
 
 # Options to pass to chromium.
diff --git a/testing/chromium/issue1107683002_20001_30001.patch b/testing/chromium/issue1107683002_20001_30001.patch
new file mode 100644
index 0000000000..1a237b6387
--- /dev/null
+++ b/testing/chromium/issue1107683002_20001_30001.patch
@@ -0,0 +1,14 @@
+Index: gpu/command_buffer/service/gles2_cmd_decoder.cc
+diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
+index 04a9eb25443cb2a25d52400ba714c850ea63eca6..9c43f88e81fe60ef82b0bf17e41c2781350164c3 100644
+--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
++++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
+@@ -2737,7 +2737,7 @@ bool GLES2DecoderImpl::Initialize(
+     // make it appear RGB. If on the other hand we ask for RGBA nd get RGB we
+     // can't do anything about that.
+ 
+-    if (!surfaceless_) {
++    if (!surfaceless_ && !surface_->IsOffscreen()) {
+       GLint alpha_bits = 0;
+       GLint depth_bits = 0;
+       GLint stencil_bits = 0;
diff --git a/testing/chromium/musl-sandbox.patch b/testing/chromium/musl-sandbox.patch
index ef69e550dc..3f244f03e6 100644
--- a/testing/chromium/musl-sandbox.patch
+++ b/testing/chromium/musl-sandbox.patch
@@ -46,3 +46,21 @@
  #if defined(__x86_64__)
      case __NR_epoll_wait_old:
  #endif
+--- ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc.orig
++++ ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -494,6 +494,7 @@
+     case __NR_mlock:
+     case __NR_munlock:
+     case __NR_munmap:
++    case __NR_mremap:
+       return true;
+     case __NR_madvise:
+     case __NR_mincore:
+@@ -509,7 +510,6 @@
+     case __NR_modify_ldt:
+ #endif
+     case __NR_mprotect:
+-    case __NR_mremap:
+     case __NR_msync:
+     case __NR_munlockall:
+     case __NR_readahead: