Tue, 06 Jan 2015 21:39:09 +0100
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 | Bug 840577 - Fix ANGLE cross compilation on case sensitive OSes, relanded |
michael@0 | 4 | |
michael@0 | 5 | diff --git a/gfx/angle/src/libGLESv2/precompiled.h b/gfx/angle/src/libGLESv2/precompiled.h |
michael@0 | 6 | --- a/gfx/angle/src/libGLESv2/precompiled.h |
michael@0 | 7 | +++ b/gfx/angle/src/libGLESv2/precompiled.h |
michael@0 | 8 | @@ -30,13 +30,13 @@ |
michael@0 | 9 | #include <sstream> |
michael@0 | 10 | #include <string> |
michael@0 | 11 | #include <unordered_map> |
michael@0 | 12 | #include <vector> |
michael@0 | 13 | |
michael@0 | 14 | #include <d3d9.h> |
michael@0 | 15 | #include <D3D11.h> |
michael@0 | 16 | #include <dxgi.h> |
michael@0 | 17 | -#include <D3Dcompiler.h> |
michael@0 | 18 | +#include <d3dcompiler.h> |
michael@0 | 19 | |
michael@0 | 20 | #ifdef _MSC_VER |
michael@0 | 21 | #include <hash_map> |
michael@0 | 22 | #endif |