[DevTools] Fix favicon images on chrome://inspect

chrome/browser/android/dev_tools_discovery_provider_android.cc

 // Copyright 2015 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/android/dev_tools_discovery_provider_android.h"
 
+#include "base/base64.h"
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/android/tab_model/tab_model.h"
 #include "chrome/browser/ui/android/tab_model/tab_model_list.h"
 #include "components/devtools_discovery/basic_target_descriptor.h"
 #include "components/devtools_discovery/devtools_discovery_manager.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
+#include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/gfx/codec/png_codec.h"
 
 using content::DevToolsAgentHost;
 using content::WebContents;
 
 namespace {
 
-GURL GetFaviconURLForContents(WebContents* web_contents) {
-  content::NavigationController& controller = web_contents->GetController();
-  content::NavigationEntry* entry = controller.GetActiveEntry();
-  if (entry != NULL && entry->GetURL().is_valid())
-    return entry->GetFavicon().url;
-  return GURL();
-}
-
 class TabDescriptor : public devtools_discovery::DevToolsTargetDescriptor {
  public:
   static TabDescriptor* CreateForWebContents(int tab_id,
                                              WebContents* web_contents) {
     return new TabDescriptor(tab_id, web_contents);
   }
 
   static TabDescriptor* CreateForUnloadedTab(int tab_id,
                                              const base::string16& title,
                                              const GURL& url) {
@@ skipping 13 matching lines @@
   }
 
   std::string GetDescription() const override {
     return std::string();
   }
 
   GURL GetURL() const override {
     return url_;
   }
 
   GURL GetFaviconURL() const override {

[dgozman, 2015/05/13 01:12:21]

Here is the similar method. Please rename private one.

[vkuzkokov, 2015/05/13 16:40:56]

Done.

     return favicon_url_;
   }
 
   base::TimeTicks GetLastActivityTime() const override {
     return last_activity_time_;
   }
 
   std::string GetId() const override {
     return base::IntToString(tab_id_);
   }
@@ skipping 51 matching lines @@
       return false;
     model->CloseTabAt(index);
     return true;
   }
 
  private:
   TabDescriptor(int tab_id, WebContents* web_contents)
       : tab_id_(tab_id),
         title_(base::UTF16ToUTF8(web_contents->GetTitle())),
         url_(web_contents->GetURL()),
-        favicon_url_(GetFaviconURLForContents(web_contents)),
+        favicon_url_(GetFaviconURL()),
         last_activity_time_(web_contents->GetLastActiveTime()) {
   }
 
   TabDescriptor(int tab_id, const base::string16& title, const GURL& url)
       : tab_id_(tab_id),
         title_(base::UTF16ToUTF8(title)),
-        url_(url) {
+        url_(url),
+        favicon_url_(GetFaviconURL()) {
+  }
+
+  GURL GetFaviconURL() {
+    TabModel* model;
+    int index;
+    if (FindTab(&model, &index)) {
+      if (TabAndroid* tab = model->GetTabAt(index)) {

[dgozman, 2015/05/13 01:12:22]

Let's have early return instead.

[vkuzkokov, 2015/05/13 16:40:56]

Done.

+        SkBitmap bitmap = tab->GetFaviconBitmap();
+        if (bitmap.empty())
+          return GURL();
+
+        std::vector<unsigned char> data;
+        SkAutoLockPixels lock_image(bitmap);
+        bool encoded = gfx::PNGCodec::Encode(

[dgozman, 2015/05/13 01:12:21]

I don't like sync encoding on UI. Let's make GetFaviconURL() async.

[vkuzkokov, 2015/05/13 16:40:56]

With FastEncodeBGRASkBitmap it's 1ms per tab compared to 0.1ms per tab for the
rest of processing. Is that worth making DevToolsDiscoveryManager API
(GetDescriptors, CreateNew, Provider::GetDescriptors) async again?

[dgozman, 2015/05/13 21:58:04]

You are right, it's just a small favicon.

+            reinterpret_cast<unsigned char*>(bitmap.getAddr32(0, 0)),
+            gfx::PNGCodec::FORMAT_SkBitmap,
+            gfx::Size(bitmap.width(), bitmap.height()),
+            bitmap.width() * bitmap.bytesPerPixel(),
+            false, std::vector<gfx::PNGCodec::Comment>(), &data);

[dgozman, 2015/05/13 01:12:21]

nit: one parameter per line?

[vkuzkokov, 2015/05/13 16:40:56]

Done.

+        if (!encoded)
+          return GURL();
+
+        std::string base_64_data;
+        base::Base64Encode(
+            base::StringPiece(reinterpret_cast<char*>(&data[0]), data.size()),
+            &base_64_data);
+        return GURL("data:image/png;base64," + base_64_data);
+      }
+    }
+    return GURL();
   }
 
   bool FindTab(TabModel** model_result, int* index_result) const {
     for (TabModelList::const_iterator iter = TabModelList::begin();
         iter != TabModelList::end(); ++iter) {
       TabModel* model = *iter;
       for (int i = 0; i < model->GetTabCount(); ++i) {
         TabAndroid* tab = model->GetTabAt(i);
         if (tab && tab->GetAndroidId() == tab_id_) {
           *model_result = model;
@@ skipping 84 matching lines @@
 }
 
 // static
 void DevToolsDiscoveryProviderAndroid::Install() {
   devtools_discovery::DevToolsDiscoveryManager* discovery_manager =
       devtools_discovery::DevToolsDiscoveryManager::GetInstance();
   discovery_manager->AddProvider(
       make_scoped_ptr(new DevToolsDiscoveryProviderAndroid()));
   discovery_manager->SetCreateCallback(base::Bind(&CreateNewAndroidTab));
 }