summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2018-01-13 21:31:48 -0500
committerMike Gilbert <floppym@gentoo.org>2018-01-13 21:32:20 -0500
commit6c3b7c4ea7c9df81989d27583719879f886a9f61 (patch)
treee22f4f4ac532a0a0ac8d3a3c8adcf94c32a36962 /www-client/chromium/files
parentsys-cluster/heat: fix spelling, bug 644454 (diff)
downloadgentoo-6c3b7c4ea7c9df81989d27583719879f886a9f61.tar.gz
gentoo-6c3b7c4ea7c9df81989d27583719879f886a9f61.tar.bz2
gentoo-6c3b7c4ea7c9df81989d27583719879f886a9f61.zip
www-client/chromium: dev channel bump (65.0.3315.3)
Package-Manager: Portage-2.3.19_p11, Repoman-2.3.6_p45
Diffstat (limited to 'www-client/chromium/files')
-rw-r--r--www-client/chromium/files/chromium-gcc-r0.patch55
-rw-r--r--www-client/chromium/files/chromium-gn-r0.patch33
-rw-r--r--www-client/chromium/files/chromium-vulkan-r0.patch120
3 files changed, 208 insertions, 0 deletions
diff --git a/www-client/chromium/files/chromium-gcc-r0.patch b/www-client/chromium/files/chromium-gcc-r0.patch
new file mode 100644
index 000000000000..b0aaae8de558
--- /dev/null
+++ b/www-client/chromium/files/chromium-gcc-r0.patch
@@ -0,0 +1,55 @@
+From 353219b1d808a8980af93eff5412ec2863557e35 Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jose.dapena@lge.com>
+Date: Wed, 10 Jan 2018 15:34:25 +0000
+Subject: [PATCH] GCC fixes: avoid symbol collision between Element::ComputedAccessibleNode and ComputedAccessibleNode.
+
+GCC at least fails to compile if the method has the same name of the class. To avoid
+this we rename the getter method to be prefixed with Get.
+
+Change-Id: I7f7ac2ecf0947718f72e78ccef019c3239c9b921
+Reviewed-on: https://chromium-review.googlesource.com/857716
+Reviewed-by: Daniel Cheng <dcheng@chromium.org>
+Reviewed-by: Hayato Ito <hayato@chromium.org>
+Commit-Queue: José Dapena Paz <jose.dapena@lge.com>
+Cr-Commit-Position: refs/heads/master@{#528322}
+---
+
+diff --git a/third_party/WebKit/Source/core/dom/Element.cpp b/third_party/WebKit/Source/core/dom/Element.cpp
+index 4f50b7d..d0fa7b1 100644
+--- a/third_party/WebKit/Source/core/dom/Element.cpp
++++ b/third_party/WebKit/Source/core/dom/Element.cpp
+@@ -1276,7 +1276,7 @@
+ return rare_data.EnsureAccessibleNode(this);
+ }
+
+-ComputedAccessibleNode* Element::ComputedAccessibleNode() {
++ComputedAccessibleNode* Element::GetComputedAccessibleNode() {
+ if (!RuntimeEnabledFeatures::AccessibilityObjectModelEnabled())
+ return nullptr;
+
+diff --git a/third_party/WebKit/Source/core/dom/Element.h b/third_party/WebKit/Source/core/dom/Element.h
+index 733596b..986e31a 100644
+--- a/third_party/WebKit/Source/core/dom/Element.h
++++ b/third_party/WebKit/Source/core/dom/Element.h
+@@ -295,7 +295,7 @@
+ AccessibleNode* ExistingAccessibleNode() const;
+ AccessibleNode* accessibleNode();
+
+- ComputedAccessibleNode* ComputedAccessibleNode();
++ ComputedAccessibleNode* GetComputedAccessibleNode();
+
+ void DidMoveToNewDocument(Document&) override;
+
+diff --git a/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp b/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp
+index 642f55f..f6a8d8e 100644
+--- a/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp
++++ b/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp
+@@ -1110,7 +1110,7 @@
+ Element* element) {
+ DCHECK(element);
+ ComputedAccessibleNode* computed_accessible_node =
+- element->ComputedAccessibleNode();
++ element->GetComputedAccessibleNode();
+ return computed_accessible_node->ComputePromiseProperty(script_state);
+ }
+
diff --git a/www-client/chromium/files/chromium-gn-r0.patch b/www-client/chromium/files/chromium-gn-r0.patch
new file mode 100644
index 000000000000..8f01e864ce5e
--- /dev/null
+++ b/www-client/chromium/files/chromium-gn-r0.patch
@@ -0,0 +1,33 @@
+From 47b25a1f83f8166c6cd5cf1f13bf6dcce125511a Mon Sep 17 00:00:00 2001
+From: Tom Anderson <thomasanderson@chromium.org>
+Date: Tue, 9 Jan 2018 15:23:14 -0800
+Subject: [PATCH] Fix gn bootstrap
+
+BUG=800553
+R=dpranke@chromium.org
+
+Change-Id: I5c1cfeb7542bf990c59451aabcae7c120cbf09c0
+Reviewed-on: https://chromium-review.googlesource.com/858276
+Reviewed-by: Dirk Pranke <dpranke@chromium.org>
+Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#528197}
+---
+ tools/gn/bootstrap/bootstrap.py | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
+index a0f32ad31df0..5376c6253a32 100755
+--- a/tools/gn/bootstrap/bootstrap.py
++++ b/tools/gn/bootstrap/bootstrap.py
+@@ -178,6 +178,11 @@ def build_gn_with_ninja_manually(tempdir, options):
+ root_gen_dir = os.path.join(tempdir, 'gen')
+ mkdir_p(root_gen_dir)
+
++ write_buildflag_header_manually(
++ root_gen_dir,
++ 'base/synchronization/synchronization_flags.h',
++ {'ENABLE_MUTEX_PRIORITY_INHERITANCE': 'false'})
++
+ write_buildflag_header_manually(root_gen_dir, 'base/allocator/features.h',
+ {'USE_ALLOCATOR_SHIM': 'true' if is_linux else 'false'})
+
diff --git a/www-client/chromium/files/chromium-vulkan-r0.patch b/www-client/chromium/files/chromium-vulkan-r0.patch
new file mode 100644
index 000000000000..4553bb766679
--- /dev/null
+++ b/www-client/chromium/files/chromium-vulkan-r0.patch
@@ -0,0 +1,120 @@
+From 949b4f07fd1ef5b208136fe38327c28c95f18928 Mon Sep 17 00:00:00 2001
+From: Jamie Madill <jmadill@chromium.org>
+Date: Mon, 08 Jan 2018 11:15:38 -0500
+Subject: [PATCH] Vulkan: Allow for no .git directory in build.
+
+The SPIRV-Tools 'external revision generate' script is coded such that
+it assumes a .git folder is present. This causes a problem for the
+tarball build. We can fix this by using the same tooling we use for
+ANGLE's commit id script to check if the .git directory is present
+before running the generator. If it is missing, we insert a hard-coded
+dummy header. Also use the 'DEPS' file as a placeholder for .git/HEAD
+to check if the current revision needs updating.
+
+Bug: chromium:799620
+Bug: angleproject:2237
+Change-Id: Icea8e9c66f1600df7dca2aaa45fe449f687f5b55
+Reviewed-on: https://chromium-review.googlesource.com/854255
+Reviewed-by: Jamie Madill <jmadill@chromium.org>
+Commit-Queue: Jamie Madill <jmadill@chromium.org>
+---
+
+diff --git a/third_party/angle/src/commit_id.py b/third_party/angle/src/commit_id.py
+index bbdb810..57651a5 100644
+--- a/third_party/angle/src/commit_id.py
++++ b/third_party/angle/src/commit_id.py
+@@ -23,6 +23,9 @@
+ print("0")
+ sys.exit(0)
+
++if len(sys.argv) < 4 or operation != 'gen':
++ sys.exit(usage)
++
+ output_file = sys.argv[3]
+ commit_id_size = 12
+
+diff --git a/third_party/angle/src/vulkan_support/BUILD.gn b/third_party/angle/src/vulkan_support/BUILD.gn
+index fe61826..24f5a3a 100644
+--- a/third_party/angle/src/vulkan_support/BUILD.gn
++++ b/third_party/angle/src/vulkan_support/BUILD.gn
+@@ -145,21 +145,40 @@
+ }
+ }
+
+-# This could be generalized to a foreach if other revisions are added.
+-action("spirv_tools_external_revision_generate") {
+- script = "$vulkan_layers_dir/scripts/external_revision_generator.py"
+- inputs = [
+- "$spirv_tools_dir/.git/HEAD",
+- "$spirv_tools_dir/.git/index",
+- ]
+- outputs = [
+- "$vulkan_gen_dir/spirv_tools_commit_id.h",
+- ]
+- args = [
+- "$raw_spirv_tools_dir",
+- "SPIRV_TOOLS_COMMIT_ID",
+- "$raw_vulkan_gen_dir/spirv_tools_commit_id.h",
+- ]
++spirv_git_is_present = exec_script("$angle_root/src/commit_id.py",
++ [
++ "check",
++ raw_spirv_tools_dir,
++ ],
++ "value")
++
++spirv_use_commit_id = spirv_git_is_present == 1
++
++if (spirv_use_commit_id) {
++ # This could be generalized to a foreach if other revisions are added.
++ action("spirv_tools_external_revision_generate") {
++ script = "$vulkan_layers_dir/scripts/external_revision_generator.py"
++ inputs = [
++ "$angle_root/DEPS",
++ ]
++ outputs = [
++ "$vulkan_gen_dir/spirv_tools_commit_id.h",
++ ]
++ args = [
++ "$raw_spirv_tools_dir",
++ "SPIRV_TOOLS_COMMIT_ID",
++ "$raw_vulkan_gen_dir/spirv_tools_commit_id.h",
++ ]
++ }
++} else {
++ copy("spirv_tools_external_revision_generate") {
++ sources = [
++ "dummy_spirv_tools_commit_id.h",
++ ]
++ outputs = [
++ "$vulkan_gen_dir/spirv_tools_commit_id.h",
++ ]
++ }
+ }
+
+ config("vulkan_generate_helper_files_config") {
+@@ -864,7 +883,7 @@
+ sources += [ "$vulkan_layers_dir/layers/VkLayer_$name.def" ]
+ }
+ if (is_linux) {
+- ldflags = [ "-Wl,-Bsymbolic,--exclude-libs,ALL" ]
++ ldflags = [ "-Wl,-Bsymbolic,--exclude-libs,ALL" ]
+ }
+ }
+ }
+diff --git a/third_party/angle/src/vulkan_support/dummy_spirv_tools_commit_id.h b/third_party/angle/src/vulkan_support/dummy_spirv_tools_commit_id.h
+new file mode 100644
+index 0000000..e1793bd
+--- /dev/null
++++ b/third_party/angle/src/vulkan_support/dummy_spirv_tools_commit_id.h
+@@ -0,0 +1,10 @@
++//
++// Copyright 2018 The ANGLE Project Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++//
++// This file is a dummy file to enable building SPIRV tools when git is absent.
++
++#pragma once
++
++#define SPIRV_TOOLS_COMMIT_ID "0000000000000000000000000000000000000000"