author Marco Bonardo <mbonardo@mozilla.com>

Tue, 28 Mar 2017 17:30:28 +0200

changeset 561154 d3015836abd5f7737cab42a3b102b5d718c692d6

parent 561153 f50e0d4d0ab71a0b218c3d7caaa0da149838d148

child 561155 213ff3e89ae978aa1e9bc3993ff51a17481d7789

push id 53651

push user mak77@bonardo.net

push date Wed, 12 Apr 2017 09:15:32 +0000

reviewers adw

bugs 977177

milestone 55.0a1

toolkit/components/places/FaviconHelpers.cpp file | annotate | diff | comparison | revisions

toolkit/components/places/FaviconHelpers.h file | annotate | diff | comparison | revisions

toolkit/components/places/nsFaviconService.cpp file | annotate | diff | comparison | revisions

toolkit/components/places/tests/favicons/expected-favicon-big48.ico.png file | annotate | diff | comparison | revisions

toolkit/components/places/tests/favicons/favicon-multi-frame16.png file | annotate | diff | comparison | revisions

toolkit/components/places/tests/favicons/favicon-multi-frame32.png file | annotate | diff | comparison | revisions

toolkit/components/places/tests/favicons/favicon-multi-frame64.png file | annotate | diff | comparison | revisions

toolkit/components/places/tests/favicons/favicon-multi.ico file | annotate | diff | comparison | revisions

toolkit/components/places/tests/favicons/test_favicons_conversions.js file | annotate | diff | comparison | revisions

toolkit/components/places/tests/favicons/test_multiple_frames.js file | annotate | diff | comparison | revisions

toolkit/components/places/tests/favicons/xpcshell.ini file | annotate | diff | comparison | revisions

toolkit/components/places/tests/head_common.js file | annotate | diff | comparison | revisions
--- a/toolkit/components/places/FaviconHelpers.cpp
+++ b/toolkit/components/places/FaviconHelpers.cpp
@@ -305,17 +305,17 @@ FetchIconInfo(const RefPtr<Database>& aD
   }
 
   nsCOMPtr<mozIStorageStatement> stmt = aDB->GetStatement(
     "/* do not warn (bug no: not worth having a compound index) */ "
     "SELECT id, expire_ms, data, width "
     "FROM moz_icons "
     "WHERE fixed_icon_url_hash = hash(fixup_url(:url)) "
       "AND icon_url = :url "
-    "ORDER BY width ASC "
+    "ORDER BY width DESC "
   );
   NS_ENSURE_STATE(stmt);
   mozStorageStatementScoper scoper(stmt);
 
   DebugOnly<nsresult> rv = URIBinder::Bind(stmt, NS_LITERAL_CSTRING("url"),
                                            _icon.spec);
   MOZ_ASSERT(NS_SUCCEEDED(rv));
 
@@ -875,35 +875,31 @@ AsyncAssociateIconToPage::Run()
   // Then we can create the relations.
   nsCOMPtr<mozIStorageStatement> stmt;
   stmt = DB->GetStatement(
     "INSERT OR IGNORE INTO moz_icons_to_pages (page_id, icon_id) "
     "VALUES ((SELECT id from moz_pages_w_icons WHERE page_url_hash = hash(:page_url) AND page_url = :page_url), "
             ":icon_id) "
   );
   NS_ENSURE_STATE(stmt);
