third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.cpp - Issue 2878363003: Revert of Fix ImageAnimation constant names after Blink renaming

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: third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.cpp

Issue 2878363003: Revert of Fix ImageAnimation constant names after Blink renaming (Closed)

Patch Set: Created 3 years, 7 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

« no previous file with comments | « third_party/WebKit/Source/platform/graphics/BitmapImage.cpp ('k') | third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.cpp

diff --git a/third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.cpp b/third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.cpp

index 79bddb6a42800e7505f264dbfee8e36f2de9a58a..cedd52361bdb02e15bc92189820326eead262b0f 100644

--- a/third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.cpp

+++ b/third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.cpp

@@ -85,7 +85,7 @@

DeferredImageDecoder::DeferredImageDecoder(

std::unique_ptr<ImageDecoder> actual_decoder)

: actual_decoder_(std::move(actual_decoder)),

- repetition_count_(kAnimationNone),

+ repetition_count_(kCAnimationNone),

all_data_received_(false),

can_yuv_decode_(false),

has_hot_spot_(false) {}

@@ -266,7 +266,7 @@

color_space_for_sk_images_ = actual_decoder_->ColorSpaceForSkImages();

const bool is_single_frame =

- actual_decoder_->RepetitionCount() == kAnimationNone ||

+ actual_decoder_->RepetitionCount() == kCAnimationNone ||

(all_data_received_ && actual_decoder_->FrameCount() == 1u);

const SkISize decoded_size =

SkISize::Make(actual_decoder_->DecodedSize().Width(),