The Tor Browser / annotate

gfx/angle/angle-fix-vc12.patch@97036ab72558 (annotated)

gfx/angle/angle-fix-vc12.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 # HG changeset patch
michael@0 2 # Parent 4947d86b1f7b860e9c958a8a5eae03075c539f78
michael@0 3 # User Xavier Fung <xavier114fch@gmail.com>
michael@0 4 Fix Angle to build on Visual Studio 2013. r=?
michael@0 5
michael@0 6 diff --git a/gfx/angle/src/compiler/Types.h b/gfx/angle/src/compiler/Types.h
michael@0 7 --- a/gfx/angle/src/compiler/Types.h
michael@0 8 +++ b/gfx/angle/src/compiler/Types.h
michael@0 9 @@ -8,16 +8,18 @@
michael@0 10 #define _TYPES_INCLUDED
michael@0 11
michael@0 12 #include "common/angleutils.h"
michael@0 13
michael@0 14 #include "compiler/BaseTypes.h"
michael@0 15 #include "compiler/Common.h"
michael@0 16 #include "compiler/compiler_debug.h"
michael@0 17
michael@0 18 +#include <algorithm>
michael@0 19 +
michael@0 20 struct TPublicType;
michael@0 21 class TType;
michael@0 22
michael@0 23 class TField
michael@0 24 {
michael@0 25 public:
michael@0 26 POOL_ALLOCATOR_NEW_DELETE();
michael@0 27 TField(TType* type, TString* name) : mType(type), mName(name) {}
michael@0 28 diff --git a/gfx/angle/src/libEGL/Surface.cpp b/gfx/angle/src/libEGL/Surface.cpp
michael@0 29 --- a/gfx/angle/src/libEGL/Surface.cpp
michael@0 30 +++ b/gfx/angle/src/libEGL/Surface.cpp
michael@0 31 @@ -15,16 +15,18 @@
michael@0 32 #include "common/debug.h"
michael@0 33 #include "libGLESv2/Texture.h"
michael@0 34 #include "libGLESv2/renderer/SwapChain.h"
michael@0 35 #include "libGLESv2/main.h"
michael@0 36
michael@0 37 #include "libEGL/main.h"
michael@0 38 #include "libEGL/Display.h"
michael@0 39
michael@0 40 +#include <algorithm>
michael@0 41 +
michael@0 42 namespace egl
michael@0 43 {
michael@0 44
michael@0 45 Surface::Surface(Display *display, const Config *config, HWND window, EGLint postSubBufferSupported)
michael@0 46 : mDisplay(display), mConfig(config), mWindow(window), mPostSubBufferSupported(postSubBufferSupported)
michael@0 47 {
michael@0 48 mRenderer = mDisplay->getRenderer();
michael@0 49 mSwapChain = NULL;
michael@0 50 diff --git a/gfx/angle/src/libGLESv2/Program.cpp b/gfx/angle/src/libGLESv2/Program.cpp
michael@0 51 --- a/gfx/angle/src/libGLESv2/Program.cpp
michael@0 52 +++ b/gfx/angle/src/libGLESv2/Program.cpp
michael@0 53 @@ -7,16 +7,18 @@
michael@0 54
michael@0 55 // Program.cpp: Implements the gl::Program class. Implements GL program objects
michael@0 56 // and related functionality. [OpenGL ES 2.0.24] section 2.10.3 page 28.
michael@0 57
michael@0 58 #include "libGLESv2/Program.h"
michael@0 59 #include "libGLESv2/ProgramBinary.h"
michael@0 60 #include "libGLESv2/ResourceManager.h"
michael@0 61
michael@0 62 +#include <algorithm>
michael@0 63 +
michael@0 64 namespace gl
michael@0 65 {
michael@0 66 const char * const g_fakepath = "C:\\fakepath";
michael@0 67
michael@0 68 AttributeBindings::AttributeBindings()
michael@0 69 {
michael@0 70 }
michael@0 71
michael@0 72 diff --git a/gfx/angle/src/libGLESv2/ProgramBinary.cpp b/gfx/angle/src/libGLESv2/ProgramBinary.cpp
michael@0 73 --- a/gfx/angle/src/libGLESv2/ProgramBinary.cpp
michael@0 74 +++ b/gfx/angle/src/libGLESv2/ProgramBinary.cpp
michael@0 75 @@ -17,16 +17,18 @@
michael@0 76 #include "utilities.h"
michael@0 77
michael@0 78 #include "libGLESv2/main.h"
michael@0 79 #include "libGLESv2/Shader.h"
michael@0 80 #include "libGLESv2/Program.h"
michael@0 81 #include "libGLESv2/renderer/Renderer.h"
michael@0 82 #include "libGLESv2/renderer/VertexDataManager.h"
michael@0 83
michael@0 84 +#include <algorithm>
michael@0 85 +
michael@0 86 #undef near
michael@0 87 #undef far
michael@0 88
michael@0 89 namespace gl
michael@0 90 {
michael@0 91 std::string str(int i)
michael@0 92 {
michael@0 93 char buffer[20];
michael@0 94 diff --git a/gfx/angle/src/libGLESv2/Shader.cpp b/gfx/angle/src/libGLESv2/Shader.cpp
michael@0 95 --- a/gfx/angle/src/libGLESv2/Shader.cpp
michael@0 96 +++ b/gfx/angle/src/libGLESv2/Shader.cpp
michael@0 97 @@ -6,16 +6,18 @@
michael@0 98 //
michael@0 99
michael@0 100 // Shader.cpp: Implements the gl::Shader class and its derived classes
michael@0 101 // VertexShader and FragmentShader. Implements GL shader objects and related
michael@0 102 // functionality. [OpenGL ES 2.0.24] section 2.10 page 24 and section 3.8 page 84.
michael@0 103
michael@0 104 #include "libGLESv2/Shader.h"
michael@0 105
michael@0 106 +#include <algorithm>
michael@0 107 +
michael@0 108 #include "GLSLANG/ShaderLang.h"
michael@0 109 #include "libGLESv2/utilities.h"
michael@0 110 #include "libGLESv2/renderer/Renderer.h"
michael@0 111 #include "libGLESv2/Constants.h"
michael@0 112 #include "libGLESv2/ResourceManager.h"
michael@0 113
michael@0 114 namespace gl
michael@0 115 {
michael@0 116 diff --git a/gfx/angle/src/libGLESv2/libGLESv2.cpp b/gfx/angle/src/libGLESv2/libGLESv2.cpp
michael@0 117 --- a/gfx/angle/src/libGLESv2/libGLESv2.cpp
michael@0 118 +++ b/gfx/angle/src/libGLESv2/libGLESv2.cpp
michael@0 119 @@ -4,16 +4,18 @@
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 // libGLESv2.cpp: Implements the exported OpenGL ES 2.0 functions.
michael@0 125
michael@0 126 #include "common/version.h"
michael@0 127
michael@0 128 +#include <algorithm>
michael@0 129 +
michael@0 130 #include "libGLESv2/main.h"
michael@0 131 #include "libGLESv2/utilities.h"
michael@0 132 #include "libGLESv2/Buffer.h"
michael@0 133 #include "libGLESv2/Fence.h"
michael@0 134 #include "libGLESv2/Framebuffer.h"
michael@0 135 #include "libGLESv2/Renderbuffer.h"
michael@0 136 #include "libGLESv2/Program.h"
michael@0 137 #include "libGLESv2/ProgramBinary.h"

Mercurial Repository: The Tor Browser

Europalab SCM Repository Server

mercurial