commit e0f7cf921b0825e21ce31560038d5257afcc8e51 Author: Mike Perry mikeperry-git@fscked.org Date: Thu Aug 2 16:28:59 2012 -0700

Add missing include for MacOS. --- ...solate-the-Image-Cache-per-url-bar-domain.patch | 32 ++++++++++++-------- 1 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/current-patches/firefox/alpha/0021-Isolate-the-Image-Cache-per-url-bar-domain.patch b/src/current-patches/firefox/alpha/0021-Isolate-the-Image-Cache-per-url-bar-domain.patch index 2478af8..b21536c 100644 --- a/src/current-patches/firefox/alpha/0021-Isolate-the-Image-Cache-per-url-bar-domain.patch +++ b/src/current-patches/firefox/alpha/0021-Isolate-the-Image-Cache-per-url-bar-domain.patch @@ -1,4 +1,4 @@ -From 0b3b4970954c9dd7d85929491b887e45abe9c194 Mon Sep 17 00:00:00 2001 +From 1b18f231fce26c0b6d3c2bb2c6e30e30c8e05a1e Mon Sep 17 00:00:00 2001 From: Mike Perry mikeperry-git@torproject.org Date: Mon, 30 Jul 2012 18:37:36 -0700 Subject: [PATCH 21/21] Isolate the Image Cache per url bar domain. @@ -12,7 +12,7 @@ for a channel or nsIDocument. embedding/browser/webBrowser/nsContextMenuInfo.cpp | 29 ++- extensions/cookie/nsCookiePermission.cpp | 3 + image/public/imgILoader.idl | 4 +- - image/src/imgLoader.cpp | 202 ++++++++++++-------- + image/src/imgLoader.cpp | 200 ++++++++++++-------- image/src/imgLoader.h | 13 +- image/src/imgRequest.cpp | 9 +- image/src/imgRequest.h | 3 + @@ -20,19 +20,18 @@ for a channel or nsIDocument. netwerk/base/public/mozIThirdPartyUtil.idl | 21 ++ netwerk/cookie/nsICookiePermission.idl | 1 + toolkit/system/gnome/nsAlertsIconListener.cpp | 3 +- - widget/cocoa/nsMenuItemIconX.mm | 8 +- - 15 files changed, 272 insertions(+), 102 deletions(-) + widget/cocoa/nsMenuItemIconX.mm | 9 +- + 15 files changed, 272 insertions(+), 101 deletions(-)

diff --git a/content/base/src/ThirdPartyUtil.cpp b/content/base/src/ThirdPartyUtil.cpp -index 6a415e9..abf2eed 100644 +index 6a415e9..62333f3 100644 --- a/content/base/src/ThirdPartyUtil.cpp +++ b/content/base/src/ThirdPartyUtil.cpp -@@ -39,7 +39,10 @@ - #include "nsNetUtil.h" +@@ -40,6 +40,9 @@ #include "nsIServiceManager.h" #include "nsIHttpChannelInternal.h" -+#include "nsICookiePermission.h" #include "nsIDOMWindow.h" ++#include "nsICookiePermission.h" +#include "nsIDOMDocument.h" +#include "nsIDocument.h" #include "nsILoadContext.h" @@ -249,7 +248,7 @@ index 611b939..db9320b 100644 in nsIPrincipal aLoadingPrincipal, in nsILoadGroup aLoadGroup, diff --git a/image/src/imgLoader.cpp b/image/src/imgLoader.cpp -index 36c8e6a..8ed12dc 100644 +index 36c8e6a..dd16771 100644 --- a/image/src/imgLoader.cpp +++ b/image/src/imgLoader.cpp @@ -92,6 +92,7 @@ @@ -636,12 +635,11 @@ index 36c8e6a..8ed12dc 100644 // Look in the cache for our URI, and then validate it. // XXX For now ignore aCacheKey. We will need it in the future // for correctly dealing with image load requests that are a result -- // of post data. + // of post data. - imgCacheTable &cache = GetCache(uri); - nsCAutoString spec; - - uri->GetSpec(spec); -+ // of post data

if (cache.Get(spec, getter_AddRefs(entry)) && entry) { // We don't want to kick off another network load. So we ask @@ -879,10 +877,18 @@ index 250e4fb..614e70f 100644 nsnull, getter_AddRefs(mIconRequest)); } diff --git a/widget/cocoa/nsMenuItemIconX.mm b/widget/cocoa/nsMenuItemIconX.mm -index 9505ea2..8739c67 100644 +index 9505ea2..bc9b856 100644 --- a/widget/cocoa/nsMenuItemIconX.mm +++ b/widget/cocoa/nsMenuItemIconX.mm -@@ -338,9 +338,15 @@ nsMenuItemIconX::LoadIcon(nsIURI* aIconURI) +@@ -63,6 +63,7 @@ + #include "gfxImageSurface.h" + #include "imgIContainer.h" + #include "nsCocoaUtils.h" ++#include "mozIThirdPartyUtil.h" + + static const PRUint32 kIconWidth = 16; + static const PRUint32 kIconHeight = 16; +@@ -338,9 +339,15 @@ nsMenuItemIconX::LoadIcon(nsIURI* aIconURI) [mNativeMenuItem setImage:sPlaceholderIconImage]; }