Eliminate all UI thread decoding of extension images....

chrome/browser/views/location_bar_view.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/views/location_bar_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 1409 matching lines @@
 
 LocationBarView::PageActionImageView::PageActionImageView(
     LocationBarView* owner,
     Profile* profile,
     ExtensionAction* page_action,
     const BubblePositioner* bubble_positioner)
     : LocationBarImageView(bubble_positioner),
       owner_(owner),
       profile_(profile),
       page_action_(page_action),
-      tracker_(NULL),
+      ALLOW_THIS_IN_INITIALIZER_LIST(tracker_(this)),
       current_tab_id_(-1),
       preview_enabled_(false),
       popup_(NULL) {
   Extension* extension = profile->GetExtensionsService()->GetExtensionById(
       page_action->extension_id(), false);
   DCHECK(extension);
 
   // Load all the icons declared in the manifest. This is the contents of the
   // icons array, plus the default_icon property, if any.
   std::vector<std::string> icon_paths(*page_action->icon_paths());
   if (!page_action_->default_icon_path().empty())
     icon_paths.push_back(page_action_->default_icon_path());
 
-  tracker_ = new ImageLoadingTracker(this, icon_paths.size());
+  int i = 0;
   for (std::vector<std::string>::iterator iter = icon_paths.begin();
        iter != icon_paths.end(); ++iter) {
-    tracker_->PostLoadImageTask(
+    tracker_.PostLoadImageTask(
         extension->GetResource(*iter),
         gfx::Size(Extension::kPageActionIconMaxSize,
-                  Extension::kPageActionIconMaxSize));
+                  Extension::kPageActionIconMaxSize), i++);
   }
 }
 
 LocationBarView::PageActionImageView::~PageActionImageView() {
-  if (tracker_)
-    tracker_->StopTrackingImageLoad();
-
   if (popup_)
     HidePopup();
 }
 
 void LocationBarView::PageActionImageView::ExecuteAction(int button,
     bool inspect_with_devtools) {
   if (current_tab_id_ < 0) {
     NOTREACHED() << "No current tab.";
     return;
   }
@@ skipping 86 matching lines @@
     return;
   }
 
   ExecuteAction(button, false);  // inspect_with_devtools
 }
 
 void LocationBarView::PageActionImageView::ShowInfoBubble() {
   ShowInfoBubbleImpl(ASCIIToWide(tooltip_), GetColor(false, TEXT));
 }
 
-void LocationBarView::PageActionImageView::OnImageLoaded(SkBitmap* image,
-                                                         size_t index) {
+void LocationBarView::PageActionImageView::OnImageLoaded(
+    SkBitmap* image, int index) {
   // We loaded icons()->size() icons, plus one extra if the page action had
   // a default icon.
-  size_t total_icons = page_action_->icon_paths()->size();
+  int total_icons = static_cast<int>(page_action_->icon_paths()->size());
   if (!page_action_->default_icon_path().empty())
     total_icons++;
   DCHECK(index < total_icons);
 
   // Map the index of the loaded image back to its name. If we ever get an
   // index greater than the number of icons, it must be the default icon.
   if (image) {
-    if (index < page_action_->icon_paths()->size())
+    if (index < total_icons)
       page_action_icons_[page_action_->icon_paths()->at(index)] = *image;
     else
       page_action_icons_[page_action_->default_icon_path()] = *image;
   }
 
-  // If we are done, release the tracker.
-  if (index == total_icons - 1)
-    tracker_ = NULL;
-
   owner_->UpdatePageActions();
 }
 
 void LocationBarView::PageActionImageView::UpdateVisibility(
     TabContents* contents, const GURL& url) {
   // Save this off so we can pass it back to the extension when the action gets
   // executed. See PageActionImageView::OnMousePressed.
   current_tab_id_ = ExtensionTabUtil::GetTabId(contents);
   current_url_ = url;
 
@@ skipping 143 matching lines @@
         page_action_views_[i]->image_view()->ExecuteAction(kLeftMouseButton,
             false);  // inspect_with_devtools
         return;
       }
       ++current;
     }
   }
 
   NOTREACHED();
 }