Bug 521116: showing 'All bookmarks' from the awesomebar/autocomplete dropdown option can be very slow [r=mark.finkle]

2025-03-09 04:25:38 +00:00 · 2009-11-23 11:44:34 -05:00 · 2009-11-23 11:44:34 -05:00 · e1f83ef4c0
commit e1f83ef4c0
parent 39aade921c
6 changed files with 50 additions and 55 deletions
--- a/mobile/chrome/content/bindings.xml
+++ b/mobile/chrome/content/bindings.xml
@ -347,15 +347,6 @@
  <binding id="place-base">
    <content/>
    <implementation>
-      <constructor>
-        <![CDATA[
-          let itemId = this.getAttribute("itemid");
-          if (itemId)
-            this.init(itemId);
-        ]]>
-      </constructor>
-
-      <field name="_itemId">null</field>
      <field name="_uri">null</field>
      <field name="_control">null</field>
      <field name="_isEditing">false</field>
@ -364,10 +355,6 @@
        Components.classes["@mozilla.org/network/io-service;1"]
                  .getService(Components.interfaces.nsIIOService);
      </field>
-      <field name="_faviconService" readonly="true">
-        Components.classes["@mozilla.org/browser/favicon-service;1"]
-                  .getService(Components.interfaces.nsIFaviconService);
-      </field>

      <field name="_nameField">
        document.getAnonymousElementByAttribute(this, "anonid", "name");
@ -378,9 +365,18 @@
      <field name="_tagsField">
        document.getAnonymousElementByAttribute(this, "anonid", "tags");
      </field>
-      <property name="itemId" onget="return this._itemId"/>
+      <property name="itemId" onget="return this.getAttribute('itemid');"/>
      <property name="type" onget="return this.getAttribute('type');"/>

+      <property name="uri">
+        <getter><![CDATA[
+          if (!this._uri && this.getAttribute("uri"))
+            this._uri = this._ioService.newURI(this.getAttribute("uri"), null, null);
+
+          return this._uri;
+        ]]></getter>
+      </property>
+
      <property name="name" onget="return this._nameField.value"
                            onset="this._nameField.value = val; return val;"/>
      <property name="spec" onget="return this._uriField.value"
@ -427,26 +423,11 @@
        </getter>
      </property>