-  mozStorageStatementScoper scoper(stmt);
-  nsCOMPtr<mozIStorageBindingParamsArray> paramsArray;
-  rv = stmt->NewBindingParamsArray(getter_AddRefs(paramsArray));
-  NS_ENSURE_SUCCESS(rv, rv);
+
+  // For some reason using BindingParamsArray here fails execution, so we must
+  // execute the statements one by one.
+  // In the future we may want to investigate the reasons, sounds like related
+  // to contraints.
   for (const auto& payload : mIcon.payloads) {
+    mozStorageStatementScoper scoper(stmt);
     nsCOMPtr<mozIStorageBindingParams> params;
-    rv = paramsArray->NewBindingParams(getter_AddRefs(params));
-    NS_ENSURE_SUCCESS(rv, rv);
-    rv = URIBinder::Bind(params, NS_LITERAL_CSTRING("page_url"), mPage.spec);
+    rv = URIBinder::Bind(stmt, NS_LITERAL_CSTRING("page_url"), mPage.spec);
     NS_ENSURE_SUCCESS(rv, rv);
-    rv = params->BindInt64ByName(NS_LITERAL_CSTRING("icon_id"), payload.id);
+    rv = stmt->BindInt64ByName(NS_LITERAL_CSTRING("icon_id"), payload.id);
     NS_ENSURE_SUCCESS(rv, rv);
-    rv = paramsArray->AddParams(params);
+    rv = stmt->Execute();
     NS_ENSURE_SUCCESS(rv, rv);
   }
-  rv = stmt->BindParameters(paramsArray);
-  NS_ENSURE_SUCCESS(rv, rv);
-  rv = stmt->Execute();
-  NS_ENSURE_SUCCESS(rv, rv);
 
   mIcon.status |= ICON_STATUS_ASSOCIATED;
 
   rv = transaction.Commit();
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Finally, dispatch an event to the main thread to notify observers.
   nsCOMPtr<nsIRunnable> event = new NotifyIconObservers(mIcon, mPage, mCallback);
--- a/toolkit/components/places/FaviconHelpers.h
+++ b/toolkit/components/places/FaviconHelpers.h
@@ -115,16 +115,31 @@ struct PageData
   nsCString spec;
   nsCString bookmarkedSpec;
   nsString revHost;
   bool canAddToHistory; // False for disabled history and unsupported schemas.
   nsCString guid;
 };
 
 /**
+ * Info for a frame.
+ */
+struct FrameData
+{
+  FrameData(uint16_t aIndex, uint16_t aWidth)
+  : index(aIndex)
+  , width(aWidth)
+  {
+  }
+
+  uint16_t index;
+  uint16_t width;
+};
+
+/**
  * Async fetches icon from database or network, associates it with the required
  * page and finally notifies the change.
  */
 class AsyncFetchAndSetIconForPage final : public Runnable
                                         , public nsIStreamListener
                                         , public nsIInterfaceRequestor
                                         , public nsIChannelEventSink
                                         , public mozIPlacesPendingOperation
--- a/toolkit/components/places/nsFaviconService.cpp
+++ b/toolkit/components/places/nsFaviconService.cpp
@@ -52,16 +52,79 @@ using namespace mozilla::places;
  */
 class ExpireFaviconsStatementCallbackNotifier : public AsyncStatementCallback
 {
 public:
   ExpireFaviconsStatementCallbackNotifier();
   NS_IMETHOD HandleCompletion(uint16_t aReason);
 };
 
