Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2389)

Unified Diff: chrome/browser/extensions/api/extension_action/extension_actions_api.cc

Issue 11232049: Revert 162636 - Use LANCZOS3 resize algorithm to generate missing image reps for extension action i… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/extension_action/extension_actions_api.cc
===================================================================
--- chrome/browser/extensions/api/extension_action/extension_actions_api.cc (revision 163346)
+++ chrome/browser/extensions/api/extension_action/extension_actions_api.cc (working copy)
@@ -27,7 +27,6 @@
#include "chrome/common/render_messages.h"
#include "content/public/browser/navigation_entry.h"
#include "content/public/browser/notification_service.h"
-#include "ui/gfx/image/image_skia_operations.h"
namespace {
@@ -131,13 +130,7 @@
icon.AddRepresentation(gfx::ImageSkiaRep(bitmap, kIconSizes[i].scale));
}
}
-
- if (!icon.isNull()) {
- gfx::ImageSkia final_icon =
- gfx::ImageSkiaOperations::CreateImageWithCustomResizeMethod(
- icon, skia::ImageOperations::RESIZE_LANCZOS3);
- action->SetIcon(kTabId, gfx::Image(final_icon));
- }
+ action->SetIcon(kTabId, gfx::Image(icon));
}
}
@@ -162,9 +155,11 @@
if (!icon.isNull()) {
base::DictionaryValue* icon_value = new base::DictionaryValue();
for (size_t i = 0; i < arraysize(kIconSizes); i++) {
- icon_value->SetString(
- kIconSizes[i].size_string,
- RepresentationToString(icon, kIconSizes[i].scale));
+ if (icon.HasRepresentation(kIconSizes[i].scale)) {
+ icon_value->SetString(
+ kIconSizes[i].size_string,
+ RepresentationToString(icon, kIconSizes[i].scale));
+ }
}
dict->Set(kIconStorageKey, icon_value);
}
@@ -474,10 +469,7 @@
}
}
- gfx::ImageSkia final_icon =
- gfx::ImageSkiaOperations::CreateImageWithCustomResizeMethod(
- icon, skia::ImageOperations::RESIZE_LANCZOS3);
- extension_action_->SetIcon(tab_id_, gfx::Image(final_icon));
+ extension_action_->SetIcon(tab_id_, gfx::Image(icon));
} else if (details_->GetInteger("iconIndex", &icon_index)) {
// Obsolete argument: ignore it.
return true;
« no previous file with comments | « chrome/browser/extensions/api/extension_action/browser_action_apitest.cc ('k') | ui/gfx/image/image_skia_operations.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698