[tbb-commits] [tor-browser/tor-browser-31.6.0esr-4.5-1] Merge remote-tracking branch 'arthur/15502+8' into tor-browser-31.6.0esr-4.5-1

[mikeperry at torproject.org]

commit 71adcfc9a5adf7aeeed0dfa2719ccd59cc84881e
Merge: 89bd8f1 f4f2caa
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Tue Apr 21 18:05:08 2015 -0700

    Merge remote-tracking branch 'arthur/15502+8' into tor-browser-31.6.0esr-4.5-1

 content/base/src/ThirdPartyUtil.cpp              |    9 ++
 content/base/src/nsHostObjectProtocolHandler.cpp |   23 ++++-
 content/base/test/bug15502_page_blobify.html     |   26 ++++++
 content/base/test/bug15502_page_deblobify.html   |   31 +++++++
 content/base/test/bug15502_tab.html              |   39 ++++++++
 content/base/test/bug15502_utils.js              |  104 ++++++++++++++++++++++
 content/base/test/bug15502_worker_blobify.html   |   28 ++++++
 content/base/test/bug15502_worker_blobify.js     |   12 +++
 content/base/test/bug15502_worker_deblobify.html |   30 +++++++
 content/base/test/bug15502_worker_deblobify.js   |   24 +++++
 content/base/test/mochitest.ini                  |    9 ++
 content/base/test/test_tor_bug15502.html         |   92 +++++++++++++++++++
 dom/workers/URL.cpp                              |    7 ++
 netwerk/base/public/mozIThirdPartyUtil.idl       |   15 ++++
 14 files changed, 447 insertions(+), 2 deletions(-)