-      <method name="init">
-        <parameter name="aItemId"/>
-        <body>
-          <![CDATA[
-            this._itemId = aItemId;
-            if (!this._itemId)
-              return;
-
-            if (this.hasAttribute("uri") && this.type != "folder") {
-              this._uri = this._ioService.newURI(this.getAttribute("uri"), null, null);
-              this.setAttribute("src", this._faviconService.getFaviconImageForPage(this._uri).spec);
-            }
-          ]]>
-        </body>
-      </method>
      <method name="startEditing">
        <parameter name="autoSelect"/>
        <body>
          <![CDATA[
-            if (!this._itemId)
+            if (!this.itemId)
              return;

            this._isEditing = true;
@ -493,8 +474,8 @@
        <body>
          <![CDATA[
            // Update the tags
-            if (this._uri && this.type != "folder") {
-              let currentTags = PlacesUtils.tagging.getTagsForURI(this._uri, {});
+            if (this.uri && this.type != "folder") {
+              let currentTags = PlacesUtils.tagging.getTagsForURI(this.uri, {});
              let tags = this.tagsAsArray;
              if (tags.length > 0 || currentTags.length > 0) {
                let tagsToRemove = [];
@ -509,46 +490,46 @@
                }

                if (tagsToAdd.length > 0)
-                  PlacesUtils.tagging.tagURI(this._uri, tagsToAdd);
+                  PlacesUtils.tagging.tagURI(this.uri, tagsToAdd);
                if (tagsToRemove.length > 0)
-                  PlacesUtils.tagging.untagURI(this._uri, tagsToRemove);
+                  PlacesUtils.tagging.untagURI(this.uri, tagsToRemove);
              }
              this.setAttribute('tags', this.tags);

              // If the URI was updated change it in the bookmark, but don't
              // allow a blank URI. Revert to previous URI if blank.
              let spec = this.spec;
-              if (spec && this._uri.spec != spec) {
+              if (spec && this.uri.spec != spec) {
                try {
                  this._uri = this._ioService.newURI(spec, null, null);
-                  PlacesUtils.bookmarks.changeBookmarkURI(this._itemId, this._uri);
+                  PlacesUtils.bookmarks.changeBookmarkURI(this.itemId, this.uri);
                  this.setAttribute('uri', this.spec);
                }
                catch (e) { }
              }
-              if (spec != this._uri.spec)
-                spec = this.spec = this._uri.spec;
+              if (spec != this.uri.spec)
+                spec = this.spec = this.uri.spec;
            }

            // Update the name and use the URI if name is blank
            this.name = this.name || spec;
            this.setAttribute('title', this.name);
-            PlacesUtils.bookmarks.setItemTitle(this._itemId, this.name);
+            PlacesUtils.bookmarks.setItemTitle(this.itemId, this.name);
          ]]>
        </body>
      </method>
      <method name="remove">
        <body>
          <![CDATA[
-            PlacesUtils.bookmarks.removeItem(this._itemId);
+            PlacesUtils.bookmarks.removeItem(this.itemId);

            // If this was the last bookmark (excluding tag-items and livemark
            // children, see getMostRecentBookmarkForURI) for the bookmark's url,
            // remove the url from tag containers as well.
-            if (this._uri && this.type != "folder") {
-              if (PlacesUtils.getMostRecentBookmarkForURI(this._uri) == -1) {
-                var tags = PlacesUtils.tagging.getTagsForURI(this._uri, {});
-                PlacesUtils.tagging.untagURI(this._uri, tags);
+            if (this.uri && this.type != "folder") {
+              if (PlacesUtils.getMostRecentBookmarkForURI(this.uri) == -1) {
+                var tags = PlacesUtils.tagging.getTagsForURI(this.uri, {});
+                PlacesUtils.tagging.untagURI(this.uri, tags);
              }
            }

@ -807,11 +788,12 @@

            children.scrollBoxObject.scrollTo(0, 0);

+            let fragment = document.createDocumentFragment();
            let childItems = this._getChildren(aRootFolder);
-            for (let i=0; i<childItems.length; i++) {
-              let node = childItems[i];
-              children.appendChild(this.createItem(node));
-            }
+            let count = childItems.length;
+            for (let i=0; i<count; i++)
+              fragment.appendChild(this.createItem(childItems[i]));
+            children.appendChild(fragment);
          ]]>
        </body>
      </method>
@ -830,9 +812,11 @@
            child.setAttribute("tags", aItem.tags);
            if (aItem.type == Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER)
              child.setAttribute("type", "folder");
+            else
+              child.setAttribute("src", aItem.icon);

            // XXX make a <handler>
-            var self = this;
+            let self = this;
            child.addEventListener("click", function(e) { self._fireOpen(e, child); }, false);

            return child;
--- a/mobile/chrome/content/browser-ui.js
+++ b/mobile/chrome/content/browser-ui.js
@ -884,13 +884,15 @@ var BookmarkHelper = {
    let title = PlacesUtils.bookmarks.getItemTitle(itemId);
    let tags = PlacesUtils.tagging.getTagsForURI(aURI, {});

-    this._editor = document.createElement("placeitem");
+    const XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+    this._editor = document.createElementNS(XULNS, "placeitem");
    this._editor.setAttribute("id", "bookmark-item");
    this._editor.setAttribute("flex", "1");
    this._editor.setAttribute("type", "bookmark");
    this._editor.setAttribute("ui", "manage");
    this._editor.setAttribute("title", title);
    this._editor.setAttribute("uri", aURI.spec);
+    this._editor.setAttribute("itemid", itemId);
    this._editor.setAttribute("tags", tags.join(", "));
    this._editor.setAttribute("onclose", "BookmarkHelper.hide()");
    document.getElementById("bookmark-form").appendChild(this._editor);
@ -904,10 +906,7 @@ var BookmarkHelper = {
    BrowserUI.pushPopup(this, this._panel);

    let self = this;
-    setTimeout(function() {
-      self._editor.init(itemId);
-      self._editor.startEditing();
-    }, 0);
+    Util.executeSoon(function() { self._editor.startEditing(); });
  },

  save: function BH_save() {
--- a/mobile/chrome/tests/browser_bookmarks.js
+++ b/mobile/chrome/tests/browser_bookmarks.js
@ -218,7 +218,7 @@ gTests.push({
  onBookmarksReady: function() {
    var bookmarkitems = document.getElementById("bookmark-items");
    gCurrentTest.bookmarkitem = document.getAnonymousElementByAttribute(bookmarkitems, "uri", testURL_02);
-    EventUtils.synthesizeMouse(gCurrentTest.bookmarkitem, gCurrentTest.bookmarkitem.clientWidth / 2, gCurrentTest.bookmarkitem.clientHeight / 2, {});
+    gCurrentTest.bookmarkitem.click();

    waitFor(gCurrentTest.onEditorReady, function() { return gCurrentTest.bookmarkitem.isEditing == true; });
  },
--- a/mobile/themes/hildon/browser.css
+++ b/mobile/themes/hildon/browser.css
@ -599,6 +599,10 @@ placeitem > .bookmark-manage > image {
  margin: 0mm 2.5mm 0mm 1mm;
 }

+placeitem[src=""] .bookmark-item-label > image {
+  list-style-image: url(chrome://mozapps/skin/places/defaultFavicon.png);
+}
+
 .autocomplete-item-label > label,
 .bookmark-item-label > label {
  -moz-margin-start: 1px;
--- a/mobile/themes/wince/browser-high.css
+++ b/mobile/themes/wince/browser-high.css
@ -274,6 +274,10 @@ placeitem > .bookmark-manage > image {
  max-height: 32px;
 }

+placeitem[src=""] .bookmark-item-label > image {
+  list-style-image: url(chrome://mozapps/skin/places/defaultFavicon.png);
+}
+
 .autocomplete-item-url,
 .bookmark-item-url {
  margin-left: 34px;
--- a/mobile/themes/wince/browser-low.css
+++ b/mobile/themes/wince/browser-low.css
@ -273,6 +273,10 @@ placeitem > .bookmark-manage > image {
  max-height: 24px;
 }

+placeitem[src=""] .bookmark-item-label > image {
+  list-style-image: url(chrome://mozapps/skin/places/defaultFavicon.png);
+}
+
 .autocomplete-item-url,
 .bookmark-item-url {
  margin-left: 26px;