Update to API changes of Chrome 51
This commit is contained in:
parent
05c2999651
commit
7ba391da7c
87 changed files with 225 additions and 231 deletions
|
@ -76,7 +76,7 @@ bool AddImageSkiaRep(gfx::ImageSkia* image,
|
|||
const unsigned char* data,
|
||||
size_t size,
|
||||
double scale_factor) {
|
||||
scoped_ptr<SkBitmap> decoded(new SkBitmap());
|
||||
std::unique_ptr<SkBitmap> decoded(new SkBitmap());
|
||||
|
||||
// Try PNG first.
|
||||
if (!gfx::PNGCodec::Decode(data, size, decoded.get()))
|
||||
|
@ -162,7 +162,7 @@ base::win::ScopedHICON ReadICOFromPath(int size, const base::FilePath& path) {
|
|||
|
||||
void ReadImageSkiaFromICO(gfx::ImageSkia* image, HICON icon) {
|
||||
// Convert the icon from the Windows specific HICON to gfx::ImageSkia.
|
||||
scoped_ptr<SkBitmap> bitmap(IconUtil::CreateSkBitmapFromHICON(icon));
|
||||
std::unique_ptr<SkBitmap> bitmap(IconUtil::CreateSkBitmapFromHICON(icon));
|
||||
image->AddRepresentation(gfx::ImageSkiaRep(*bitmap, 1.0f));
|
||||
}
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue