commit a79c90f037d517180a2efa19c4539fbd23b6843e
Author: Mike Perry <mikeperry-git(a)fscked.org>
Date: Fri Jan 25 01:32:04 2013 -0800
Fix Windows build error in the Image Cache patch.
How the hell the first string fragment was wide and the second one narrow is
beyond me.. Oh well. Now there's just one string to rule them all.
---
...-Block-Components.interfaces-from-content.patch | 2 +-
...0002-Make-Permissions-Manager-memory-only.patch | 2 +-
...-Make-Intermediate-Cert-Store-memory-only.patch | 2 +-
.../firefox/0004-Add-a-string-based-cacheKey.patch | 6 ++--
.../0005-Block-all-plugins-except-flash.patch | 10 +++---
...ontent-pref-service-memory-only-clearable.patch | 2 +-
...owser-exit-when-not-launched-from-Vidalia.patch | 6 ++--
.../0008-Disable-SSL-Session-ID-tracking.patch | 2 +-
...observer-event-to-close-persistent-connec.patch | 2 +-
...ice-and-system-specific-CSS-Media-Queries.patch | 2 +-
...11-Limit-the-number-of-fonts-per-document.patch | 2 +-
.../0012-Rebrand-Firefox-to-TorBrowser.patch | 2 +-
.../0013-Make-Download-manager-memory-only.patch | 2 +-
.../0014-Add-DDG-and-StartPage-to-Omnibox.patch | 2 +-
...-nsICacheService.EvictEntries-synchronous.patch | 2 +-
.../firefox/0016-Prevent-WebSocket-DNS-leak.patch | 2 +-
...ize-HTTP-request-order-and-pipeline-depth.patch | 4 +-
...Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch | 2 +-
...d-mozIThirdPartyUtil.getFirstPartyURI-API.patch | 2 +-
.../0020-Add-canvas-image-extraction-prompt.patch | 20 +++++++-------
...nt-window-coordinates-for-mouse-event-scr.patch | 4 +-
...se-physical-screen-info.-via-window-and-w.patch | 18 ++++++------
...not-expose-system-colors-to-CSS-or-canvas.patch | 2 +-
...solate-the-Image-Cache-per-url-bar-domain.patch | 27 ++++++++++---------
.../0025-nsIHTTPChannel.redirectTo-API.patch | 8 +++---
...26-Isolate-DOM-storage-to-first-party-URI.patch | 6 ++--
26 files changed, 71 insertions(+), 70 deletions(-)
diff --git a/src/current-patches/firefox/0001-Block-Components.interfaces-from-content.patch b/src/current-patches/firefox/0001-Block-Components.interfaces-from-content.patch
index 7a2faac..5f2cbf7 100644
--- a/src/current-patches/firefox/0001-Block-Components.interfaces-from-content.patch
+++ b/src/current-patches/firefox/0001-Block-Components.interfaces-from-content.patch
@@ -1,4 +1,4 @@
-From 60f2318ffa6e9a3bdb37192378e0711aa14bd772 Mon Sep 17 00:00:00 2001
+From d96e65b539df362bd495b51d2db02e56eca76851 Mon Sep 17 00:00:00 2001
From: Mike Perry <mikeperry-git(a)torproject.org>
Date: Tue, 4 Dec 2012 15:41:09 -0800
Subject: [PATCH 01/26] Block Components.interfaces from content
diff --git a/src/current-patches/firefox/0002-Make-Permissions-Manager-memory-only.patch b/src/current-patches/firefox/0002-Make-Permissions-Manager-memory-only.patch
index cb04eae..1051aec 100644
--- a/src/current-patches/firefox/0002-Make-Permissions-Manager-memory-only.patch
+++ b/src/current-patches/firefox/0002-Make-Permissions-Manager-memory-only.patch
@@ -1,4 +1,4 @@
-From db27e73d62d4f680b98a4ad9e7493b62070e23ae Mon Sep 17 00:00:00 2001
+From 5aadfe392688fde8bd93ed549b1f2988268a7987 Mon Sep 17 00:00:00 2001
From: Mike Perry <mikeperry-git(a)torproject.org>
Date: Tue, 4 Dec 2012 15:45:59 -0800
Subject: [PATCH 02/26] Make Permissions Manager memory-only
diff --git a/src/current-patches/firefox/0003-Make-Intermediate-Cert-Store-memory-only.patch b/src/current-patches/firefox/0003-Make-Intermediate-Cert-Store-memory-only.patch
index a367d67..990a900 100644
--- a/src/current-patches/firefox/0003-Make-Intermediate-Cert-Store-memory-only.patch
+++ b/src/current-patches/firefox/0003-Make-Intermediate-Cert-Store-memory-only.patch
@@ -1,4 +1,4 @@
-From ac380269829788ddbd721d642ec57af0fff350de Mon Sep 17 00:00:00 2001
+From 7b028c106cfca269406641a8c7cd9380eafeecca Mon Sep 17 00:00:00 2001
From: Mike Perry <mikeperry-git(a)torproject.org>
Date: Tue, 4 Dec 2012 15:51:07 -0800
Subject: [PATCH 03/26] Make Intermediate Cert Store memory-only.
diff --git a/src/current-patches/firefox/0004-Add-a-string-based-cacheKey.patch b/src/current-patches/firefox/0004-Add-a-string-based-cacheKey.patch
index c1ca50a..f75db89 100644
--- a/src/current-patches/firefox/0004-Add-a-string-based-cacheKey.patch
+++ b/src/current-patches/firefox/0004-Add-a-string-based-cacheKey.patch
@@ -1,4 +1,4 @@
-From e991fbe8787ad8a50621f6a11633a121910d77fb Mon Sep 17 00:00:00 2001
+From 7e6a70ebef4fdf0c9d1e50a42500eaa1daa15bd1 Mon Sep 17 00:00:00 2001
From: Mike Perry <mikeperry-git(a)torproject.org>
Date: Tue, 4 Dec 2012 16:01:42 -0800
Subject: [PATCH 04/26] Add a string-based cacheKey.
@@ -29,7 +29,7 @@ index 3119dd9..fd2ec89 100644
* may fail if the disk cache is not present. The value of this attribute
* is usually only settable during the processing of a channel's
diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp
-index f1ae96a..9223d08 100644
+index ef6ff4d..dc49b81 100644
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -2721,6 +2721,12 @@ nsHttpChannel::AssembleCacheKey(const char *spec, uint32_t postID,
@@ -45,7 +45,7 @@ index f1ae96a..9223d08 100644
if (!cacheKey.IsEmpty()) {
cacheKey.AppendLiteral("uri=");
}
-@@ -5179,6 +5185,22 @@ nsHttpChannel::SetCacheTokenCachedCharset(const nsACString &aCharset)
+@@ -5184,6 +5190,22 @@ nsHttpChannel::SetCacheTokenCachedCharset(const nsACString &aCharset)
//-----------------------------------------------------------------------------
NS_IMETHODIMP
diff --git a/src/current-patches/firefox/0005-Block-all-plugins-except-flash.patch b/src/current-patches/firefox/0005-Block-all-plugins-except-flash.patch
index f452b0f..4b3e603 100644
--- a/src/current-patches/firefox/0005-Block-all-plugins-except-flash.patch
+++ b/src/current-patches/firefox/0005-Block-all-plugins-except-flash.patch
@@ -1,4 +1,4 @@
-From 1ff6423fed745b7efd041fb6397065bd39a16d1a Mon Sep 17 00:00:00 2001
+From ab69ac8d9594555e284e130a45bb17dcfcdf23c7 Mon Sep 17 00:00:00 2001
From: Mike Perry <mikeperry-git(a)torproject.org>
Date: Tue, 4 Dec 2012 16:03:13 -0800
Subject: [PATCH 05/26] Block all plugins except flash.
@@ -17,10 +17,10 @@ on a better way. Until then, it is delta-darwinism for us.
2 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp
-index b4233fa..1fe506a 100644
+index 858b428..c7ae680 100644
--- a/dom/plugins/base/nsPluginHost.cpp
+++ b/dom/plugins/base/nsPluginHost.cpp
-@@ -2040,6 +2040,35 @@ struct CompareFilesByTime
+@@ -2052,6 +2052,35 @@ struct CompareFilesByTime
} // anonymous namespace
@@ -56,7 +56,7 @@ index b4233fa..1fe506a 100644
typedef NS_NPAPIPLUGIN_CALLBACK(char *, NP_GETMIMEDESCRIPTION)(void);
nsresult nsPluginHost::ScanPluginsDirectory(nsIFile *pluginsDir,
-@@ -2144,6 +2173,10 @@ nsresult nsPluginHost::ScanPluginsDirectory(nsIFile *pluginsDir,
+@@ -2156,6 +2185,10 @@ nsresult nsPluginHost::ScanPluginsDirectory(nsIFile *pluginsDir,
continue;
}
@@ -68,7 +68,7 @@ index b4233fa..1fe506a 100644
if (!pluginTag) {
nsPluginFile pluginFile(localfile);
diff --git a/dom/plugins/base/nsPluginHost.h b/dom/plugins/base/nsPluginHost.h
-index fdaa76d..9e328a2 100644
+index 3c48eec..2cba11d 100644
--- a/dom/plugins/base/nsPluginHost.h
+++ b/dom/plugins/base/nsPluginHost.h
@@ -261,6 +261,8 @@ private:
diff --git a/src/current-patches/firefox/0006-Make-content-pref-service-memory-only-clearable.patch b/src/current-patches/firefox/0006-Make-content-pref-service-memory-only-clearable.patch
index 32eb7c2..33a83cd 100644
--- a/src/current-patches/firefox/0006-Make-content-pref-service-memory-only-clearable.patch
+++ b/src/current-patches/firefox/0006-Make-content-pref-service-memory-only-clearable.patch
@@ -1,4 +1,4 @@
-From 60c8edec8d90c6661ab5577970800c01b1205e02 Mon Sep 17 00:00:00 2001
+From 03c7c715835e41ad6d5e6043e176ee34503a2753 Mon Sep 17 00:00:00 2001
From: Mike Perry <mikeperry-git(a)fscked.org>
Date: Thu, 8 Sep 2011 08:40:17 -0700
Subject: [PATCH 06/26] Make content pref service memory-only + clearable
diff --git a/src/current-patches/firefox/0007-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch b/src/current-patches/firefox/0007-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch
index 80c55c2..76c1aff 100644
--- a/src/current-patches/firefox/0007-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch
+++ b/src/current-patches/firefox/0007-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch
@@ -1,4 +1,4 @@
-From 5f9d3e18c44f8b25f34e68fb6b35b229d3561559 Mon Sep 17 00:00:00 2001
+From 8fb01f1b02160e9fd6e91641694a80acbeb6c05f Mon Sep 17 00:00:00 2001
From: Mike Perry <mikeperry-git(a)torproject.org>
Date: Tue, 4 Dec 2012 16:29:24 -0800
Subject: [PATCH 07/26] Make Tor Browser exit when not launched from Vidalia
@@ -16,10 +16,10 @@ actually be common.
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
-index 80174dc..1fc137c 100644
+index f46a33d..9f77fd0 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
-@@ -1096,6 +1096,19 @@ var gBrowserInit = {
+@@ -1093,6 +1093,19 @@ var gBrowserInit = {
// setup simple gestures support
gGestureSupport.init(true);
diff --git a/src/current-patches/firefox/0008-Disable-SSL-Session-ID-tracking.patch b/src/current-patches/firefox/0008-Disable-SSL-Session-ID-tracking.patch
index 9b3de6b..ef227d9 100644
--- a/src/current-patches/firefox/0008-Disable-SSL-Session-ID-tracking.patch
+++ b/src/current-patches/firefox/0008-Disable-SSL-Session-ID-tracking.patch
@@ -1,4 +1,4 @@
-From 376f1f9b86d4b04e121d25553feed2c4380088d2 Mon Sep 17 00:00:00 2001
+From aa2165d4a1d496fc2d0e918ef99747ddfc7fd31e Mon Sep 17 00:00:00 2001
From: Mike Perry <mikeperry-git(a)fscked.org>
Date: Wed, 7 Dec 2011 19:36:38 -0800
Subject: [PATCH 08/26] Disable SSL Session ID tracking.
diff --git a/src/current-patches/firefox/0009-Provide-an-observer-event-to-close-persistent-connec.patch b/src/current-patches/firefox/0009-Provide-an-observer-event-to-close-persistent-connec.patch
index a366141..bdf080c 100644
--- a/src/current-patches/firefox/0009-Provide-an-observer-event-to-close-persistent-connec.patch
+++ b/src/current-patches/firefox/0009-Provide-an-observer-event-to-close-persistent-connec.patch
@@ -1,4 +1,4 @@
-From 74b6b99f7ac6e4a4153613feeafef53a5c3b9a4a Mon Sep 17 00:00:00 2001
+From bc23775c26e066a4abbd68727f92a9fe8ed21977 Mon Sep 17 00:00:00 2001
From: Mike Perry <mikeperry-git(a)torproject.org>
Date: Fri, 7 Sep 2012 16:18:26 -0700
Subject: [PATCH 09/26] Provide an observer event to close persistent
diff --git a/src/current-patches/firefox/0010-Limit-device-and-system-specific-CSS-Media-Queries.patch b/src/current-patches/firefox/0010-Limit-device-and-system-specific-CSS-Media-Queries.patch
index 9e49285..a983794 100644
--- a/src/current-patches/firefox/0010-Limit-device-and-system-specific-CSS-Media-Queries.patch
+++ b/src/current-patches/firefox/0010-Limit-device-and-system-specific-CSS-Media-Queries.patch
@@ -1,4 +1,4 @@
-From 278e285820d9082d2be161fbdee6c230a4477204 Mon Sep 17 00:00:00 2001
+From 8fc251b2c49b46f0d07a7f80f814f5dae3a73ae6 Mon Sep 17 00:00:00 2001
From: Kathleen Brade <brade(a)pearlcrescent.com>
Date: Wed, 28 Nov 2012 09:49:40 -0500
Subject: [PATCH 10/26] Limit device and system specific CSS Media Queries.
diff --git a/src/current-patches/firefox/0011-Limit-the-number-of-fonts-per-document.patch b/src/current-patches/firefox/0011-Limit-the-number-of-fonts-per-document.patch
index c6eb24f..80660db 100644
--- a/src/current-patches/firefox/0011-Limit-the-number-of-fonts-per-document.patch
+++ b/src/current-patches/firefox/0011-Limit-the-number-of-fonts-per-document.patch
@@ -1,4 +1,4 @@
-From 9ae4f468446cd1edef028d2b60ccca91cad2bc2e Mon Sep 17 00:00:00 2001
+From 2786933e3a395e1058da8850a3710f01ca416463 Mon Sep 17 00:00:00 2001
From: Mike Perry <mikeperry-git(a)torproject.org>
Date: Wed, 5 Dec 2012 12:25:21 -0800
Subject: [PATCH 11/26] Limit the number of fonts per document.
diff --git a/src/current-patches/firefox/0012-Rebrand-Firefox-to-TorBrowser.patch b/src/current-patches/firefox/0012-Rebrand-Firefox-to-TorBrowser.patch
index 6fc03f6..3c0c2a2 100644
--- a/src/current-patches/firefox/0012-Rebrand-Firefox-to-TorBrowser.patch
+++ b/src/current-patches/firefox/0012-Rebrand-Firefox-to-TorBrowser.patch
@@ -1,4 +1,4 @@
-From e0675863770a2a33fef70079a73233a9e78a3c48 Mon Sep 17 00:00:00 2001
+From 0c832e01da6845fc0f56ee9fce68f219b56950c3 Mon Sep 17 00:00:00 2001
From: Mike Perry <mikeperry-git(a)torproject.org>
Date: Tue, 28 Aug 2012 18:05:11 -0700
Subject: [PATCH 12/26] Rebrand Firefox to TorBrowser
diff --git a/src/current-patches/firefox/0013-Make-Download-manager-memory-only.patch b/src/current-patches/firefox/0013-Make-Download-manager-memory-only.patch
index f9f938f..c84be7d 100644
--- a/src/current-patches/firefox/0013-Make-Download-manager-memory-only.patch
+++ b/src/current-patches/firefox/0013-Make-Download-manager-memory-only.patch
@@ -1,4 +1,4 @@
-From 2b0cc620b5d9af06262c9fdfc1ef8f34b5682859 Mon Sep 17 00:00:00 2001
+From 0cb96bdc00f9b1fa37916f92bc4fc5850c13f96f Mon Sep 17 00:00:00 2001
From: Mike Perry <mikeperry-git(a)torproject.org>
Date: Tue, 4 Dec 2012 16:05:55 -0800
Subject: [PATCH 13/26] Make Download manager memory only.
diff --git a/src/current-patches/firefox/0014-Add-DDG-and-StartPage-to-Omnibox.patch b/src/current-patches/firefox/0014-Add-DDG-and-StartPage-to-Omnibox.patch
index 4cb626f..c50adff 100644
--- a/src/current-patches/firefox/0014-Add-DDG-and-StartPage-to-Omnibox.patch
+++ b/src/current-patches/firefox/0014-Add-DDG-and-StartPage-to-Omnibox.patch
@@ -1,4 +1,4 @@
-From a2de75def3f8ac88a5f5092ab9bd6815d088e7d5 Mon Sep 17 00:00:00 2001
+From 8b96f6a7116c524ae946736c98c2e2fa75460609 Mon Sep 17 00:00:00 2001
From: Mike Perry <mikeperry-git(a)torproject.org>
Date: Wed, 25 Apr 2012 15:03:46 -0700
Subject: [PATCH 14/26] Add DDG and StartPage to Omnibox.
diff --git a/src/current-patches/firefox/0015-Make-nsICacheService.EvictEntries-synchronous.patch b/src/current-patches/firefox/0015-Make-nsICacheService.EvictEntries-synchronous.patch
index 87547a7..ff25754 100644
--- a/src/current-patches/firefox/0015-Make-nsICacheService.EvictEntries-synchronous.patch
+++ b/src/current-patches/firefox/0015-Make-nsICacheService.EvictEntries-synchronous.patch
@@ -1,4 +1,4 @@
-From 0d030acc527aa206582e3f19219f4fa128f98bef Mon Sep 17 00:00:00 2001
+From 95a3b60fdd0dac8ba1fb1755312072558ea75c13 Mon Sep 17 00:00:00 2001
From: Mike Perry <mikeperry-git(a)torproject.org>
Date: Tue, 4 Dec 2012 16:25:52 -0800
Subject: [PATCH 15/26] Make nsICacheService.EvictEntries synchronous
diff --git a/src/current-patches/firefox/0016-Prevent-WebSocket-DNS-leak.patch b/src/current-patches/firefox/0016-Prevent-WebSocket-DNS-leak.patch
index ef61b59..7028ed7 100644
--- a/src/current-patches/firefox/0016-Prevent-WebSocket-DNS-leak.patch
+++ b/src/current-patches/firefox/0016-Prevent-WebSocket-DNS-leak.patch
@@ -1,4 +1,4 @@
-From ac25d901493198966643d88d0541eaa2735b122f Mon Sep 17 00:00:00 2001
+From d9a76d292f33b7e36c4d1aa3834eed69f0287a4e Mon Sep 17 00:00:00 2001
From: Mike Perry <mikeperry-git(a)torproject.org>
Date: Tue, 28 Aug 2012 18:07:37 -0700
Subject: [PATCH 16/26] Prevent WebSocket DNS leak.
diff --git a/src/current-patches/firefox/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch b/src/current-patches/firefox/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch
index 118c5d6..dbf380d 100644
--- a/src/current-patches/firefox/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch
+++ b/src/current-patches/firefox/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch
@@ -1,4 +1,4 @@
-From 53ec410990f8616d5c3cf3bfbb9feaa4a83ff722 Mon Sep 17 00:00:00 2001
+From db11101312a3bb8912817fa910a87ce0ebd9c00d Mon Sep 17 00:00:00 2001
From: Mike Perry <mikeperry-git(a)torproject.org>
Date: Tue, 4 Dec 2012 17:38:51 -0800
Subject: [PATCH 17/26] Randomize HTTP request order and pipeline depth.
@@ -24,7 +24,7 @@ request order (though SPDY is still disabled by default in TBB).
2 files changed, 65 insertions(+), 5 deletions(-)
diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.cpp b/netwerk/protocol/http/nsHttpConnectionMgr.cpp
-index 526df93..abae041 100644
+index 133c301..59d03c0 100644
--- a/netwerk/protocol/http/nsHttpConnectionMgr.cpp
+++ b/netwerk/protocol/http/nsHttpConnectionMgr.cpp
@@ -20,6 +20,8 @@
diff --git a/src/current-patches/firefox/0018-Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch b/src/current-patches/firefox/0018-Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch
index 7c2ddee..e9ecba2 100644
--- a/src/current-patches/firefox/0018-Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch
+++ b/src/current-patches/firefox/0018-Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch
@@ -1,4 +1,4 @@
-From 4541bfb12c40ed13871503f7bb46ba8e5f27a8ed Mon Sep 17 00:00:00 2001
+From 8b97d84e891fb593bd48db41abcebbcb8e4da953 Mon Sep 17 00:00:00 2001
From: Mike Perry <mikeperry-git(a)torproject.org>
Date: Tue, 4 Dec 2012 17:48:53 -0800
Subject: [PATCH 18/26] Adapt Steven Michaud's Mac crashfix patch
diff --git a/src/current-patches/firefox/0019-Add-mozIThirdPartyUtil.getFirstPartyURI-API.patch b/src/current-patches/firefox/0019-Add-mozIThirdPartyUtil.getFirstPartyURI-API.patch
index ab855cf..41dfc25 100644
--- a/src/current-patches/firefox/0019-Add-mozIThirdPartyUtil.getFirstPartyURI-API.patch
+++ b/src/current-patches/firefox/0019-Add-mozIThirdPartyUtil.getFirstPartyURI-API.patch
@@ -1,4 +1,4 @@
-From 4ea73b19b21764c10019e9af1cc68664ed7f7394 Mon Sep 17 00:00:00 2001
+From ba78747eade72d0c4aeac7c6c6d5a93417112948 Mon Sep 17 00:00:00 2001
From: Kathleen Brade <brade(a)pearlcrescent.com>
Date: Wed, 28 Nov 2012 17:08:29 -0500
Subject: [PATCH 19/26] Add mozIThirdPartyUtil.getFirstPartyURI API
diff --git a/src/current-patches/firefox/0020-Add-canvas-image-extraction-prompt.patch b/src/current-patches/firefox/0020-Add-canvas-image-extraction-prompt.patch
index 802dc3f..5b0979f 100644
--- a/src/current-patches/firefox/0020-Add-canvas-image-extraction-prompt.patch
+++ b/src/current-patches/firefox/0020-Add-canvas-image-extraction-prompt.patch
@@ -1,4 +1,4 @@
-From 924f0fb25804b75289f18fe5b5cfe02667aad58f Mon Sep 17 00:00:00 2001
+From e62f1676c6b9ddaf6a3fa29075378263fbd9067d Mon Sep 17 00:00:00 2001
From: Kathleen Brade <brade(a)pearlcrescent.com>
Date: Tue, 27 Nov 2012 13:13:40 -0500
Subject: [PATCH 20/26] Add canvas image extraction prompt.
@@ -20,10 +20,10 @@ Subject: [PATCH 20/26] Add canvas image extraction prompt.
13 files changed, 249 insertions(+), 10 deletions(-)
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
-index 1fc137c..e95cebc 100644
+index 9f77fd0..5316da6 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
-@@ -1282,6 +1282,7 @@ var gBrowserInit = {
+@@ -1279,6 +1279,7 @@ var gBrowserInit = {
BrowserOffline.init();
OfflineApps.init();
IndexedDBPromptHelper.init();
@@ -31,7 +31,7 @@ index 1fc137c..e95cebc 100644
gFormSubmitObserver.init();
SocialUI.init();
AddonManager.addAddonListener(AddonsMgrListener);
-@@ -1639,6 +1640,7 @@ var gBrowserInit = {
+@@ -1636,6 +1637,7 @@ var gBrowserInit = {
BrowserOffline.uninit();
OfflineApps.uninit();
IndexedDBPromptHelper.uninit();
@@ -39,7 +39,7 @@ index 1fc137c..e95cebc 100644
AddonManager.removeAddonListener(AddonsMgrListener);
SocialUI.uninit();
}
-@@ -6129,6 +6131,106 @@ var IndexedDBPromptHelper = {
+@@ -6126,6 +6128,106 @@ var IndexedDBPromptHelper = {
}
};
@@ -147,7 +147,7 @@ index 1fc137c..e95cebc 100644
{
if (TabView.isVisible()) {
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
-index 5bf156e..8699a62 100644
+index 1982eb1..d4a20cd 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -573,6 +573,7 @@
@@ -177,7 +177,7 @@ index 1a9f457..4e61cb9 100644
# %2$S a number of megabytes.
indexedDB.usage=This website (%1$S) is attempting to store more than %2$S MB of data on your computer for offline use.
diff --git a/browser/themes/gnomestripe/browser.css b/browser/themes/gnomestripe/browser.css
-index aff8ae1..f69f553 100644
+index f62d5a8..77df3a8 100644
--- a/browser/themes/gnomestripe/browser.css
+++ b/browser/themes/gnomestripe/browser.css
@@ -1185,6 +1185,7 @@ toolbar[iconsize="small"] #feed-button {
@@ -197,10 +197,10 @@ index aff8ae1..f69f553 100644
list-style-image: url(chrome://global/skin/icons/question-16.png);
}
diff --git a/browser/themes/pinstripe/browser.css b/browser/themes/pinstripe/browser.css
-index a44c6b9..ff581ab 100644
+index 510af73..1f11603 100644
--- a/browser/themes/pinstripe/browser.css
+++ b/browser/themes/pinstripe/browser.css
-@@ -2403,10 +2403,12 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
+@@ -2426,10 +2426,12 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
-moz-image-region: rect(0px, 48px, 16px, 32px);
}
@@ -214,7 +214,7 @@ index a44c6b9..ff581ab 100644
.popup-notification-icon[popupid="indexedDB-quota-prompt"] {
list-style-image: url(chrome://global/skin/icons/question-64.png);
diff --git a/browser/themes/winstripe/browser.css b/browser/themes/winstripe/browser.css
-index 470c344..770245b 100644
+index 30fb26c..360d80a 100644
--- a/browser/themes/winstripe/browser.css
+++ b/browser/themes/winstripe/browser.css
@@ -2319,6 +2319,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
diff --git a/src/current-patches/firefox/0021-Return-client-window-coordinates-for-mouse-event-scr.patch b/src/current-patches/firefox/0021-Return-client-window-coordinates-for-mouse-event-scr.patch
index d927f02..d1bbfcd 100644
--- a/src/current-patches/firefox/0021-Return-client-window-coordinates-for-mouse-event-scr.patch
+++ b/src/current-patches/firefox/0021-Return-client-window-coordinates-for-mouse-event-scr.patch
@@ -1,4 +1,4 @@
-From 5db96e68af26dfbfa2085d76efab8ddc09aaa45c Mon Sep 17 00:00:00 2001
+From 56a087769b2a258659bae4f626b37755c0961d6d Mon Sep 17 00:00:00 2001
From: Kathleen Brade <brade(a)pearlcrescent.com>
Date: Wed, 28 Nov 2012 10:49:09 -0500
Subject: [PATCH 21/26] Return client window coordinates for mouse event
@@ -10,7 +10,7 @@ Subject: [PATCH 21/26] Return client window coordinates for mouse event
2 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/content/events/src/nsDOMMouseEvent.cpp b/content/events/src/nsDOMMouseEvent.cpp
-index c1784c9..9718a90 100644
+index 0817397..3d8b26a 100644
--- a/content/events/src/nsDOMMouseEvent.cpp
+++ b/content/events/src/nsDOMMouseEvent.cpp
@@ -301,6 +301,20 @@ nsDOMMouseEvent::GetMozMovementY(int32_t* aMovementY)
diff --git a/src/current-patches/firefox/0022-Do-not-expose-physical-screen-info.-via-window-and-w.patch b/src/current-patches/firefox/0022-Do-not-expose-physical-screen-info.-via-window-and-w.patch
index 13551af..d8ea69d 100644
--- a/src/current-patches/firefox/0022-Do-not-expose-physical-screen-info.-via-window-and-w.patch
+++ b/src/current-patches/firefox/0022-Do-not-expose-physical-screen-info.-via-window-and-w.patch
@@ -1,4 +1,4 @@
-From c4e1460f46fc04d81ec643fa9680b8fad8bc2b29 Mon Sep 17 00:00:00 2001
+From 0149732cf5201db298f4b13be4cd73ae6094f011 Mon Sep 17 00:00:00 2001
From: Kathleen Brade <brade(a)pearlcrescent.com>
Date: Wed, 28 Nov 2012 11:25:14 -0500
Subject: [PATCH 22/26] Do not expose physical screen info. via window and
@@ -12,10 +12,10 @@ Subject: [PATCH 22/26] Do not expose physical screen info. via window and
4 files changed, 141 insertions(+), 0 deletions(-)
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
-index 6acd80a..3a370c9 100644
+index c06b715..b480ee5 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
-@@ -3742,6 +3742,10 @@ nsGlobalWindow::GetOuterWidth(int32_t* aOuterWidth)
+@@ -3745,6 +3745,10 @@ nsGlobalWindow::GetOuterWidth(int32_t* aOuterWidth)
{
FORWARD_TO_OUTER(GetOuterWidth, (aOuterWidth), NS_ERROR_NOT_INITIALIZED);
@@ -26,7 +26,7 @@ index 6acd80a..3a370c9 100644
nsIntSize sizeCSSPixels;
nsresult rv = GetOuterSize(&sizeCSSPixels);
NS_ENSURE_SUCCESS(rv, rv);
-@@ -3755,6 +3759,10 @@ nsGlobalWindow::GetOuterHeight(int32_t* aOuterHeight)
+@@ -3758,6 +3762,10 @@ nsGlobalWindow::GetOuterHeight(int32_t* aOuterHeight)
{
FORWARD_TO_OUTER(GetOuterHeight, (aOuterHeight), NS_ERROR_NOT_INITIALIZED);
@@ -37,7 +37,7 @@ index 6acd80a..3a370c9 100644
nsIntSize sizeCSSPixels;
nsresult rv = GetOuterSize(&sizeCSSPixels);
NS_ENSURE_SUCCESS(rv, rv);
-@@ -3817,6 +3825,12 @@ nsGlobalWindow::GetScreenX(int32_t* aScreenX)
+@@ -3820,6 +3828,12 @@ nsGlobalWindow::GetScreenX(int32_t* aScreenX)
{
FORWARD_TO_OUTER(GetScreenX, (aScreenX), NS_ERROR_NOT_INITIALIZED);
@@ -50,7 +50,7 @@ index 6acd80a..3a370c9 100644
nsCOMPtr<nsIBaseWindow> treeOwnerAsWin;
GetTreeOwner(getter_AddRefs(treeOwnerAsWin));
NS_ENSURE_TRUE(treeOwnerAsWin, NS_ERROR_FAILURE);
-@@ -3858,6 +3872,12 @@ nsGlobalWindow::GetMozInnerScreenX(float* aScreenX)
+@@ -3861,6 +3875,12 @@ nsGlobalWindow::GetMozInnerScreenX(float* aScreenX)
{
FORWARD_TO_OUTER(GetMozInnerScreenX, (aScreenX), NS_ERROR_NOT_INITIALIZED);
@@ -63,7 +63,7 @@ index 6acd80a..3a370c9 100644
nsRect r = GetInnerScreenRect();
*aScreenX = nsPresContext::AppUnitsToFloatCSSPixels(r.x);
return NS_OK;
-@@ -3868,6 +3888,12 @@ nsGlobalWindow::GetMozInnerScreenY(float* aScreenY)
+@@ -3871,6 +3891,12 @@ nsGlobalWindow::GetMozInnerScreenY(float* aScreenY)
{
FORWARD_TO_OUTER(GetMozInnerScreenY, (aScreenY), NS_ERROR_NOT_INITIALIZED);
@@ -76,7 +76,7 @@ index 6acd80a..3a370c9 100644
nsRect r = GetInnerScreenRect();
*aScreenY = nsPresContext::AppUnitsToFloatCSSPixels(r.y);
return NS_OK;
-@@ -4025,6 +4051,12 @@ nsGlobalWindow::GetScreenY(int32_t* aScreenY)
+@@ -4028,6 +4054,12 @@ nsGlobalWindow::GetScreenY(int32_t* aScreenY)
{
FORWARD_TO_OUTER(GetScreenY, (aScreenY), NS_ERROR_NOT_INITIALIZED);
@@ -89,7 +89,7 @@ index 6acd80a..3a370c9 100644
nsCOMPtr<nsIBaseWindow> treeOwnerAsWin;
GetTreeOwner(getter_AddRefs(treeOwnerAsWin));
NS_ENSURE_TRUE(treeOwnerAsWin, NS_ERROR_FAILURE);
-@@ -4071,6 +4103,20 @@ nsGlobalWindow::SetScreenY(int32_t aScreenY)
+@@ -4074,6 +4106,20 @@ nsGlobalWindow::SetScreenY(int32_t aScreenY)
return NS_OK;
}
diff --git a/src/current-patches/firefox/0023-Do-not-expose-system-colors-to-CSS-or-canvas.patch b/src/current-patches/firefox/0023-Do-not-expose-system-colors-to-CSS-or-canvas.patch
index ea6ee8f..a06ad44 100644
--- a/src/current-patches/firefox/0023-Do-not-expose-system-colors-to-CSS-or-canvas.patch
+++ b/src/current-patches/firefox/0023-Do-not-expose-system-colors-to-CSS-or-canvas.patch
@@ -1,4 +1,4 @@
-From 0b97e36981bb26406087bbd502a4d9e91e33a150 Mon Sep 17 00:00:00 2001
+From 39a2141abd8fd7c2723c4276a3501cb9cb120550 Mon Sep 17 00:00:00 2001
From: Kathleen Brade <brade(a)pearlcrescent.com>
Date: Wed, 28 Nov 2012 15:08:40 -0500
Subject: [PATCH 23/26] Do not expose system colors to CSS or canvas.
diff --git a/src/current-patches/firefox/0024-Isolate-the-Image-Cache-per-url-bar-domain.patch b/src/current-patches/firefox/0024-Isolate-the-Image-Cache-per-url-bar-domain.patch
index 0f1a702..862673b 100644
--- a/src/current-patches/firefox/0024-Isolate-the-Image-Cache-per-url-bar-domain.patch
+++ b/src/current-patches/firefox/0024-Isolate-the-Image-Cache-per-url-bar-domain.patch
@@ -1,4 +1,4 @@
-From 56d3f40086757ecefe1efbeca00b285a13bde5d4 Mon Sep 17 00:00:00 2001
+From e2d2cca918467240f4265799ead98defb1139db0 Mon Sep 17 00:00:00 2001
From: Mike Perry <mikeperry-git(a)torproject.org>
Date: Thu, 6 Dec 2012 14:19:34 -0800
Subject: [PATCH 24/26] Isolate the Image Cache per url bar domain.
@@ -10,7 +10,7 @@ not obey cacheKeys by default.
embedding/browser/webBrowser/nsContextMenuInfo.cpp | 27 ++-
extensions/cookie/nsCookiePermission.cpp | 3 +
image/public/imgILoader.idl | 4 +-
- image/src/imgLoader.cpp | 256 +++++++++++++-------
+ image/src/imgLoader.cpp | 257 +++++++++++++-------
image/src/imgLoader.h | 20 +-
image/src/imgRequest.cpp | 11 +-
image/src/imgRequest.h | 3 +
@@ -18,10 +18,10 @@ not obey cacheKeys by default.
netwerk/cookie/nsICookiePermission.idl | 1 +
toolkit/system/gnome/nsAlertsIconListener.cpp | 3 +-
widget/cocoa/nsMenuItemIconX.mm | 9 +-
- 12 files changed, 246 insertions(+), 118 deletions(-)
+ 12 files changed, 247 insertions(+), 118 deletions(-)
diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
-index fe3c8a0..43f8f69 100644
+index 8d58d8b..6a9c87c 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -121,6 +121,7 @@ static NS_DEFINE_CID(kXTFServiceCID, NS_XTFSERVICE_CID);
@@ -149,7 +149,7 @@ index da26463..ecff309 100644
in nsIPrincipal aLoadingPrincipal,
in nsILoadGroup aLoadGroup,
diff --git a/image/src/imgLoader.cpp b/image/src/imgLoader.cpp
-index ea51e8d..88e367c 100644
+index ea51e8d..4d5cfd2 100644
--- a/image/src/imgLoader.cpp
+++ b/image/src/imgLoader.cpp
@@ -39,6 +39,7 @@
@@ -566,7 +566,7 @@ index ea51e8d..88e367c 100644
} else {
LOG_MSG_WITH_PARAM(gImgLog,
"imgLoader::LoadImage |cache hit|", "request", request);
-@@ -1736,6 +1770,48 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI,
+@@ -1736,6 +1770,49 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI,
return NS_OK;
}
@@ -594,8 +594,9 @@ index ea51e8d..88e367c 100644
+ nsCOMPtr<nsIConsoleService> consoleSvc =
+ do_GetService(NS_CONSOLESERVICE_CONTRACTID);
+ if (consoleSvc) {
-+ nsAutoString msg(NS_LITERAL_STRING("imgLoader::GetCacheKey: NULL"
-+ " firstPartyURI for ").get());
++ nsAutoString msg(NS_LITERAL_STRING(
++ "imgLoader::GetCacheKey: NULL firstPartyURI for ")
++ .get());
+ msg.AppendASCII(spec.get());
+ consoleSvc->LogStringMessage(msg.get());
+ }
@@ -615,7 +616,7 @@ index ea51e8d..88e367c 100644
/* imgIRequest loadImageWithChannel(in nsIChannel channel, in imgIDecoderObserver aObserver, in nsISupports cx, out nsIStreamListener); */
NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderObserver *aObserver, nsISupports *aCX, nsIStreamListener **listener, imgIRequest **_retval)
{
-@@ -1746,22 +1822,27 @@ NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderOb
+@@ -1746,22 +1823,27 @@ NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderOb
nsCOMPtr<nsIURI> uri;
channel->GetURI(getter_AddRefs(uri));
@@ -648,7 +649,7 @@ index ea51e8d..88e367c 100644
if (cache.Get(spec, getter_AddRefs(entry)) && entry) {
// We don't want to kick off another network load. So we ask
-@@ -1833,7 +1914,7 @@ NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderOb
+@@ -1833,7 +1915,7 @@ NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderOb
channel->GetOriginalURI(getter_AddRefs(originalURI));
// No principal specified here, because we're not passed one.
@@ -657,7 +658,7 @@ index ea51e8d..88e367c 100644
aCX, nullptr, imgIRequest::CORS_NONE);
ProxyListener *pl = new ProxyListener(static_cast<nsIStreamListener *>(request.get()));
-@@ -1845,7 +1926,7 @@ NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderOb
+@@ -1845,7 +1927,7 @@ NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderOb
NS_RELEASE(pl);
// Try to add the new request into the cache.
@@ -666,7 +667,7 @@ index ea51e8d..88e367c 100644
rv = CreateNewProxyForRequest(request, loadGroup, aObserver,
requestFlags, nullptr, _retval);
-@@ -2132,6 +2213,7 @@ NS_IMETHODIMP imgCacheValidator::OnStartRequest(nsIRequest *aRequest, nsISupport
+@@ -2132,6 +2214,7 @@ NS_IMETHODIMP imgCacheValidator::OnStartRequest(nsIRequest *aRequest, nsISupport
int32_t corsmode = mRequest->GetCORSMode();
nsCOMPtr<nsIPrincipal> loadingPrincipal = mRequest->GetLoadingPrincipal();
@@ -674,7 +675,7 @@ index ea51e8d..88e367c 100644
// Doom the old request's cache entry
mRequest->RemoveFromCache();
-@@ -2142,16 +2224,16 @@ NS_IMETHODIMP imgCacheValidator::OnStartRequest(nsIRequest *aRequest, nsISupport
+@@ -2142,16 +2225,16 @@ NS_IMETHODIMP imgCacheValidator::OnStartRequest(nsIRequest *aRequest, nsISupport
// We use originalURI here to fulfil the imgIRequest contract on GetURI.
nsCOMPtr<nsIURI> originalURI;
channel->GetOriginalURI(getter_AddRefs(originalURI));
diff --git a/src/current-patches/firefox/0025-nsIHTTPChannel.redirectTo-API.patch b/src/current-patches/firefox/0025-nsIHTTPChannel.redirectTo-API.patch
index 1d81164..725e159 100644
--- a/src/current-patches/firefox/0025-nsIHTTPChannel.redirectTo-API.patch
+++ b/src/current-patches/firefox/0025-nsIHTTPChannel.redirectTo-API.patch
@@ -1,4 +1,4 @@
-From 87461432d5e55eee144ed18e8551b637f7919950 Mon Sep 17 00:00:00 2001
+From b3e34b6997e2aa709177210b6a1517bb4262843a Mon Sep 17 00:00:00 2001
From: Mike Perry <mikeperry-git(a)torproject.org>
Date: Mon, 14 Jan 2013 19:36:14 -0800
Subject: [PATCH 25/26] nsIHTTPChannel.redirectTo API.
@@ -266,7 +266,7 @@ index c13c969..e16afd6 100644
// For document loads we keep this protocol open after child's
// OnStopRequest, and send this msg (instead of __delete__) to allow
diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp
-index 9223d08..6bf11a1 100644
+index dc49b81..ca55d02 100644
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -1580,18 +1580,17 @@ nsHttpChannel::HandleAsyncRedirectChannelToHttps()
@@ -368,7 +368,7 @@ index 9223d08..6bf11a1 100644
// Adjust mCaps according to our request headers:
// - If "Connection: close" is set as a request header, then do not bother
-@@ -4401,6 +4434,12 @@ nsHttpChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *context)
+@@ -4406,6 +4439,12 @@ nsHttpChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *context)
if (mLoadGroup)
mLoadGroup->AddRequest(this, nullptr);
@@ -381,7 +381,7 @@ index 9223d08..6bf11a1 100644
// Collect mAsyncOpenTime after we have called all obsrevers like
// "http-on-modify-request" and load group observers that may set
// mTimingEnabled flag.
-@@ -5531,7 +5570,7 @@ nsHttpChannel::DoAuthRetry(nsAHttpConnection *conn)
+@@ -5536,7 +5575,7 @@ nsHttpChannel::DoAuthRetry(nsAHttpConnection *conn)
AddCookiesToRequest();
// notify "http-on-modify-request" observers
diff --git a/src/current-patches/firefox/0026-Isolate-DOM-storage-to-first-party-URI.patch b/src/current-patches/firefox/0026-Isolate-DOM-storage-to-first-party-URI.patch
index 89f4ed6..f431693 100644
--- a/src/current-patches/firefox/0026-Isolate-DOM-storage-to-first-party-URI.patch
+++ b/src/current-patches/firefox/0026-Isolate-DOM-storage-to-first-party-URI.patch
@@ -1,4 +1,4 @@
-From 69a8f50fc6d4881e48f29ef783e6246d6b7fbee4 Mon Sep 17 00:00:00 2001
+From 580d7d145ac93a42b6f0b1cfad8a1965a02c5050 Mon Sep 17 00:00:00 2001
From: Kathleen Brade <brade(a)pearlcrescent.com>
Date: Tue, 15 Jan 2013 14:18:43 -0800
Subject: [PATCH 26/26] Isolate DOM storage to first party URI
@@ -255,10 +255,10 @@ index 986f4b4..4f26a04 100644
* Clones all session storage objects and attaches them to the given docshell.
* Useful when duplicating tabs and their states.
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
-index 3a370c9..201a0a2 100644
+index b480ee5..0cc147a 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
-@@ -8382,7 +8382,18 @@ nsGlobalWindow::GetLocalStorage(nsIDOMStorage ** aLocalStorage)
+@@ -8385,7 +8385,18 @@ nsGlobalWindow::GetLocalStorage(nsIDOMStorage ** aLocalStorage)
nsIDocShell* docShell = GetDocShell();
nsCOMPtr<nsILoadContext> loadContext = do_QueryInterface(docShell);
