Attachment #8621304 for bug #366324

Attachment #8621304: Patch v.2 for bug #366324

View | Details | Raw Unified | Return to bug 366324
Collapse All | Expand All





    nsCOMPtr<nsIURI> iconURI;
    rv = NS_NewURI(getter_AddRefs(iconURI), mIcon.spec);
    NS_ENSURE_SUCCESS(rv, rv);
    rv = favicons->AddFailedFavicon(iconURI);
    NS_ENSURE_SUCCESS(rv, rv);
    return NS_OK;
  }

  nsCOMPtr<nsIChannel> channel = do_QueryInterface(aRequest);
  // aRequest should always QI to nsIChannel.
  // See AsyncFetchAndSetIconFromNetwork::Run()
  MOZ_ASSERT(channel);

  nsAutoCString contentType;
  channel->GetContentType(contentType);
  // Bug 366324 - can't sniff SVG yet, so rely on server-specified type
  if (contentType.EqualsLiteral("image/svg+xml")) {
    mIcon.mimeType.AssignLiteral("image/svg+xml");
  } else {
    NS_SniffContent(NS_DATA_SNIFFER_CATEGORY, aRequest,
                    TO_INTBUFFER(mIcon.data), mIcon.data.Length(),
                    mIcon.mimeType);
  }

  // If the icon does not have a valid MIME type, add it to the failed cache.
  if (mIcon.mimeType.IsEmpty()) {
    nsCOMPtr<nsIURI> iconURI;
    rv = NS_NewURI(getter_AddRefs(iconURI), mIcon.spec);
    NS_ENSURE_SUCCESS(rv, rv);
    rv = favicons->AddFailedFavicon(iconURI);
    NS_ENSURE_SUCCESS(rv, rv);
    return NS_OK;
  }

  nsCOMPtr<nsIChannel> channel = do_QueryInterface(aRequest);
  // aRequest should always QI to nsIChannel.
  // See AsyncFetchAndSetIconFromNetwork::Run()
  MOZ_ASSERT(channel);
  mIcon.expiration = GetExpirationTimeFromChannel(channel);

  // Telemetry probes to measure the favicon file sizes for each different file type.
  // This allow us to measure common file sizes while also observing each type popularity.
  if (mIcon.mimeType.EqualsLiteral("image/png")) {
    mozilla::Telemetry::Accumulate(mozilla::Telemetry::PLACES_FAVICON_PNG_SIZES, mIcon.data.Length());
  }
  else if (mIcon.mimeType.EqualsLiteral("image/x-icon") ||





// This imports various other objects in addition to PlacesUtils.
Cu.import("resource://gre/modules/PlacesUtils.jsm");

XPCOMUtils.defineLazyGetter(this, "SMALLPNG_DATA_URI", function() {
  return NetUtil.newURI(
         "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAA" +
         "AAAA6fptVAAAACklEQVQI12NgAAAAAgAB4iG8MwAAAABJRU5ErkJggg==");
});
XPCOMUtils.defineLazyGetter(this, "SMALLSVG_DATA_URI", function() {
  return NetUtil.newURI(
         "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy5" +
         "3My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDAgMTAwIiBmaWxs" +
         "PSIjNDI0ZTVhIj4NCiAgPGNpcmNsZSBjeD0iNTAiIGN5PSI1MCIgcj0iN" +
         "DQiIHN0cm9rZT0iIzQyNGU1YSIgc3Ryb2tlLXdpZHRoPSIxMSIgZmlsbD" +
         "0ibm9uZSIvPg0KICA8Y2lyY2xlIGN4PSI1MCIgY3k9IjI0LjYiIHI9IjY" +
         "uNCIvPg0KICA8cmVjdCB4PSI0NSIgeT0iMzkuOSIgd2lkdGg9IjEwLjEi" +
         "IGhlaWdodD0iNDEuOCIvPg0KPC9zdmc%2BDQo%3D");
});

let gTestDir = do_get_cwd();

// Initialize profile.
let gProfD = do_get_profile();

// Remove any old database.
clearDB();

-      Line
+  Link Here
-      Line 0
+  Link Here
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+function run_test() {
+  run_next_test();
+}
+let pageuri = NetUtil.newURI("http://deliciousbacon.com/");
+// First, add a history entry or else Places is unhappy.
+add_test(function test_addVisit() {
+  PlacesTestUtils.addVisits({
+    uri: pageuri,
+    transition: TRANSITION_LINK,
+    visitDate: Date.now() * 1000
+  }).then(run_next_test());
+});
+// Test adding the favicon
+add_test(function test_setFavicon() {
+  function onSetComplete(aURI, aDataLen, aData, aMimeType) {
+    equal(aURI.spec, SMALLSVG_DATA_URI.spec, "setFavicon aURI check");
+    equal(aDataLen, 263, "setFavicon aDataLen check");
+    equal(aMimeType, "image/svg+xml", "setFavicon aMimeType check");
+    run_next_test();
+  }
+  PlacesUtils.favicons.setAndFetchFaviconForPage(pageuri, SMALLSVG_DATA_URI,
+                                                 false,
+                                                 PlacesUtils.favicons.FAVICON_LOAD_NON_PRIVATE,
+                                                 onSetComplete);
+});
+// Test fetching the favicon
+add_test(function test_getFavicon() {
+  function onGetComplete(aURI, aDataLen, aData, aMimeType) {
+    equal(aURI.spec, SMALLSVG_DATA_URI.spec, "getFavicon aURI check");
+    equal(aDataLen, 263, "getFavicon aDataLen check");
+    equal(aMimeType, "image/svg+xml", "getFavicon aMimeType check");
+    run_next_test();
+  }
+  PlacesUtils.favicons.getFaviconDataForPage(pageuri, onGetComplete);
+});





[test_preventive_maintenance_runTasks.js]
[test_promiseBookmarksTree.js]
[test_removeVisitsByTimeframe.js]
# Bug 676989: test hangs consistently on Android
skip-if = os == "android"
[test_resolveNullBookmarkTitles.js]
[test_result_sort.js]
[test_sql_guid_functions.js]
[test_svg_favicon.js]
[test_tag_autocomplete_search.js]
[test_tagging.js]
[test_telemetry.js]
[test_update_frecency_after_delete.js]
# Bug 676989: test hangs consistently on Android
skip-if = os == "android"
[test_utils_backups_create.js]
[test_utils_getURLsForContainerNode.js]

Return to bug 366324

Sep	OCT	Nov
	02
2022	2023	2024

Bugzilla

Quick Search

Attachment #8621304: Patch v.2 for bug #366324