Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(463)

Side by Side Diff: third_party/WebKit/Source/platform/graphics/ImageSource.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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. 2 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
3 * Copyright (C) 2007 Alp Toker <alp.toker@collabora.co.uk> 3 * Copyright (C) 2007 Alp Toker <alp.toker@collabora.co.uk>
4 * Copyright (C) 2008, Google Inc. All rights reserved. 4 * Copyright (C) 2008, Google Inc. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 return size.TransposedSize(); 93 return size.TransposedSize();
94 94
95 return size; 95 return size;
96 } 96 }
97 97
98 bool ImageSource::GetHotSpot(IntPoint& hot_spot) const { 98 bool ImageSource::GetHotSpot(IntPoint& hot_spot) const {
99 return decoder_ ? decoder_->HotSpot(hot_spot) : false; 99 return decoder_ ? decoder_->HotSpot(hot_spot) : false;
100 } 100 }
101 101
102 int ImageSource::RepetitionCount() { 102 int ImageSource::RepetitionCount() {
103 return decoder_ ? decoder_->RepetitionCount() : kAnimationNone; 103 return decoder_ ? decoder_->RepetitionCount() : kCAnimationNone;
104 } 104 }
105 105
106 size_t ImageSource::FrameCount() const { 106 size_t ImageSource::FrameCount() const {
107 return decoder_ ? decoder_->FrameCount() : 0; 107 return decoder_ ? decoder_->FrameCount() : 0;
108 } 108 }
109 109
110 sk_sp<SkImage> ImageSource::CreateFrameAtIndex( 110 sk_sp<SkImage> ImageSource::CreateFrameAtIndex(
111 size_t index, 111 size_t index,
112 const ColorBehavior& color_behavior) { 112 const ColorBehavior& color_behavior) {
113 if (!decoder_) 113 if (!decoder_)
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 151
152 bool ImageSource::FrameIsCompleteAtIndex(size_t index) const { 152 bool ImageSource::FrameIsCompleteAtIndex(size_t index) const {
153 return decoder_ && decoder_->FrameIsCompleteAtIndex(index); 153 return decoder_ && decoder_->FrameIsCompleteAtIndex(index);
154 } 154 }
155 155
156 size_t ImageSource::FrameBytesAtIndex(size_t index) const { 156 size_t ImageSource::FrameBytesAtIndex(size_t index) const {
157 return decoder_ ? decoder_->FrameBytesAtIndex(index) : 0; 157 return decoder_ ? decoder_->FrameBytesAtIndex(index) : 0;
158 } 158 }
159 159
160 } // namespace blink 160 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698