[tor-commits] [tor-browser/tor-browser-31.5.0esr-4.5-1] Merge branch 'bug12827-01' into tor-browser-31.5.0esr-4.5-1

[mikeperry at torproject.org]

commit 2dbf9589bff621cd9fc88dafa26b20ccdbddf935
Merge: 4a14559 7dd093a
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Fri Mar 20 19:37:27 2015 -0700

    Merge branch 'bug12827-01' into tor-browser-31.5.0esr-4.5-1

 browser/app/profile/000-tor-browser.js      |    1 +
 content/base/src/nsNameSpaceManager.cpp     |    3 ++-
 content/base/src/nsObjectLoadingContent.cpp |   16 +++++++++---
 content/svg/content/src/nsSVGFeatures.cpp   |   13 ++++++++++
 gfx/thebes/gfxFont.cpp                      |    6 ++++-
 image/src/ImageFactory.cpp                  |   33 ++++++++++++++++--------
 layout/base/nsCSSFrameConstructor.cpp       |   15 +++++++----
 layout/build/nsContentDLF.cpp               |   27 +++++++++++--------
 layout/svg/nsSVGUtils.cpp                   |   37 +++++++++++++++++++++++++++
 layout/svg/nsSVGUtils.h                     |    3 +++
 uriloader/base/nsURILoader.cpp              |   13 +++++++---
 11 files changed, 131 insertions(+), 36 deletions(-)