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 | Fix for https://code.google.com/p/angleproject/issues/detail?id=651 |
michael@0 | 2 | |
michael@0 | 3 | See https://bugzilla.mozilla.org/show_bug.cgi?id=1025576 for details. |
michael@0 | 4 | |
michael@0 | 5 | diff --git a/gfx/angle/src/compiler/SymbolTable.cpp b/gfx/angle/src/compiler/SymbolTable.cpp |
michael@0 | 6 | --- a/gfx/angle/src/compiler/SymbolTable.cpp |
michael@0 | 7 | +++ b/gfx/angle/src/compiler/SymbolTable.cpp |
michael@0 | 8 | @@ -166,17 +166,18 @@ TFunction::~TFunction() |
michael@0 | 9 | } |
michael@0 | 10 | |
michael@0 | 11 | // |
michael@0 | 12 | // Symbol table levels are a map of pointers to symbols that have to be deleted. |
michael@0 | 13 | // |
michael@0 | 14 | TSymbolTableLevel::~TSymbolTableLevel() |
michael@0 | 15 | { |
michael@0 | 16 | for (tLevel::iterator it = level.begin(); it != level.end(); ++it) |
michael@0 | 17 | - delete (*it).second; |
michael@0 | 18 | + if ((*it).first == (*it).second->getMangledName()) |
michael@0 | 19 | + delete (*it).second; |
michael@0 | 20 | } |
michael@0 | 21 | |
michael@0 | 22 | // |
michael@0 | 23 | // Change all function entries in the table with the non-mangled name |
michael@0 | 24 | // to be related to the provided built-in operation. This is a low |
michael@0 | 25 | // performance operation, and only intended for symbol tables that |
michael@0 | 26 | // live across a large number of compiles. |
michael@0 | 27 | // |