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/ui/gfx/codec | |
| 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/ui/gfx/codec')
| -rw-r--r-- | chromium/ui/gfx/codec/jpeg_codec.cc | 1 | ||||
| -rw-r--r-- | chromium/ui/gfx/codec/png_codec.cc | 11 | ||||
| -rw-r--r-- | chromium/ui/gfx/codec/vector_wstream.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/chromium/ui/gfx/codec/jpeg_codec.cc b/chromium/ui/gfx/codec/jpeg_codec.cc index ea7c0dcab69..d1fbdd7f562 100644 --- a/chromium/ui/gfx/codec/jpeg_codec.cc +++ b/chromium/ui/gfx/codec/jpeg_codec.cc @@ -7,6 +7,7 @@ #include <setjmp.h> #include <memory> +#include <ostream> #include "base/notreached.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chromium/ui/gfx/codec/png_codec.cc b/chromium/ui/gfx/codec/png_codec.cc index f2176e92024..bcaaaa38f36 100644 --- a/chromium/ui/gfx/codec/png_codec.cc +++ b/chromium/ui/gfx/codec/png_codec.cc @@ -8,6 +8,7 @@ #include "base/logging.h" #include "base/macros.h" +#include "base/notreached.h" #include "base/strings/string_util.h" #include "third_party/libpng/png.h" #include "third_party/skia/include/core/SkBitmap.h" @@ -39,13 +40,12 @@ class PngDecoderState { PngDecoderState(PNGCodec::ColorFormat ofmt, std::vector<unsigned char>* o) : output_format(ofmt), output_channels(0), - bitmap(NULL), + bitmap(nullptr), is_opaque(true), output(o), width(0), height(0), - done(false) { - } + done(false) {} // Output is an SkBitmap. explicit PngDecoderState(SkBitmap* skbitmap) @@ -53,11 +53,10 @@ class PngDecoderState { output_channels(0), bitmap(skbitmap), is_opaque(true), - output(NULL), + output(nullptr), width(0), height(0), - done(false) { - } + done(false) {} PNGCodec::ColorFormat output_format; int output_channels; diff --git a/chromium/ui/gfx/codec/vector_wstream.h b/chromium/ui/gfx/codec/vector_wstream.h index 5a20c470e1a..56f9712a6d6 100644 --- a/chromium/ui/gfx/codec/vector_wstream.h +++ b/chromium/ui/gfx/codec/vector_wstream.h @@ -9,7 +9,7 @@ #include <vector> -#include "base/logging.h" +#include "base/check_op.h" #include "third_party/skia/include/core/SkStream.h" namespace gfx { |