gfx/angle/angle-build-dedupe-uniform-cpp-h.patch@129ffea94266
gfx/angle/angle-build-dedupe-uniform-cpp-h.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.
1 From: Jeff Gilbert <jgilbert@mozilla.com>
3 diff --git a/gfx/angle/src/compiler/Uniform.cpp b/gfx/angle/src/compiler/CompilerUniform.cpp
4 rename from gfx/angle/src/compiler/Uniform.cpp
5 rename to gfx/angle/src/compiler/CompilerUniform.cpp
6 --- a/gfx/angle/src/compiler/Uniform.cpp
7 +++ b/gfx/angle/src/compiler/CompilerUniform.cpp
8 @@ -1,15 +1,15 @@
9 //
10 // Copyright (c) 2013 The ANGLE Project Authors. All rights reserved.
11 // Use of this source code is governed by a BSD-style license that can be
12 // found in the LICENSE file.
13 //
15 -#include "compiler/Uniform.h"
16 +#include "CompilerUniform.h"
18 namespace sh
19 {
21 Uniform::Uniform(GLenum type, GLenum precision, const char *name, int arraySize, int registerIndex)
22 {
23 this->type = type;
24 this->precision = precision;
25 diff --git a/gfx/angle/src/compiler/Uniform.h b/gfx/angle/src/compiler/CompilerUniform.h
26 rename from gfx/angle/src/compiler/Uniform.h
27 rename to gfx/angle/src/compiler/CompilerUniform.h
28 diff --git a/gfx/angle/src/compiler/OutputHLSL.h b/gfx/angle/src/compiler/OutputHLSL.h
29 --- a/gfx/angle/src/compiler/OutputHLSL.h
30 +++ b/gfx/angle/src/compiler/OutputHLSL.h
31 @@ -11,17 +11,17 @@
32 #include <set>
33 #include <map>
35 #define GL_APICALL
36 #include <GLES2/gl2.h>
38 #include "compiler/intermediate.h"
39 #include "compiler/ParseHelper.h"
40 -#include "compiler/Uniform.h"
41 +#include "compiler/CompilerUniform.h"
43 namespace sh
44 {
45 class UnfoldShortCircuit;
47 class OutputHLSL : public TIntermTraverser
48 {
49 public:
50 diff --git a/gfx/angle/src/compiler/TranslatorHLSL.h b/gfx/angle/src/compiler/TranslatorHLSL.h
51 --- a/gfx/angle/src/compiler/TranslatorHLSL.h
52 +++ b/gfx/angle/src/compiler/TranslatorHLSL.h
53 @@ -3,17 +3,17 @@
54 // Use of this source code is governed by a BSD-style license that can be
55 // found in the LICENSE file.
56 //
58 #ifndef COMPILER_TRANSLATORHLSL_H_
59 #define COMPILER_TRANSLATORHLSL_H_
61 #include "compiler/ShHandle.h"
62 -#include "compiler/Uniform.h"
63 +#include "compiler/CompilerUniform.h"
65 class TranslatorHLSL : public TCompiler {
66 public:
67 TranslatorHLSL(ShShaderType type, ShShaderSpec spec, ShShaderOutput output);
69 virtual TranslatorHLSL *getAsTranslatorHLSL() { return this; }
70 const sh::ActiveUniforms &getUniforms() { return mActiveUniforms; }
72 diff --git a/gfx/angle/src/libGLESv2/Shader.h b/gfx/angle/src/libGLESv2/Shader.h
73 --- a/gfx/angle/src/libGLESv2/Shader.h
74 +++ b/gfx/angle/src/libGLESv2/Shader.h
75 @@ -13,17 +13,17 @@
76 #define LIBGLESV2_SHADER_H_
78 #define GL_APICALL
79 #include <GLES2/gl2.h>
80 #include <string>
81 #include <list>
82 #include <vector>
84 -#include "compiler/Uniform.h"
85 +#include "compiler/CompilerUniform.h"
86 #include "common/angleutils.h"
88 namespace rx
89 {
90 class Renderer;
91 }
93 namespace gl
