chrome/browser/extensions/extension_action.cc - Issue 22796028: Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 22796028: Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Minor cleanup Created 7 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

« cc/resources/raster_worker_pool.h ('K') | « chrome/browser/extensions/extension_action.h ('k') | chrome/renderer/printing/print_web_view_helper_linux.cc » ('j') | skia/ext/analysis_canvas.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_action.cc

diff --git a/chrome/browser/extensions/extension_action.cc b/chrome/browser/extensions/extension_action.cc

index 7d3ecd19261a683011d8c12742ba791663af4134..a5712c8820048f0cc6c3e1d9de3525d016f11617 100644

--- a/chrome/browser/extensions/extension_action.cc

+++ b/chrome/browser/extensions/extension_action.cc

@@ -15,8 +15,8 @@

#include "grit/theme_resources.h"

#include "grit/ui_resources.h"

#include "third_party/skia/include/core/SkBitmap.h"

+#include "third_party/skia/include/core/SkBitmapDevice.h"

#include "third_party/skia/include/core/SkCanvas.h"

-#include "third_party/skia/include/core/SkDevice.h"

#include "third_party/skia/include/core/SkPaint.h"

#include "third_party/skia/include/effects/SkGradientShader.h"

#include "ui/base/animation/animation_delegate.h"

@@ -113,7 +113,7 @@ const SkBitmap& ExtensionAction::IconAnimation::Apply(

if (!device_.get() ||

(device_->width() != icon.width()) ||

(device_->height() != icon.height())) {

- device_.reset(new SkDevice(

+ device_.reset(new SkBitmapDevice(

SkBitmap::kARGB_8888_Config, icon.width(), icon.height(), true));

}