diff options
| author |  Leon Scroggins III <scroggo@google.com> | 2017-10-02 16:28:49 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-03 12:35:58 +0000 |
| commit | 862c19675edb26ed7cba56ae6ca9f98c1e4cbef1 (patch) | |
| tree | 446fecbce607a64102f08b43fdd6975e5052efdc /src/codec/SkIcoCodec.cpp | |
| parent | dd7ffa5a557bcaa1daebd0f056a8f1bafb992d4d (diff) | |
Remove static initializers in SkCodec
Bug: 768878
Switch const declarations to constexpr where appropriate. Speculative
fix for crbug.com/768878.
Change-Id: I7fc356e623ce7a0f2b87e92e9a8ed95d5c423d79
Reviewed-on: https://skia-review.googlesource.com/54101
Commit-Queue: Leon Scroggins <scroggo@google.com>
Reviewed-by: Chris Blume <cblume@chromium.org>
Diffstat (limited to 'src/codec/SkIcoCodec.cpp')
| -rw-r--r-- | src/codec/SkIcoCodec.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/codec/SkIcoCodec.cpp b/src/codec/SkIcoCodec.cpp index 74affe6709..fcd31893d2 100644 --- a/src/codec/SkIcoCodec.cpp +++ b/src/codec/SkIcoCodec.cpp @@ -29,8 +29,8 @@ bool SkIcoCodec::IsIco(const void* buffer, size_t bytesRead) { std::unique_ptr<SkCodec> SkIcoCodec::MakeFromStream(std::unique_ptr<SkStream> stream, Result* result) { // Header size constants - static const uint32_t kIcoDirectoryBytes = 6; - static const uint32_t kIcoDirEntryBytes = 16; + constexpr uint32_t kIcoDirectoryBytes = 6; + constexpr uint32_t kIcoDirEntryBytes = 16; // Read the directory header std::unique_ptr<uint8_t[]> dirBuffer(new uint8_t[kIcoDirectoryBytes]); |