Chromium Code Reviews| Index: chrome/browser/ui/app_list/fast_show_pickler.cc |
| diff --git a/chrome/browser/ui/app_list/fast_show_pickler.cc b/chrome/browser/ui/app_list/fast_show_pickler.cc |
| index d282aabfc2be6197f303ac7a5cff82afb47ee534..d98b5fbf4f0bb87651657bb574e17d807680c39e 100644 |
| --- a/chrome/browser/ui/app_list/fast_show_pickler.cc |
| +++ b/chrome/browser/ui/app_list/fast_show_pickler.cc |
| @@ -6,7 +6,6 @@ |
| #include "third_party/skia/include/core/SkBitmap.h" |
| #include "ui/app_list/app_list_item_model.h" |
| -#include "ui/base/layout.h" |
| #include "ui/gfx/image/image_skia_rep.h" |
| namespace { |
| @@ -88,7 +87,7 @@ bool PickleImage(Pickle* pickle, const gfx::ImageSkia& image) { |
| pickle->WriteInt(static_cast<int>(reps.size())); |
| for (std::vector<gfx::ImageSkiaRep>::const_iterator it = reps.begin(); |
| it != reps.end(); ++it) { |
| - pickle->WriteInt(static_cast<int>(ui::GetSupportedScaleFactor(it->scale()))); |
| + pickle->WriteFloat(it->scale()); |
|
benwells
2013/09/26 06:55:29
What is this for? Is it an unrelated change?
koz (OOO until 15th September)
2013/09/26 22:12:47
For some reason the tests for this crash on my com
|
| pickle->WriteInt(it->pixel_width()); |
| pickle->WriteInt(it->pixel_height()); |
| ImageFormat format = NONE; |
| @@ -111,8 +110,8 @@ bool UnpickleImage(PickleIterator* it, gfx::ImageSkia* out) { |
| gfx::ImageSkia result; |
| for (int i = 0; i < rep_count; ++i) { |
| - int scale_factor = 0; |
| - if (!it->ReadInt(&scale_factor)) |
| + float scale = 0.0f; |
| + if (!it->ReadFloat(&scale)) |
| return false; |
| int width = 0; |
| @@ -147,7 +146,6 @@ bool UnpickleImage(PickleIterator* it, gfx::ImageSkia* out) { |
| SkAutoLockPixels lock(bitmap); |
| memcpy(bitmap.getPixels(), pixels, bitmap.getSize()); |
| } |
| - float scale = ui::GetImageScale(static_cast<ui::ScaleFactor>(scale_factor)); |
| result.AddRepresentation(gfx::ImageSkiaRep(bitmap, scale)); |
| } |