gfx/angle/angle-build-ttype.patch@129ffea94266 (annotated)
gfx/angle/angle-build-ttype.patch
Sat, 03 Jan 2015 20:18:00 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Sat, 03 Jan 2015 20:18:00 +0100
- branch
- TOR_BUG_3246
- changeset 7
- 129ffea94266
- permissions
- -rw-r--r--
Conditionally enable double key logic according to:
private browsing mode or privacy.thirdparty.isolate preference and
implement in GetCookieStringCommon and FindCookie where it counts...
With some reservations of how to convince FindCookie users to test
condition and pass a nullptr when disabling double key logic.
| michael@0 | 1 | From: Jeff Gilbert <jgilbert@mozilla.com> |
| michael@0 | 2 | |
| michael@0 | 3 | diff --git a/gfx/angle/src/compiler/Types.h b/gfx/angle/src/compiler/Types.h |
| michael@0 | 4 | --- a/gfx/angle/src/compiler/Types.h |
| michael@0 | 5 | +++ b/gfx/angle/src/compiler/Types.h |
| michael@0 | 6 | @@ -90,17 +90,17 @@ private: |
| michael@0 | 7 | // |
| michael@0 | 8 | // Base class for things that have a type. |
| michael@0 | 9 | // |
| michael@0 | 10 | class TType |
| michael@0 | 11 | { |
| michael@0 | 12 | public: |
| michael@0 | 13 | POOL_ALLOCATOR_NEW_DELETE(); |
| michael@0 | 14 | TType() {} |
| michael@0 | 15 | - TType(TBasicType t, TPrecision p, TQualifier q = EvqTemporary, int s = 1, bool m = false, bool a = false) : |
| michael@0 | 16 | + TType(TBasicType t, TPrecision p, TQualifier q = EvqTemporary, char s = 1, bool m = false, bool a = false) : |
| michael@0 | 17 | type(t), precision(p), qualifier(q), size(s), matrix(m), array(a), arraySize(0), structure(0) |
| michael@0 | 18 | { |
| michael@0 | 19 | } |
| michael@0 | 20 | explicit TType(const TPublicType &p); |
| michael@0 | 21 | TType(TStructure* userDef, TPrecision p = EbpUndefined) : |
| michael@0 | 22 | type(EbtStruct), precision(p), qualifier(EvqTemporary), size(1), matrix(false), array(false), arraySize(0), structure(userDef) |
| michael@0 | 23 | { |
| michael@0 | 24 | } |
| michael@0 | 25 | @@ -229,22 +229,22 @@ public: |
| michael@0 | 26 | |
| michael@0 | 27 | bool isStructureContainingArrays() const { |
| michael@0 | 28 | return structure ? structure->containsArrays() : false; |
| michael@0 | 29 | } |
| michael@0 | 30 | |
| michael@0 | 31 | private: |
| michael@0 | 32 | TString buildMangledName() const; |
| michael@0 | 33 | |
| michael@0 | 34 | - TBasicType type : 6; |
| michael@0 | 35 | + TBasicType type; |
| michael@0 | 36 | TPrecision precision; |
| michael@0 | 37 | - TQualifier qualifier : 7; |
| michael@0 | 38 | - int size : 8; // size of vector or matrix, not size of array |
| michael@0 | 39 | - unsigned int matrix : 1; |
| michael@0 | 40 | - unsigned int array : 1; |
| michael@0 | 41 | + TQualifier qualifier; |
| michael@0 | 42 | + char size; // size of vector or matrix, not size of array |
| michael@0 | 43 | + bool matrix; |
| michael@0 | 44 | + bool array; |
| michael@0 | 45 | int arraySize; |
| michael@0 | 46 | |
| michael@0 | 47 | TStructure* structure; // 0 unless this is a struct |
| michael@0 | 48 | |
| michael@0 | 49 | mutable TString mangled; |
| michael@0 | 50 | }; |
| michael@0 | 51 | |
| michael@0 | 52 | // |
