commit f5fb906af1ffd5078e8f70aec1e7852f109ce0d5 Merge: 9de178c 9e59dae Author: Mike Perry mikeperry-git@torproject.org Date: Fri Jul 24 00:00:46 2015 -0700

Merge remote-tracking branch 'brade/bug16495-02' into tor-browser-38.1.0esr-5.0-1

dom/base/Element.cpp | 20 ++++++++++++++++ dom/base/nsDocument.cpp | 5 +++- dom/base/nsIContent.h | 10 ++------ dom/base/nsIDocument.h | 25 ++++++++++++++++++++ layout/svg/nsSVGUtils.cpp | 39 +++++++++++++++++++++++++++----- layout/svg/nsSVGUtils.h | 1 + parser/html/nsHtml5DocumentBuilder.cpp | 24 ++++++++++---------- 7 files changed, 97 insertions(+), 27 deletions(-)