Fixed thread-unsafe use of gfx::Image in app shortcut creation.

chrome/browser/ui/views/create_application_shortcut_view.cc

 // Copyright (c) 2012 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/ui/views/create_application_shortcut_view.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/bind.h"
@@ skipping 234 matching lines @@
 }
 
 }  // namespace chrome
 
 CreateApplicationShortcutView::CreateApplicationShortcutView(Profile* profile)
     : profile_(profile),
       app_info_(NULL),
       create_shortcuts_label_(NULL),
       desktop_check_box_(NULL),
       menu_check_box_(NULL),
-      quick_launch_check_box_(NULL) {}
+      quick_launch_check_box_(NULL),
+      shortcut_info_(new web_app::ShortcutInfo) {
+}
 
 CreateApplicationShortcutView::~CreateApplicationShortcutView() {}
 
 void CreateApplicationShortcutView::InitControls(DialogLayout dialog_layout) {
   if (dialog_layout == DIALOG_LAYOUT_URL_SHORTCUT) {
-    app_info_ = new AppInfoView(shortcut_info_.title,
-                                shortcut_info_.description,
-                                shortcut_info_.favicon);
+    app_info_ = new AppInfoView(shortcut_info_->title,
+                                shortcut_info_->description,
+                                shortcut_info_->favicon);
   }
   create_shortcuts_label_ = new views::Label(
       l10n_util::GetStringUTF16(IDS_CREATE_SHORTCUTS_LABEL));
   create_shortcuts_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
 
   desktop_check_box_ = AddCheckbox(
       l10n_util::GetStringUTF16(IDS_CREATE_SHORTCUTS_DESKTOP_CHKBOX),
       profile_->GetPrefs()->GetBoolean(prefs::kWebAppCreateOnDesktop));
 
   menu_check_box_ = NULL;
@@ skipping 112 matching lines @@
   creation_locations.in_quick_launch_bar = quick_launch_check_box_ == NULL ?
       NULL : quick_launch_check_box_->checked();
 #elif defined(OS_POSIX)
   // Create shortcut in Mac dock or as Linux (gnome/kde) application launcher
   // are not implemented yet.
   creation_locations.in_quick_launch_bar = false;
 #endif
 
   web_app::CreateShortcutsWithInfo(web_app::SHORTCUT_CREATION_BY_USER,
                                    creation_locations,
-                                   shortcut_info_,
+                                   shortcut_info_.Pass(),
                                    file_handlers_info_);
+  // CreateShortcutsWithInfo stole ownership of |shortcut_info_|, so create a
+  // new blank one (to satisfy the non-null constraint).
+  shortcut_info_.reset(new web_app::ShortcutInfo);

[benwells, 2015/03/26 05:28:51]

Why do this? Put another way, why is there a constraint to have shortcut_info_
not null?

[Matt Giuca, 2015/03/27 08:14:46]

Partly laziness :)

It would mean having to introduce null checks throughout this whole file. Seems
OK.

Done.

   return true;
 }
 
 views::Checkbox* CreateApplicationShortcutView::AddCheckbox(
     const base::string16& text, bool checked) {
   views::Checkbox* checkbox = new views::Checkbox(text);
   checkbox->SetChecked(checked);
   checkbox->set_listener(this);
   return checkbox;
 }
@@ skipping 15 matching lines @@
   GetDialogClientView()->UpdateDialogButtons();
 }
 
 CreateUrlApplicationShortcutView::CreateUrlApplicationShortcutView(
     content::WebContents* web_contents)
     : CreateApplicationShortcutView(
           Profile::FromBrowserContext(web_contents->GetBrowserContext())),
       web_contents_(web_contents),
       pending_download_id_(-1),
       weak_ptr_factory_(this)  {
-  web_app::GetShortcutInfoForTab(web_contents_, &shortcut_info_);
+  web_app::GetShortcutInfoForTab(web_contents_, shortcut_info_.get());
   const WebApplicationInfo& app_info =
       extensions::TabHelper::FromWebContents(web_contents_)->web_app_info();
   if (!app_info.icons.empty()) {
     web_app::GetIconsInfo(app_info, &unprocessed_icons_);
     FetchIcon();
   }
 
   // Create URL app shortcuts in the top-level menu.
   create_in_chrome_apps_subdir_ = false;
 
   InitControls(DIALOG_LAYOUT_URL_SHORTCUT);
 }
 
 CreateUrlApplicationShortcutView::~CreateUrlApplicationShortcutView() {
 }
 
 bool CreateUrlApplicationShortcutView::Accept() {
   if (!CreateApplicationShortcutView::Accept())
     return false;
 
   // Get the smallest icon in the icon family (should have only 1).
-  const gfx::Image* icon = shortcut_info_.favicon.GetBest(0, 0);
+  const gfx::Image* icon = shortcut_info_->favicon.GetBest(0, 0);
   SkBitmap bitmap = icon ? icon->AsBitmap() : SkBitmap();
   extensions::TabHelper::FromWebContents(web_contents_)->SetAppIcon(bitmap);
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents_);
   if (browser)
     chrome::ConvertTabToAppWindow(browser, web_contents_);
   return true;
 }
 
 void CreateUrlApplicationShortcutView::FetchIcon() {
   // There should only be fetch job at a time.
@@ skipping 25 matching lines @@
   if (id != pending_download_id_)
     return;
   pending_download_id_ = -1;
 
   gfx::ImageSkia image_skia = CreateFaviconImageSkia(
       bitmaps,
       original_bitmap_sizes,
       requested_size,
       NULL);
   if (!image_skia.isNull()) {
-    shortcut_info_.favicon.Add(image_skia);
-    static_cast<AppInfoView*>(app_info_)->UpdateIcon(shortcut_info_.favicon);
+    shortcut_info_->favicon.Add(image_skia);
+    static_cast<AppInfoView*>(app_info_)->UpdateIcon(shortcut_info_->favicon);
   } else {
     FetchIcon();
   }
 }
 
 CreateChromeApplicationShortcutView::CreateChromeApplicationShortcutView(
     Profile* profile,
     const extensions::Extension* app,
     const base::Callback<void(bool)>& close_callback)
         : CreateApplicationShortcutView(profile),
@@ skipping 21 matching lines @@
   return CreateApplicationShortcutView::Accept();
 }
 
 bool CreateChromeApplicationShortcutView::Cancel() {
   if (!close_callback_.is_null())
     close_callback_.Run(false);
   return CreateApplicationShortcutView::Cancel();
 }
 
 void CreateChromeApplicationShortcutView::OnAppInfoLoaded(
-    const web_app::ShortcutInfo& shortcut_info,
+    scoped_ptr<web_app::ShortcutInfo> shortcut_info,
     const extensions::FileHandlersInfo& file_handlers_info) {
-  shortcut_info_ = shortcut_info;
+  shortcut_info_ = shortcut_info.Pass();
   file_handlers_info_ = file_handlers_info;
 }