Change panels to use gfx::Image instead of SkBitmap for favicon.

chrome/browser/ui/panels/panel_browser_titlebar_gtk.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/panels/panel_browser_titlebar_gtk.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/gtk/custom_button.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_browser_window_gtk.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/gtk/gtk_compat.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/image/image.h"
 #include "ui/gfx/skia_utils_gtk.h"
 
 namespace {
 
 // Padding around the titlebar.
 const int kPanelTitlebarPaddingTop = 7;
 const int kPanelTitlebarPaddingBottom = 7;
 const int kPanelTitlebarPaddingLeft = 4;
 const int kPanelTitlebarPaddingRight = 8;
 
@@ skipping 194 matching lines @@
 
 void PanelBrowserTitlebarGtk::UpdateThrobber(
     content::WebContents* web_contents) {
   if (web_contents && web_contents->IsLoading()) {
     GdkPixbuf* icon_pixbuf =
         throbber_.GetNextFrame(web_contents->IsWaitingForResponse());
     gtk_image_set_from_pixbuf(GTK_IMAGE(icon_), icon_pixbuf);
   } else {
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
-    SkBitmap icon = browser_window_->panel()->GetCurrentPageIcon();
-    if (icon.empty()) {
+    gfx::Image icon = browser_window_->panel()->GetCurrentPageIcon();
+    if (icon.IsEmpty()) {
       // Fallback to the Chromium icon if the page has no icon.
       gtk_image_set_from_pixbuf(GTK_IMAGE(icon_),
           rb.GetNativeImageNamed(IDR_PRODUCT_LOGO_16).ToGdkPixbuf());
     } else {
-      GdkPixbuf* icon_pixbuf = gfx::GdkPixbufFromSkBitmap(icon);
+      GdkPixbuf* icon_pixbuf = icon.ToGdkPixbuf();
       gtk_image_set_from_pixbuf(GTK_IMAGE(icon_), icon_pixbuf);
       g_object_unref(icon_pixbuf);

[Robert Sesek, 2012/08/10 19:37:29]

The ToX functions return a weak reference, so this is unneeded and will result
in use-after-free. The CopyX functions return an object that the caller owns.

[jennb, 2012/08/11 04:20:05]

Thanks for pointing this out. Maybe this explains why some tests are failing.

     }
 
     throbber_.Reset();
   }
 }
 
 void PanelBrowserTitlebarGtk::ShowContextMenu(GdkEventButton* event) {
   // Panel does not show any context menu.
 }
 
@@ skipping 95 matching lines @@
 }
 
 void PanelBrowserTitlebarGtk::set_window(GtkWindow* window) {
   window_ = window;
 }
 
 AvatarMenuButtonGtk* PanelBrowserTitlebarGtk::avatar_button() const {
   // Not supported in panel.
   return NULL;
 }