From 867b5a4918b0d5fe5b84f3ad140451a3e9eb3ceb Mon Sep 17 00:00:00 2001 From: Chris Kitching Date: Sun, 19 Jan 2014 19:25:47 +0000 Subject: [PATCH 1/2] Bug 961498: Prevent ICO decoder from exploding when faced with single-resource ICOs r=rnewman --- mobile/android/base/favicons/decoders/FaviconDecoder.java | 3 +-- mobile/android/base/favicons/decoders/ICODecoder.java | 2 +- mobile/android/base/favicons/decoders/LoadFaviconResult.java | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/mobile/android/base/favicons/decoders/FaviconDecoder.java b/mobile/android/base/favicons/decoders/FaviconDecoder.java index 2d3844419a8..d7df0ab53b7 100644 --- a/mobile/android/base/favicons/decoders/FaviconDecoder.java +++ b/mobile/android/base/favicons/decoders/FaviconDecoder.java @@ -5,7 +5,6 @@ package org.mozilla.gecko.favicons.decoders; import android.graphics.Bitmap; -import org.mozilla.gecko.GeckoAppShell; import org.mozilla.gecko.gfx.BitmapUtils; import java.util.Iterator; @@ -87,7 +86,7 @@ public class FaviconDecoder { result = new LoadFaviconResult(); result.mOffset = offset; result.mLength = length; - result.mHasMultipleBitmaps = false; + result.mIsICO = false; // We assume here that decodeByteArray doesn't hold on to the entire supplied // buffer -- worst case, each of our buffers will be twice the necessary size. diff --git a/mobile/android/base/favicons/decoders/ICODecoder.java b/mobile/android/base/favicons/decoders/ICODecoder.java index 01b23b449cd..3ee441cedda 100644 --- a/mobile/android/base/favicons/decoders/ICODecoder.java +++ b/mobile/android/base/favicons/decoders/ICODecoder.java @@ -345,7 +345,7 @@ public class ICODecoder implements Iterable { result.mFaviconBytes = mDecodand; result.mOffset = mOffset; result.mLength = mLen; - result.mHasMultipleBitmaps = mIconDirectory.length > 1; + result.mIsICO = true; return result; } diff --git a/mobile/android/base/favicons/decoders/LoadFaviconResult.java b/mobile/android/base/favicons/decoders/LoadFaviconResult.java index 60d3376a4c8..61f4601f4c8 100644 --- a/mobile/android/base/favicons/decoders/LoadFaviconResult.java +++ b/mobile/android/base/favicons/decoders/LoadFaviconResult.java @@ -25,7 +25,7 @@ public class LoadFaviconResult { int mOffset; int mLength; - boolean mHasMultipleBitmaps; + boolean mIsICO; Iterator mBitmapsDecoded; public Iterator getBitmaps() { @@ -49,7 +49,7 @@ public class LoadFaviconResult { // For results containing a single image, we re-encode the result as a PNG in an effort to // save space. - if (!mHasMultipleBitmaps) { + if (!mIsICO) { Bitmap favicon = ((FaviconDecoder.SingleBitmapIterator) mBitmapsDecoded).peek(); byte[] data = null; ByteArrayOutputStream stream = new ByteArrayOutputStream(); From e9863f07ee05803b63099a4e73fd1a8565c2a51e Mon Sep 17 00:00:00 2001 From: Gijs Kruitbosch Date: Sun, 19 Jan 2014 21:57:51 +0000 Subject: [PATCH 2/2] Bug 961532 - get rid of win7-specific-but-really-identical inverted Toolbar.png for Australis, r?ttaubert --- browser/themes/windows/Toolbar-inverted-aero.png | Bin 8941 -> 0 bytes browser/themes/windows/jar.mn | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 browser/themes/windows/Toolbar-inverted-aero.png diff --git a/browser/themes/windows/Toolbar-inverted-aero.png b/browser/themes/windows/Toolbar-inverted-aero.png deleted file mode 100644 index cea3d079b968e962c150b68eddf781b63e7f82af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8941 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 Hu0mjfrZs7% diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn index fe2502e310d..5dedf6e6c94 100644 --- a/browser/themes/windows/jar.mn +++ b/browser/themes/windows/jar.mn @@ -395,7 +395,7 @@ browser.jar: skin/classic/aero/browser/setDesktopBackground.css skin/classic/aero/browser/slowStartup-16.png skin/classic/aero/browser/Toolbar.png (Toolbar-aero.png) - skin/classic/aero/browser/Toolbar-inverted.png (Toolbar-inverted-aero.png) + skin/classic/aero/browser/Toolbar-inverted.png skin/classic/aero/browser/toolbarbutton-dropdown-arrow.png skin/classic/aero/browser/toolbarbutton-dropdown-arrow-inverted.png skin/classic/aero/browser/urlbar-arrow.png