[tor-commits] [tor-browser/tor-browser-31.1.1esr-4.x-1] Merge remote-tracking branch 'gk/bug_13027' into tor-browser-31.1.1esr-4.x-1

[mikeperry at torproject.org]

commit aed7442860ce3919eaec9f9d99da89195903b5d9
Merge: 8daaea3 30f92a2
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Wed Oct 8 23:55:46 2014 -0700

    Merge remote-tracking branch 'gk/bug_13027' into tor-browser-31.1.1esr-4.x-1

 dom/base/Navigator.cpp                |   61 ++++++++++---------
 dom/base/Navigator.h                  |   13 +++--
 dom/workers/Navigator.cpp             |   47 ++++++++++++++-
 dom/workers/Navigator.h               |   37 ++++--------
 dom/workers/RuntimeService.cpp        |  104 ++++++++++++++++++++++++++++++++-
 dom/workers/RuntimeService.h          |   12 ++++
 dom/workers/WorkerScope.cpp           |    4 ++
 dom/workers/test/bug1060621_worker.js |    2 +
 dom/workers/test/bug1062920_worker.js |    6 ++
 dom/workers/test/chrome.ini           |    2 +
 dom/workers/test/mochitest.ini        |   11 ++++
 dom/workers/test/test_bug1060621.html |   30 ++++++++++
 dom/workers/test/test_bug1062920.html |   61 +++++++++++++++++++
 dom/workers/test/test_bug1062920.xul  |   68 +++++++++++++++++++++
 14 files changed, 394 insertions(+), 64 deletions(-)