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

Side by Side Diff: third_party/WebKit/Source/platform/graphics/BitmapImage.cpp

Issue 2925623003: color: Remove unneeded ColorBehavior parameters from ImageSource (Closed)
Patch Set: Created 3 years, 6 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/platform/graphics/ImageSource.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) 2 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
3 * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
13 * 13 *
14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */ 25 */
26 26
27 #include "platform/graphics/BitmapImage.h" 27 #include "platform/graphics/BitmapImage.h"
28 28
29 #include "platform/RuntimeEnabledFeatures.h"
30 #include "platform/Timer.h" 29 #include "platform/Timer.h"
31 #include "platform/geometry/FloatRect.h" 30 #include "platform/geometry/FloatRect.h"
32 #include "platform/graphics/BitmapImageMetrics.h" 31 #include "platform/graphics/BitmapImageMetrics.h"
33 #include "platform/graphics/DeferredImageDecoder.h" 32 #include "platform/graphics/DeferredImageDecoder.h"
34 #include "platform/graphics/ImageObserver.h" 33 #include "platform/graphics/ImageObserver.h"
35 #include "platform/graphics/StaticBitmapImage.h" 34 #include "platform/graphics/StaticBitmapImage.h"
36 #include "platform/graphics/paint/PaintCanvas.h" 35 #include "platform/graphics/paint/PaintCanvas.h"
37 #include "platform/graphics/paint/PaintFlags.h" 36 #include "platform/graphics/paint/PaintFlags.h"
38 #include "platform/graphics/paint/PaintImage.h" 37 #include "platform/graphics/paint/PaintImage.h"
39 #include "platform/graphics/skia/SkiaUtils.h" 38 #include "platform/graphics/skia/SkiaUtils.h"
40 #include "platform/instrumentation/PlatformInstrumentation.h" 39 #include "platform/instrumentation/PlatformInstrumentation.h"
41 #include "platform/instrumentation/tracing/TraceEvent.h" 40 #include "platform/instrumentation/tracing/TraceEvent.h"
42 #include "platform/scheduler/child/web_scheduler.h" 41 #include "platform/scheduler/child/web_scheduler.h"
43 #include "platform/wtf/PassRefPtr.h" 42 #include "platform/wtf/PassRefPtr.h"
44 #include "platform/wtf/PtrUtil.h" 43 #include "platform/wtf/PtrUtil.h"
45 #include "platform/wtf/text/WTFString.h" 44 #include "platform/wtf/text/WTFString.h"
46 45
47 namespace blink { 46 namespace blink {
48 47
49 namespace {
50
51 ColorBehavior DefaultColorBehavior() {
52 if (RuntimeEnabledFeatures::colorCorrectRenderingEnabled())
53 return ColorBehavior::Tag();
54 return ColorBehavior::TransformToGlobalTarget();
55 }
56
57 } // namespace
58
59 PassRefPtr<BitmapImage> BitmapImage::CreateWithOrientationForTesting( 48 PassRefPtr<BitmapImage> BitmapImage::CreateWithOrientationForTesting(
60 const SkBitmap& bitmap, 49 const SkBitmap& bitmap,
61 ImageOrientation orientation) { 50 ImageOrientation orientation) {
62 if (bitmap.isNull()) { 51 if (bitmap.isNull()) {
63 return BitmapImage::Create(); 52 return BitmapImage::Create();
64 } 53 }
65 54
66 RefPtr<BitmapImage> result = AdoptRef(new BitmapImage(bitmap)); 55 RefPtr<BitmapImage> result = AdoptRef(new BitmapImage(bitmap));
67 result->frames_[0].orientation_ = orientation; 56 result->frames_[0].orientation_ = orientation;
68 if (orientation.UsesWidthAsHeight()) 57 if (orientation.UsesWidthAsHeight())
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 return total_bytes; 141 return total_bytes;
153 } 142 }
154 143
155 sk_sp<SkImage> BitmapImage::DecodeAndCacheFrame(size_t index) { 144 sk_sp<SkImage> BitmapImage::DecodeAndCacheFrame(size_t index) {
156 size_t num_frames = FrameCount(); 145 size_t num_frames = FrameCount();
157 if (frames_.size() < num_frames) 146 if (frames_.size() < num_frames)
158 frames_.Grow(num_frames); 147 frames_.Grow(num_frames);
159 148
160 // We are caching frame snapshots. This is OK even for partially decoded 149 // We are caching frame snapshots. This is OK even for partially decoded
161 // frames, as they are cleared by dataChanged() when new data arrives. 150 // frames, as they are cleared by dataChanged() when new data arrives.
162 sk_sp<SkImage> image = 151 sk_sp<SkImage> image = source_.CreateFrameAtIndex(index);
163 source_.CreateFrameAtIndex(index, DefaultColorBehavior());
164 cached_frame_ = image; 152 cached_frame_ = image;
165 cached_frame_index_ = index; 153 cached_frame_index_ = index;
166 154
167 frames_[index].orientation_ = source_.OrientationAtIndex(index); 155 frames_[index].orientation_ = source_.OrientationAtIndex(index);
168 frames_[index].have_metadata_ = true; 156 frames_[index].have_metadata_ = true;
169 frames_[index].is_complete_ = source_.FrameIsCompleteAtIndex(index); 157 frames_[index].is_complete_ = source_.FrameIsCompleteAtIndex(index);
170 if (RepetitionCount(false) != kAnimationNone) 158 if (RepetitionCount(false) != kAnimationNone)
171 frames_[index].duration_ = source_.FrameDurationAtIndex(index); 159 frames_[index].duration_ = source_.FrameDurationAtIndex(index);
172 frames_[index].has_alpha_ = source_.FrameHasAlphaAtIndex(index); 160 frames_[index].has_alpha_ = source_.FrameHasAlphaAtIndex(index);
173 frames_[index].frame_bytes_ = source_.FrameBytesAtIndex(index); 161 frames_[index].frame_bytes_ = source_.FrameBytesAtIndex(index);
(...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after
655 643
656 return true; 644 return true;
657 } 645 }
658 646
659 void BitmapImage::NotifyObserversOfAnimationAdvance(TimerBase*) { 647 void BitmapImage::NotifyObserversOfAnimationAdvance(TimerBase*) {
660 if (GetImageObserver()) 648 if (GetImageObserver())
661 GetImageObserver()->AnimationAdvanced(this); 649 GetImageObserver()->AnimationAdvanced(this);
662 } 650 }
663 651
664 } // namespace blink 652 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/platform/graphics/ImageSource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698