diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/extensions/browser/extension_icon_image.cc | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/extensions/browser/extension_icon_image.cc')
| -rw-r--r-- | chromium/extensions/browser/extension_icon_image.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chromium/extensions/browser/extension_icon_image.cc b/chromium/extensions/browser/extension_icon_image.cc index 34c4df9ef38..bcf238ec2e4 100644 --- a/chromium/extensions/browser/extension_icon_image.cc +++ b/chromium/extensions/browser/extension_icon_image.cc @@ -87,8 +87,8 @@ class IconImage::Source : public gfx::ImageSkiaSource { // gfx::ImageSkiaSource overrides: gfx::ImageSkiaRep GetImageForScale(float scale) override; - // Used to load images, possibly asynchronously. NULLed out when the IconImage - // is destroyed. + // Used to load images, possibly asynchronously. nullptr'ed out when the + // IconImage is destroyed. IconImage* host_; // Image whose representations will be used until |host_| loads the real @@ -107,7 +107,7 @@ IconImage::Source::~Source() { } void IconImage::Source::ResetHost() { - host_ = NULL; + host_ = nullptr; } gfx::ImageSkiaRep IconImage::Source::GetImageForScale(float scale) { @@ -132,7 +132,7 @@ IconImage::IconImage(content::BrowserContext* context, resource_size_in_dip_(resource_size_in_dip), keep_original_size_(keep_original_size), did_complete_initial_load_(false), - source_(NULL), + source_(nullptr), default_icon_(gfx::ImageSkiaOperations::CreateResizedImage( default_icon, skia::ImageOperations::RESIZE_BEST, |