forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
www-client/chromium: beta channel bump (64.0.3282.39)
Package-Manager: Portage-2.3.19_p1, Repoman-2.3.6_p35
- Loading branch information
Showing
3 changed files
with
96 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
DIST chromium-63.0.3239.108.tar.xz 534294640 BLAKE2B f0f87115e91d7a2aa331cbab05475cac098f6ec37b8ca82b6a84911edcf0104a89557304467704911a3f3b3232d8a83d575bd545df1c31518e50c2563d83c095 SHA512 3cb7c8569d2d061f5abf4ad68d9ea1716a1b07bdf8dfa7b600d558d308374ff5dbda9f947e67e21186e3e716fe9524fc63e8eabd9eac1fa805f0eb7d994c32c8 | ||
DIST chromium-63.0.3239.84.tar.xz 534280828 BLAKE2B 08437f625a97ea49f274140a0444dc5531e7a178a99d04592194158817169f4b9c42769dd76b5df624b5189705b17b9b049f61c2474b411ee520439213f12513 SHA512 049a09a821606ff7f52fa8f41d34f0e67c02a20a346841dfcbb06c4138c60a62240f33d9255662260251e5be913a14b004cb2a12873d2ed34751be2b1efb3f34 | ||
DIST chromium-64.0.3282.14.tar.xz 482211216 BLAKE2B 0ffc69478719903e39998fd6f908883dadcb32580a64b1e8a93b270dfb221cb89b674c7e288649de24e468a56da78cdbf35af9693cd24f5cba158789db609d30 SHA512 75b851be4bf4814e91a4e7a036b7aa78d0c76e138605a42ebe9ce8d2017a1f95eb2dc67bd73f4fa911ce2a28cec769a699f52c98c2b1b3a037321af517692c28 | ||
DIST chromium-64.0.3282.24.tar.xz 482195676 BLAKE2B fdbe03cd5ee936913300beba18faf2a14b07a28a3904642bb4aef076c69914e1d058bde076e8f093836c4b5c548b7aa33c292b283f2807104ee5f5ebf87d6c91 SHA512 84bf757cf7a5ce08f81c4d2ef7b628b4bc393f457b81df8d86a4420a5cf68b61e01d5add6c6b221cbaf19f85b411228770d2c821e81cd8b0c16e27a455a96dff | ||
DIST chromium-64.0.3282.39.tar.xz 482357636 BLAKE2B 7e7209aa1c4584210b552e82b29c57af549492c85e96204b15c3d27d9ed3c89b7109c9bc539709ecc7221147c2cd4957b6dacf18bfa358c2568175e39eeb4a84 SHA512 16d7c16b218fb42a1371fe105b87a04fce0397df0912824fd443667a1b93ee65b1b9f7c8c3007bea8fc241e6a1b6cb4fa29a4f37c83b3fdfdd8ed6a6523e6906 | ||
DIST chromium-65.0.3294.5.tar.xz 484687920 BLAKE2B 2d4d30ea83bfa0d5753eecd4ea735ec5d81097867b7c32c190853adee372c5032dac549c064fb22688555ef6231a3e2e43b274735883285f91a0a2d9c7a151ec SHA512 089bcc7eba7d5a2a964b5b6e94c7735653582cd6925325b9bdb2788bd4abb4b3cbc8c71f5c77004600864106a18da3fddda0adaa53ad54a96efe21498e45f23a |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,89 @@ | ||
From 030017a4855c7b6e7f2ff8d9566c146f31eb301b Mon Sep 17 00:00:00 2001 | ||
From: Kai Ninomiya <[email protected]> | ||
Date: Wed, 06 Dec 2017 14:06:53 -0800 | ||
Subject: [PATCH] Mark StaticType related functions as constexpr | ||
|
||
Fixes compilation on some versions of GCC and probably Clang. | ||
|
||
Follow-up to http://crrev.com/c/786317 | ||
|
||
Bug: angleproject:1432 | ||
Change-Id: I3fc3ad0f65492f9543eb27fcdce6ca29a9ad06e5 | ||
Reviewed-on: https://chromium-review.googlesource.com/812220 | ||
Reviewed-by: Jamie Madill <[email protected]> | ||
Commit-Queue: Kai Ninomiya <[email protected]> | ||
--- | ||
|
||
diff --git a/third_party/angle/src/compiler/translator/StaticType.h b/third_party/angle/src/compiler/translator/StaticType.h | ||
index e26e5ff..30b391a 100644 | ||
--- a/third_party/angle/src/compiler/translator/StaticType.h | ||
+++ b/third_party/angle/src/compiler/translator/StaticType.h | ||
@@ -160,7 +160,7 @@ | ||
TPrecision precision, | ||
TQualifier qualifier, | ||
unsigned char secondarySize> | ||
-const TType *GetForVecMatHelper(unsigned char primarySize) | ||
+constexpr const TType *GetForVecMatHelper(unsigned char primarySize) | ||
{ | ||
static_assert(basicType == EbtFloat || basicType == EbtInt || basicType == EbtUInt || | ||
basicType == EbtBool, | ||
@@ -186,7 +186,7 @@ | ||
template <TBasicType basicType, | ||
TPrecision precision = EbpUndefined, | ||
TQualifier qualifier = EvqGlobal> | ||
-const TType *GetForVecMat(unsigned char primarySize, unsigned char secondarySize = 1) | ||
+constexpr const TType *GetForVecMat(unsigned char primarySize, unsigned char secondarySize = 1) | ||
{ | ||
static_assert(basicType == EbtFloat || basicType == EbtInt || basicType == EbtUInt || | ||
basicType == EbtBool, | ||
@@ -208,7 +208,7 @@ | ||
} | ||
|
||
template <TBasicType basicType, TPrecision precision = EbpUndefined> | ||
-const TType *GetForVec(TQualifier qualifier, unsigned char size) | ||
+constexpr const TType *GetForVec(TQualifier qualifier, unsigned char size) | ||
{ | ||
switch (qualifier) | ||
{ | ||
diff --git a/third_party/angle/src/compiler/translator/SymbolTable.cpp b/third_party/angle/src/compiler/translator/SymbolTable.cpp | ||
index adf1e4e..90d4c15 100644 | ||
--- a/third_party/angle/src/compiler/translator/SymbolTable.cpp | ||
+++ b/third_party/angle/src/compiler/translator/SymbolTable.cpp | ||
@@ -236,7 +236,7 @@ | ||
pop(); | ||
} | ||
|
||
-bool IsGenType(const TType *type) | ||
+constexpr bool IsGenType(const TType *type) | ||
{ | ||
if (type) | ||
{ | ||
@@ -248,7 +248,7 @@ | ||
return false; | ||
} | ||
|
||
-bool IsVecType(const TType *type) | ||
+constexpr bool IsVecType(const TType *type) | ||
{ | ||
if (type) | ||
{ | ||
diff --git a/third_party/angle/src/compiler/translator/Types.h b/third_party/angle/src/compiler/translator/Types.h | ||
index 04f46f1..a54d447 100644 | ||
--- a/third_party/angle/src/compiler/translator/Types.h | ||
+++ b/third_party/angle/src/compiler/translator/Types.h | ||
@@ -142,13 +142,13 @@ | ||
{ | ||
} | ||
|
||
- TBasicType getBasicType() const { return type; } | ||
+ constexpr TBasicType getBasicType() const { return type; } | ||
void setBasicType(TBasicType t); | ||
|
||
TPrecision getPrecision() const { return precision; } | ||
void setPrecision(TPrecision p) { precision = p; } | ||
|
||
- TQualifier getQualifier() const { return qualifier; } | ||
+ constexpr TQualifier getQualifier() const { return qualifier; } | ||
void setQualifier(TQualifier q) { qualifier = q; } | ||
|
||
bool isInvariant() const { return invariant; } |