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

Unified Diff: chrome/browser/android/thumbnail/thumbnail_store.cc

Issue 517803002: SkImageInfo will soon have a constructor, so can't init it with {} anymore (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/thumbnail/thumbnail_store.cc
diff --git a/chrome/browser/android/thumbnail/thumbnail_store.cc b/chrome/browser/android/thumbnail/thumbnail_store.cc
index 003b5f5c9a972c0760c19ed52455c230da2e8881..a1652d15326d1e660e0ab07e85a3a99a7664d82d 100644
--- a/chrome/browser/android/thumbnail/thumbnail_store.cc
+++ b/chrome/browser/android/thumbnail/thumbnail_store.cc
@@ -564,10 +564,10 @@ void ThumbnailStore::CompressionTask(
size_t encoded_bytes =
etc1_get_encoded_data_size(encoded_size.width(), encoded_size.height());
- SkImageInfo info = {encoded_size.width(),
- encoded_size.height(),
- kUnknown_SkColorType,
- kUnpremul_SkAlphaType};
+ SkImageInfo info = SkImageInfo::Make(encoded_size.width(),
+ encoded_size.height(),
+ kUnknown_SkColorType,
+ kUnpremul_SkAlphaType);
skia::RefPtr<SkData> etc1_pixel_data = skia::AdoptRef(
SkData::NewFromMalloc(new uint8_t[encoded_bytes], encoded_bytes));
skia::RefPtr<SkMallocPixelRef> etc1_pixel_ref = skia::AdoptRef(
@@ -694,10 +694,10 @@ bool ReadFromFile(base::File& file,
if (pixel_bytes_read != data_size)
return false;
- SkImageInfo info = {raw_width,
- raw_height,
- kUnknown_SkColorType,
- kUnpremul_SkAlphaType};
+ SkImageInfo info = SkImageInfo::Make(raw_width,
+ raw_height,
+ kUnknown_SkColorType,
+ kUnpremul_SkAlphaType);
etc1_pixel_data = skia::AdoptRef(
SkData::NewFromMalloc(raw_data.release(), data_size));
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698