[gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/

[Mike Gilbert]

commit:     ed1600475e8bcde7b0fe01bcdb621a5e6c8ba049
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Mar  1 20:04:04 2018 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Mar  2 15:01:34 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed160047

www-client/chromium: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/7329

 www-client/chromium/files/chromium-gcc-r0.patch    |  55 ----------
 www-client/chromium/files/chromium-gcc-u2f.patch   |  45 --------
 www-client/chromium/files/chromium-vulkan-r0.patch | 120 ---------------------
 3 files changed, 220 deletions(-)

diff --git a/www-client/chromium/files/chromium-gcc-r0.patch b/www-client/chromium/files/chromium-gcc-r0.patch
deleted file mode 100644
index b0aaae8de55..00000000000
--- a/www-client/chromium/files/chromium-gcc-r0.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 353219b1d808a8980af93eff5412ec2863557e35 Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jose.dapena@×××.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@××××××××.org>
-Reviewed-by: Hayato Ito <hayato@××××××××.org>
-Commit-Queue: José Dapena Paz <jose.dapena@×××.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-gcc-u2f.patch b/www-client/chromium/files/chromium-gcc-u2f.patch
deleted file mode 100644
index 20608da58d0..00000000000
--- a/www-client/chromium/files/chromium-gcc-u2f.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From ee7f5ecc3b869660ded9882a9904cc7c6db7dc0d Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jose.dapena@×××.com>
-Date: Tue, 19 Dec 2017 19:25:00 +0000
-Subject: [PATCH] GCC build: workaround GCC bad "this" handling on lambda by
- not using lambda.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This is a workaround for the bug in GCC "Inconsistent `this->`
-required when calling member function in a lambda
-capturing `this` through another function"
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67274
-
-This fix just replaces the foreach call using lambda with a
-regular C++ for-each-like for (:) construct in u2f discovery.
-
-Change-Id: I9ddf212a7687e02cd7d2d2b43cf76e21dd5dada2
-Reviewed-on: https://chromium-review.googlesource.com/833886
-Reviewed-by: Jan Wilken Dörrie <jdoerrie@××××××××.org>
-Commit-Queue: José Dapena Paz <jose.dapena@×××.com>
-Cr-Commit-Position: refs/heads/master@{#525104}
----
- device/u2f/u2f_hid_discovery.cc | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/device/u2f/u2f_hid_discovery.cc b/device/u2f/u2f_hid_discovery.cc
-index 0695778d2aab..6c4e71179ce7 100644
---- a/device/u2f/u2f_hid_discovery.cc
-+++ b/device/u2f/u2f_hid_discovery.cc
-@@ -55,9 +55,8 @@ void U2fHidDiscovery::DeviceRemoved(
- 
- void U2fHidDiscovery::OnGetDevices(
-     std::vector<device::mojom::HidDeviceInfoPtr> device_infos) {
--  std::for_each(
--      device_infos.begin(), device_infos.end(),
--      [this](auto& device_info) { DeviceAdded(std::move(device_info)); });
-+  for (auto& device_info : device_infos)
-+    DeviceAdded(std::move(device_info));
-   NotifyDiscoveryStarted(true);
- }
- 
--- 
-2.15.1
-

diff --git a/www-client/chromium/files/chromium-vulkan-r0.patch b/www-client/chromium/files/chromium-vulkan-r0.patch
deleted file mode 100644
index 4553bb76667..00000000000
--- a/www-client/chromium/files/chromium-vulkan-r0.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From 949b4f07fd1ef5b208136fe38327c28c95f18928 Mon Sep 17 00:00:00 2001
-From: Jamie Madill <jmadill@××××××××.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@××××××××.org>
-Commit-Queue: Jamie Madill <jmadill@××××××××.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"