+namespace {
+
+/**
+ * Extracts and filters native sizes from the given container, based on the
+ * list of sizes we are supposed to retain.
+ * All calculation is done considering square sizes and the largest side.
+ * In case of multiple frames of the same size, only the first one is retained.
+ */
+nsresult
+GetFramesInfoForContainer(imgIContainer* aContainer,
+                           nsTArray<FrameData>& aFramesInfo) {
+  // Don't extract frames from animated images.
+  bool animated;
+  nsresult rv = aContainer->GetAnimated(&animated);
+  if (NS_FAILED(rv) || !animated) {
+    nsTArray<nsIntSize> nativeSizes;
+    rv = aContainer->GetNativeSizes(nativeSizes);
+    if (NS_SUCCEEDED(rv) && nativeSizes.Length() > 1) {
+      for (uint32_t i = 0; i < nativeSizes.Length(); ++i) {
+        nsIntSize nativeSize = nativeSizes[i];
+        // Only retain square frames.
+        if (nativeSize.width != nativeSize.height) {
+          continue;
+        }
+        // Check if it's one of the sizes we care about.
+        auto end = std::end(sFaviconSizes);
+        uint16_t* matchingSize = std::find(std::begin(sFaviconSizes), end,
+                                          nativeSize.width);
+        if (matchingSize != end) {
+          // We must avoid duped sizes, an image could contain multiple frames of
+          // the same size, but we can only store one. We could use an hashtable,
+          // but considered the average low number of frames, we'll just do a
+          // linear search.
+          bool dupe = false;
+          for (const auto& frameInfo : aFramesInfo) {
+            if (frameInfo.width == *matchingSize) {
+              dupe = true;
+              break;
+            }
+          }
+          if (!dupe) {
+            aFramesInfo.AppendElement(FrameData(i, *matchingSize));
+          }
+        }
+      }
+    }
+  }
+
+  if (aFramesInfo.Length() == 0) {
+    // Always have at least the default size.
+    int32_t width;
+    rv = aContainer->GetWidth(&width);
+    NS_ENSURE_SUCCESS(rv, rv);
+    int32_t height;
+    rv = aContainer->GetHeight(&height);
+    NS_ENSURE_SUCCESS(rv, rv);
+    // For non-square images, pick the largest side.
+    aFramesInfo.AppendElement(FrameData(0, std::max(width, height)));
+  }
+  return NS_OK;
+}
+
+} // namespace
 
 PLACES_FACTORY_SINGLETON_IMPLEMENTATION(nsFaviconService, gFaviconService)
 
 NS_IMPL_CLASSINFO(nsFaviconService, nullptr, 0, NS_FAVICONSERVICE_CID)
 NS_IMPL_ISUPPORTS_CI(
   nsFaviconService
 , nsIFaviconService
 , mozIAsyncFavicons
@@ -672,57 +735,56 @@ nsFaviconService::OptimizeIconSizes(Icon
   NS_ENSURE_SUCCESS(rv, rv);
 
   // decode image
   nsCOMPtr<imgIContainer> container;
   rv = GetImgTools()->DecodeImageData(stream, payload.mimeType,
                                       getter_AddRefs(container));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  IconPayload newPayload;
-  newPayload.mimeType = NS_LITERAL_CSTRING(PNG_MIME_TYPE);
-  // TODO: for ico files we should extract every single payload.
-  int32_t width;
-  rv = container->GetWidth(&width);
-  NS_ENSURE_SUCCESS(rv, rv);
-  int32_t height;
-  rv = container->GetHeight(&height);
+  // For ICO files, we must evaluate each of the frames we care about.
+  nsTArray<FrameData> framesInfo;
+  rv = GetFramesInfoForContainer(container, framesInfo);
   NS_ENSURE_SUCCESS(rv, rv);
-  // For non-square images, pick the largest side.
-  int32_t originalSize = std::max(width, height);
-  newPayload.width = originalSize;
-  for (uint16_t size : sFaviconSizes) {
-    if (size <= originalSize) {
-      newPayload.width = size;
-      break;
+
+  for (const auto& frameInfo : framesInfo) {
+    IconPayload newPayload;
+    newPayload.mimeType = NS_LITERAL_CSTRING(PNG_MIME_TYPE);
+    newPayload.width = frameInfo.width;
+    for (uint16_t size : sFaviconSizes) {
+      if (size <= frameInfo.width) {
+        newPayload.width = size;
+        break;
+      }
     }
-  }
 
-  // If the original payload is png and the size is the same, no reason to
-  // rescale the image.
-  if (newPayload.mimeType.Equals(payload.mimeType) &&
-      newPayload.width == originalSize) {
-    newPayload.data = payload.data;
-  } else {
-    // scale and recompress
-    nsCOMPtr<nsIInputStream> iconStream;
-    rv = GetImgTools()->EncodeScaledImage(container,
-                                          newPayload.mimeType,
-                                          newPayload.width,
-                                          newPayload.width,
-                                          EmptyString(),
-                                          getter_AddRefs(iconStream));
-    NS_ENSURE_SUCCESS(rv, rv);
-    // Read the stream into the new buffer.
-    rv = NS_ConsumeStream(iconStream, UINT32_MAX, newPayload.data);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
+    // If the original payload is png and the size is the same, no reason to
+    // rescale the image.
+    if (newPayload.mimeType.Equals(payload.mimeType) &&
+        newPayload.width == frameInfo.width) {
+      newPayload.data = payload.data;
+    } else {
+      // Scale and recompress.
+      // Since EncodeScaledImage use SYNC_DECODE, it will pick the best frame.
+      nsCOMPtr<nsIInputStream> iconStream;
+      rv = GetImgTools()->EncodeScaledImage(container,
+                                            newPayload.mimeType,
+                                            newPayload.width,
+                                            newPayload.width,
+                                            EmptyString(),
+                                            getter_AddRefs(iconStream));
+      NS_ENSURE_SUCCESS(rv, rv);
+      // Read the stream into the new buffer.
+      rv = NS_ConsumeStream(iconStream, UINT32_MAX, newPayload.data);
+      NS_ENSURE_SUCCESS(rv, rv);
+    }
 
-  if (newPayload.data.Length() < nsIFaviconService::MAX_FAVICON_BUFFER_SIZE) {
-    aIcon.payloads.AppendElement(newPayload);
+    if (newPayload.data.Length() < nsIFaviconService::MAX_FAVICON_BUFFER_SIZE) {
+      aIcon.payloads.AppendElement(newPayload);
+    }
   }
 
   return NS_OK;
 }
 
 nsresult
 nsFaviconService::GetFaviconDataAsync(const nsCString& aFaviconURI,
                                       mozIStorageStatementCallback *aCallback)
--- a/toolkit/components/places/tests/favicons/test_favicons_conversions.js
+++ b/toolkit/components/places/tests/favicons/test_favicons_conversions.js
@@ -24,108 +24,101 @@ var isWindows = ("@mozilla.org/windows-r
  *        If false, the icon should be stored as is.  If true, the expected data
  *        is loaded from a file named "expected-" + aFileName + ".png".
  * @param aVaryOnWindows
  *        Indicates that the content of the converted image can be different on
  *        Windows and should not be checked on that platform.
  * @param aCallback
  *        This function is called after the check finished.
  */
-function checkFaviconDataConversion(aFileName, aFileMimeType, aFileLength,
-                                    aExpectConversion, aVaryOnWindows,
-                                    aCallback) {
+function* checkFaviconDataConversion(aFileName, aFileMimeType, aFileLength,
+                                    aExpectConversion, aVaryOnWindows) {
   let pageURI = NetUtil.newURI("http://places.test/page/" + aFileName);
-  PlacesTestUtils.addVisits({ uri: pageURI, transition: TRANSITION_TYPED }).then(
-    function() {
-      let faviconURI = NetUtil.newURI("http://places.test/icon/" + aFileName);
-      let fileData = readFileOfLength(aFileName, aFileLength);
+  yield PlacesTestUtils.addVisits({ uri: pageURI, transition: TRANSITION_TYPED });
+  let faviconURI = NetUtil.newURI("http://places.test/icon/" + aFileName);
+  let fileData = readFileOfLength(aFileName, aFileLength);
 
-      PlacesUtils.favicons.replaceFaviconData(faviconURI, fileData, fileData.length,
-                                              aFileMimeType);
-      PlacesUtils.favicons.setAndFetchFaviconForPage(pageURI, faviconURI, true,
-        PlacesUtils.favicons.FAVICON_LOAD_NON_PRIVATE,
-        function CFDC_verify(aURI, aDataLen, aData, aMimeType) {
-          if (!aExpectConversion) {
-            do_check_true(compareArrays(aData, fileData));
-            do_check_eq(aMimeType, aFileMimeType);
-          } else {
-            if (!aVaryOnWindows || !isWindows) {
-              let expectedFile = do_get_file("expected-" + aFileName + ".png");
-              do_check_true(compareArrays(aData, readFileData(expectedFile)));
-            }
-            do_check_eq(aMimeType, "image/png");
+  PlacesUtils.favicons.replaceFaviconData(faviconURI, fileData, fileData.length,
+                                          aFileMimeType);
+  yield new Promise(resolve => {
+    PlacesUtils.favicons.setAndFetchFaviconForPage(pageURI, faviconURI, true,
+      PlacesUtils.favicons.FAVICON_LOAD_NON_PRIVATE,
+      (aURI, aDataLen, aData, aMimeType) => {
+        if (!aExpectConversion) {
+          do_check_true(compareArrays(aData, fileData));
+          do_check_eq(aMimeType, aFileMimeType);
+        } else {
+          if (!aVaryOnWindows || !isWindows) {
+            let expectedFile = do_get_file("expected-" + aFileName + ".png");
+            do_check_true(compareArrays(aData, readFileData(expectedFile)));
           }
-
-          aCallback();
-        }, Services.scriptSecurityManager.getSystemPrincipal());
-    });
-}
-
-// Tests
-
-function run_test() {
-  run_next_test();
+          do_check_eq(aMimeType, "image/png");
+        }
+        resolve();
+      }, Services.scriptSecurityManager.getSystemPrincipal());
+  });
 }
 
-add_test(function test_storing_a_normal_16x16_icon() {
+
+add_task(function* test_storing_a_normal_16x16_icon() {
   // 16x16 png, 286 bytes.
   // optimized: no
-  checkFaviconDataConversion("favicon-normal16.png", "image/png", 286,
-                             false, false, run_next_test);
+  yield checkFaviconDataConversion("favicon-normal16.png", "image/png", 286,
+                                   false, false);
 });
 
-add_test(function test_storing_a_normal_32x32_icon() {
+add_task(function* test_storing_a_normal_32x32_icon() {
   // 32x32 png, 344 bytes.
   // optimized: no
-  checkFaviconDataConversion("favicon-normal32.png", "image/png", 344,
-                             false, false, run_next_test);
+  yield checkFaviconDataConversion("favicon-normal32.png", "image/png", 344,
+                                   false, false);
 });
 
-add_test(function test_storing_a_big_16x16_icon() {
+add_task(function* test_storing_a_big_16x16_icon() {
   //  in: 16x16 ico, 1406 bytes.
   // optimized: yes
-  checkFaviconDataConversion("favicon-big16.ico", "image/x-icon", 1406,
-                             true, false, run_next_test);
+  yield checkFaviconDataConversion("favicon-big16.ico", "image/x-icon", 1406,
+                                   true, false);
 });
 
-add_test(function test_storing_an_oversize_4x4_icon() {
+add_task(function* test_storing_an_oversize_4x4_icon() {
   //  in: 4x4 jpg, 4751 bytes.
   // optimized: yes
-  checkFaviconDataConversion("favicon-big4.jpg", "image/jpeg", 4751,
-                             true, false, run_next_test);
+  yield checkFaviconDataConversion("favicon-big4.jpg", "image/jpeg", 4751,
+                                   true, false);
 });
 
-add_test(function test_storing_an_oversize_32x32_icon() {
+add_task(function* test_storing_an_oversize_32x32_icon() {
   //  in: 32x32 jpg, 3494 bytes.
   // optimized: yes
-  checkFaviconDataConversion("favicon-big32.jpg", "image/jpeg", 3494,
-                             true, true, run_next_test);
+  yield checkFaviconDataConversion("favicon-big32.jpg", "image/jpeg", 3494,
+                                   true, true);
 });
 
-add_test(function test_storing_an_oversize_48x48_icon() {
+add_task(function* test_storing_an_oversize_48x48_icon() {
   //  in: 48x48 ico, 56646 bytes.
   // (howstuffworks.com icon, contains 13 icons with sizes from 16x16 to
   // 48x48 in varying depths)
   // optimized: yes
-  checkFaviconDataConversion("favicon-big48.ico", "image/x-icon", 56646,
-                             true, false, run_next_test);
+  yield checkFaviconDataConversion("favicon-big48.ico", "image/x-icon", 56646,
+                                   true, false);
 });
 
-add_test(function test_storing_an_oversize_64x64_icon() {
+add_task(function* test_storing_an_oversize_64x64_icon() {
   //  in: 64x64 png, 10698 bytes.
   // optimized: yes
-  checkFaviconDataConversion("favicon-big64.png", "image/png", 10698,
-                             true, false, run_next_test);
+  yield checkFaviconDataConversion("favicon-big64.png", "image/png", 10698,
+                                   true, false);
 });
 
-add_test(function test_scaling_an_oversize_160x3_icon() {
+add_task(function* test_scaling_an_oversize_160x3_icon() {
   //  in: 160x3 jpg, 5095 bytes.
   // optimized: yes
-  checkFaviconDataConversion("favicon-scale160x3.jpg", "image/jpeg", 5095,
-                             true, false, run_next_test);
+  yield checkFaviconDataConversion("favicon-scale160x3.jpg", "image/jpeg", 5095,
+                                   true, false);
 });
 
-add_test(function test_scaling_an_oversize_3x160_icon() {
+add_task(function* test_scaling_an_oversize_3x160_icon() {
   //  in: 3x160 jpg, 5059 bytes.
   // optimized: yes
-  checkFaviconDataConversion("favicon-scale3x160.jpg", "image/jpeg", 5059,
-                             true, false, run_next_test);
+  yield checkFaviconDataConversion("favicon-scale3x160.jpg", "image/jpeg", 5059,
+                                   true, false);
 });
new file mode 100644
--- /dev/null
+++ b/toolkit/components/places/tests/favicons/test_multiple_frames.js
@@ -0,0 +1,43 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * This file tests support for icons with multiple frames (like .ico files).
+ */
+
+add_task(function* () {
+  //  in: 48x48 ico, 56646 bytes.
+  // (howstuffworks.com icon, contains 13 icons with sizes from 16x16 to
+  // 48x48 in varying depths)
+  let pageURI = NetUtil.newURI("http://places.test/page/");
+  yield PlacesTestUtils.addVisits(pageURI);
+  let faviconURI = NetUtil.newURI("http://places.test/icon/favicon-multi.ico");
+  // Fake window.
+  let win = { devicePixelRatio: 1.0 };
+  let icoData = readFileData(do_get_file("favicon-multi.ico"));
+  PlacesUtils.favicons.replaceFaviconData(faviconURI, icoData, icoData.length,
+                                          "image/x-icon");
+  yield setFaviconForPage(pageURI, faviconURI);
+
+  for (let size of [16, 32, 64]) {
+    let file = do_get_file(`favicon-multi-frame${size}.png`);
+    let data = readFileData(file);
+
+    do_print("Check getFaviconDataForPage");
+    let icon = yield getFaviconDataForPage(pageURI, size);
+    Assert.equal(icon.mimeType, "image/png");
+    Assert.deepEqual(icon.data, data);
+
+    do_print("Check moz-anno:favicon protocol");
+    yield compareFavicons(
+      Services.io.newFileURI(file),
+      PlacesUtils.urlWithSizeRef(win, PlacesUtils.favicons.getFaviconLinkForIcon(faviconURI).spec, size)
+    );
+
+    do_print("Check page-icon protocol");
+    yield compareFavicons(
+      Services.io.newFileURI(file),
+      PlacesUtils.urlWithSizeRef(win, "page-icon:" + pageURI.spec, size)
+    );
+  }
+});
--- a/toolkit/components/places/tests/favicons/xpcshell.ini
+++ b/toolkit/components/places/tests/favicons/xpcshell.ini
@@ -9,25 +9,30 @@ support-files =
   expected-favicon-big64.png.png
   expected-favicon-scale160x3.jpg.png
   expected-favicon-scale3x160.jpg.png
   favicon-big16.ico
   favicon-big32.jpg
   favicon-big4.jpg
   favicon-big48.ico
   favicon-big64.png
+  favicon-multi.ico
+  favicon-multi-frame16.png
+  favicon-multi-frame32.png
+  favicon-multi-frame64.png
   favicon-normal16.png
   favicon-normal32.png
   favicon-scale160x3.jpg
   favicon-scale3x160.jpg
 
 [test_expireAllFavicons.js]
 [test_expire_on_new_icons.js]
 [test_favicons_conversions.js]
 [test_favicons_protocols_ref.js]
 [test_getFaviconDataForPage.js]
 [test_getFaviconURLForPage.js]
 [test_moz-anno_favicon_mime_type.js]
+[test_multiple_frames.js]
 [test_page-icon_protocol.js]
 [test_query_result_favicon_changed_on_child.js]
 [test_replaceFaviconData.js]
 [test_replaceFaviconDataFromDataURL.js]
 [test_svg_favicon.js]
--- a/toolkit/components/places/tests/head_common.js
+++ b/toolkit/components/places/tests/head_common.js
@@ -884,16 +884,26 @@ function getFaviconUrlForPage(page, widt
                                           : NetUtil.newURI(new URL(page).href);
   return new Promise(resolve => {
     PlacesUtils.favicons.getFaviconURLForPage(pageURI, iconURI => {
       resolve(iconURI.spec);
     }, width);
   });
 }
 
+function getFaviconDataForPage(page, width = 0) {
+  let pageURI = page instanceof Ci.nsIURI ? page
+                                          : NetUtil.newURI(new URL(page).href);
+  return new Promise(resolve => {
+    PlacesUtils.favicons.getFaviconDataForPage(pageURI, (iconUri, len, data, mimeType) => {
+      resolve({ data, mimeType });
+    }, width);
+  });
+}
+
 /**
  * Asynchronously compares contents from 2 favicon urls.
  */
 function* compareFavicons(icon1, icon2, msg) {
   icon1 = new URL(icon1 instanceof Ci.nsIURI ? icon1.spec : icon1);
   icon2 = new URL(icon2 instanceof Ci.nsIURI ? icon2.spec : icon2);
 
   function getIconData(icon) {
author	Marco Bonardo <mbonardo@mozilla.com>
	Tue, 28 Mar 2017 17:30:28 +0200
changeset 561154	d3015836abd5f7737cab42a3b102b5d718c692d6
parent 561153	f50e0d4d0ab71a0b218c3d7caaa0da149838d148
child 561155	213ff3e89ae978aa1e9bc3993ff51a17481d7789
push id	53651
push user	mak77@bonardo.net
push date	Wed, 12 Apr 2017 09:15:32 +0000
reviewers	adw
bugs	977177
milestone	55.0a1
toolkit/components/places/FaviconHelpers.cpp		file \| annotate \| diff \| comparison \| revisions
toolkit/components/places/FaviconHelpers.h		file \| annotate \| diff \| comparison \| revisions
toolkit/components/places/nsFaviconService.cpp		file \| annotate \| diff \| comparison \| revisions
toolkit/components/places/tests/favicons/expected-favicon-big48.ico.png		file \| annotate \| diff \| comparison \| revisions
toolkit/components/places/tests/favicons/favicon-multi-frame16.png		file \| annotate \| diff \| comparison \| revisions
toolkit/components/places/tests/favicons/favicon-multi-frame32.png		file \| annotate \| diff \| comparison \| revisions
toolkit/components/places/tests/favicons/favicon-multi-frame64.png		file \| annotate \| diff \| comparison \| revisions
toolkit/components/places/tests/favicons/favicon-multi.ico		file \| annotate \| diff \| comparison \| revisions
toolkit/components/places/tests/favicons/test_favicons_conversions.js		file \| annotate \| diff \| comparison \| revisions
toolkit/components/places/tests/favicons/test_multiple_frames.js		file \| annotate \| diff \| comparison \| revisions
toolkit/components/places/tests/favicons/xpcshell.ini		file \| annotate \| diff \| comparison \| revisions
toolkit/components/places/tests/head_common.js		file \| annotate \| diff \| comparison \| revisions