gfx/angle/angle-build-dedupe-debug-cpp-h.patch@97036ab72558 (annotated)
gfx/angle/angle-build-dedupe-debug-cpp-h.patch
Tue, 06 Jan 2015 21:39:09 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Tue, 06 Jan 2015 21:39:09 +0100
- branch
- TOR_BUG_9701
- changeset 8
- 97036ab72558
- permissions
- -rw-r--r--
Conditionally force memory storage according to privacy.thirdparty.isolate;
This solves Tor bug #9701, complying with disk avoidance documented in
https://www.torproject.org/projects/torbrowser/design/#disk-avoidance.
| michael@0 | 1 | From: Jeff Gilbert <jgilbert@mozilla.com> |
| michael@0 | 2 | |
| michael@0 | 3 | diff --git a/gfx/angle/src/compiler/Diagnostics.cpp b/gfx/angle/src/compiler/Diagnostics.cpp |
| michael@0 | 4 | --- a/gfx/angle/src/compiler/Diagnostics.cpp |
| michael@0 | 5 | +++ b/gfx/angle/src/compiler/Diagnostics.cpp |
| michael@0 | 6 | @@ -1,17 +1,17 @@ |
| michael@0 | 7 | // |
| michael@0 | 8 | // Copyright (c) 2012 The ANGLE Project Authors. All rights reserved. |
| michael@0 | 9 | // Use of this source code is governed by a BSD-style license that can be |
| michael@0 | 10 | // found in the LICENSE file. |
| michael@0 | 11 | // |
| michael@0 | 12 | |
| michael@0 | 13 | #include "compiler/Diagnostics.h" |
| michael@0 | 14 | |
| michael@0 | 15 | -#include "compiler/debug.h" |
| michael@0 | 16 | +#include "compiler/compiler_debug.h" |
| michael@0 | 17 | #include "compiler/InfoSink.h" |
| michael@0 | 18 | #include "compiler/preprocessor/SourceLocation.h" |
| michael@0 | 19 | |
| michael@0 | 20 | TDiagnostics::TDiagnostics(TInfoSink& infoSink) : |
| michael@0 | 21 | mInfoSink(infoSink), |
| michael@0 | 22 | mNumErrors(0), |
| michael@0 | 23 | mNumWarnings(0) |
| michael@0 | 24 | { |
| michael@0 | 25 | diff --git a/gfx/angle/src/compiler/DirectiveHandler.cpp b/gfx/angle/src/compiler/DirectiveHandler.cpp |
| michael@0 | 26 | --- a/gfx/angle/src/compiler/DirectiveHandler.cpp |
| michael@0 | 27 | +++ b/gfx/angle/src/compiler/DirectiveHandler.cpp |
| michael@0 | 28 | @@ -3,17 +3,17 @@ |
| michael@0 | 29 | // Use of this source code is governed by a BSD-style license that can be |
| michael@0 | 30 | // found in the LICENSE file. |
| michael@0 | 31 | // |
| michael@0 | 32 | |
| michael@0 | 33 | #include "compiler/DirectiveHandler.h" |
| michael@0 | 34 | |
| michael@0 | 35 | #include <sstream> |
| michael@0 | 36 | |
| michael@0 | 37 | -#include "compiler/debug.h" |
| michael@0 | 38 | +#include "compiler/compiler_debug.h" |
| michael@0 | 39 | #include "compiler/Diagnostics.h" |
| michael@0 | 40 | |
| michael@0 | 41 | static TBehavior getBehavior(const std::string& str) |
| michael@0 | 42 | { |
| michael@0 | 43 | static const std::string kRequire("require"); |
| michael@0 | 44 | static const std::string kEnable("enable"); |
| michael@0 | 45 | static const std::string kDisable("disable"); |
| michael@0 | 46 | static const std::string kWarn("warn"); |
| michael@0 | 47 | diff --git a/gfx/angle/src/compiler/OutputGLSLBase.cpp b/gfx/angle/src/compiler/OutputGLSLBase.cpp |
| michael@0 | 48 | --- a/gfx/angle/src/compiler/OutputGLSLBase.cpp |
| michael@0 | 49 | +++ b/gfx/angle/src/compiler/OutputGLSLBase.cpp |
| michael@0 | 50 | @@ -1,16 +1,16 @@ |
| michael@0 | 51 | // |
| michael@0 | 52 | // Copyright (c) 2002-2011 The ANGLE Project Authors. All rights reserved. |
| michael@0 | 53 | // Use of this source code is governed by a BSD-style license that can be |
| michael@0 | 54 | // found in the LICENSE file. |
| michael@0 | 55 | // |
| michael@0 | 56 | |
| michael@0 | 57 | #include "compiler/OutputGLSLBase.h" |
| michael@0 | 58 | -#include "compiler/debug.h" |
| michael@0 | 59 | +#include "compiler/compiler_debug.h" |
| michael@0 | 60 | |
| michael@0 | 61 | #include <cfloat> |
| michael@0 | 62 | |
| michael@0 | 63 | namespace |
| michael@0 | 64 | { |
| michael@0 | 65 | TString arrayBrackets(const TType& type) |
| michael@0 | 66 | { |
| michael@0 | 67 | ASSERT(type.isArray()); |
| michael@0 | 68 | diff --git a/gfx/angle/src/compiler/OutputHLSL.cpp b/gfx/angle/src/compiler/OutputHLSL.cpp |
| michael@0 | 69 | --- a/gfx/angle/src/compiler/OutputHLSL.cpp |
| michael@0 | 70 | +++ b/gfx/angle/src/compiler/OutputHLSL.cpp |
| michael@0 | 71 | @@ -2,17 +2,17 @@ |
| michael@0 | 72 | // Copyright (c) 2002-2013 The ANGLE Project Authors. All rights reserved. |
| michael@0 | 73 | // Use of this source code is governed by a BSD-style license that can be |
| michael@0 | 74 | // found in the LICENSE file. |
| michael@0 | 75 | // |
| michael@0 | 76 | |
| michael@0 | 77 | #include "compiler/OutputHLSL.h" |
| michael@0 | 78 | |
| michael@0 | 79 | #include "common/angleutils.h" |
| michael@0 | 80 | -#include "compiler/debug.h" |
| michael@0 | 81 | +#include "compiler/compiler_debug.h" |
| michael@0 | 82 | #include "compiler/DetectDiscontinuity.h" |
| michael@0 | 83 | #include "compiler/InfoSink.h" |
| michael@0 | 84 | #include "compiler/SearchSymbol.h" |
| michael@0 | 85 | #include "compiler/UnfoldShortCircuit.h" |
| michael@0 | 86 | |
| michael@0 | 87 | #include <algorithm> |
| michael@0 | 88 | #include <cfloat> |
| michael@0 | 89 | #include <stdio.h> |
| michael@0 | 90 | diff --git a/gfx/angle/src/compiler/Types.h b/gfx/angle/src/compiler/Types.h |
| michael@0 | 91 | --- a/gfx/angle/src/compiler/Types.h |
| michael@0 | 92 | +++ b/gfx/angle/src/compiler/Types.h |
| michael@0 | 93 | @@ -6,17 +6,17 @@ |
| michael@0 | 94 | |
| michael@0 | 95 | #ifndef _TYPES_INCLUDED |
| michael@0 | 96 | #define _TYPES_INCLUDED |
| michael@0 | 97 | |
| michael@0 | 98 | #include "common/angleutils.h" |
| michael@0 | 99 | |
| michael@0 | 100 | #include "compiler/BaseTypes.h" |
| michael@0 | 101 | #include "compiler/Common.h" |
| michael@0 | 102 | -#include "compiler/debug.h" |
| michael@0 | 103 | +#include "compiler/compiler_debug.h" |
| michael@0 | 104 | |
| michael@0 | 105 | struct TPublicType; |
| michael@0 | 106 | class TType; |
| michael@0 | 107 | |
| michael@0 | 108 | class TField |
| michael@0 | 109 | { |
| michael@0 | 110 | public: |
| michael@0 | 111 | POOL_ALLOCATOR_NEW_DELETE(); |
| michael@0 | 112 | diff --git a/gfx/angle/src/compiler/debug.cpp b/gfx/angle/src/compiler/compiler_debug.cpp |
| michael@0 | 113 | rename from gfx/angle/src/compiler/debug.cpp |
| michael@0 | 114 | rename to gfx/angle/src/compiler/compiler_debug.cpp |
| michael@0 | 115 | --- a/gfx/angle/src/compiler/debug.cpp |
| michael@0 | 116 | +++ b/gfx/angle/src/compiler/compiler_debug.cpp |
| michael@0 | 117 | @@ -1,17 +1,17 @@ |
| michael@0 | 118 | // |
| michael@0 | 119 | // Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved. |
| michael@0 | 120 | // Use of this source code is governed by a BSD-style license that can be |
| michael@0 | 121 | // found in the LICENSE file. |
| michael@0 | 122 | // |
| michael@0 | 123 | |
| michael@0 | 124 | -// debug.cpp: Debugging utilities. |
| michael@0 | 125 | +// compiler_debug.cpp: Debugging utilities. |
| michael@0 | 126 | |
| michael@0 | 127 | -#include "compiler/debug.h" |
| michael@0 | 128 | +#include "compiler/compiler_debug.h" |
| michael@0 | 129 | |
| michael@0 | 130 | #include <stdarg.h> |
| michael@0 | 131 | #include <stdio.h> |
| michael@0 | 132 | |
| michael@0 | 133 | #include "compiler/InitializeParseContext.h" |
| michael@0 | 134 | #include "compiler/ParseHelper.h" |
| michael@0 | 135 | |
| michael@0 | 136 | static const int kTraceBufferLen = 1024; |
| michael@0 | 137 | diff --git a/gfx/angle/src/compiler/debug.h b/gfx/angle/src/compiler/compiler_debug.h |
| michael@0 | 138 | rename from gfx/angle/src/compiler/debug.h |
| michael@0 | 139 | rename to gfx/angle/src/compiler/compiler_debug.h |
| michael@0 | 140 | --- a/gfx/angle/src/compiler/debug.h |
| michael@0 | 141 | +++ b/gfx/angle/src/compiler/compiler_debug.h |
| michael@0 | 142 | @@ -1,15 +1,15 @@ |
| michael@0 | 143 | // |
| michael@0 | 144 | // Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved. |
| michael@0 | 145 | // Use of this source code is governed by a BSD-style license that can be |
| michael@0 | 146 | // found in the LICENSE file. |
| michael@0 | 147 | // |
| michael@0 | 148 | |
| michael@0 | 149 | -// debug.h: Debugging utilities. |
| michael@0 | 150 | +// compiler_debug.h: Debugging utilities. |
| michael@0 | 151 | |
| michael@0 | 152 | #ifndef COMPILER_DEBUG_H_ |
| michael@0 | 153 | #define COMPILER_DEBUG_H_ |
| michael@0 | 154 | |
| michael@0 | 155 | #include <assert.h> |
| michael@0 | 156 | |
| michael@0 | 157 | #ifdef _DEBUG |
| michael@0 | 158 | #define TRACE_ENABLED // define to enable debug message tracing |
| michael@0 | 159 | diff --git a/gfx/angle/src/compiler/osinclude.h b/gfx/angle/src/compiler/osinclude.h |
| michael@0 | 160 | --- a/gfx/angle/src/compiler/osinclude.h |
| michael@0 | 161 | +++ b/gfx/angle/src/compiler/osinclude.h |
| michael@0 | 162 | @@ -30,17 +30,17 @@ |
| michael@0 | 163 | #include <windows.h> |
| michael@0 | 164 | #elif defined(ANGLE_OS_POSIX) |
| michael@0 | 165 | #include <pthread.h> |
| michael@0 | 166 | #include <semaphore.h> |
| michael@0 | 167 | #include <errno.h> |
| michael@0 | 168 | #endif // ANGLE_OS_WIN |
| michael@0 | 169 | |
| michael@0 | 170 | |
| michael@0 | 171 | -#include "compiler/debug.h" |
| michael@0 | 172 | +#include "compiler/compiler_debug.h" |
| michael@0 | 173 | |
| michael@0 | 174 | // |
| michael@0 | 175 | // Thread Local Storage Operations |
| michael@0 | 176 | // |
| michael@0 | 177 | #if defined(ANGLE_OS_WIN) |
| michael@0 | 178 | typedef DWORD OS_TLSIndex; |
| michael@0 | 179 | #define OS_INVALID_TLS_INDEX (TLS_OUT_OF_INDEXES) |
| michael@0 | 180 | #elif defined(ANGLE_OS_POSIX) |
