OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2008, Google Inc. All rights reserved. | 2 * Copyright (c) 2008, Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 16 matching lines...) Expand all Loading... |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #include "config.h" | 31 #include "config.h" |
32 | 32 |
33 #include "skia/ext/image_operations.h" | 33 #include "skia/ext/image_operations.h" |
34 | 34 |
35 #include "MemoryInstrumentationSkia.h" | 35 #include "MemoryInstrumentationSkia.h" |
36 #include "NativeImageSkia.h" | 36 #include "NativeImageSkia.h" |
37 #include "PlatformInstrumentation.h" | |
38 #include "PlatformMemoryInstrumentation.h" | |
39 #include "SkPixelRef.h" | 37 #include "SkPixelRef.h" |
40 #include "SkiaUtils.h" | 38 #include "SkiaUtils.h" |
| 39 #include "core/platform/PlatformInstrumentation.h" |
| 40 #include "core/platform/PlatformMemoryInstrumentation.h" |
41 #include "core/platform/graphics/GraphicsContext3D.h" | 41 #include "core/platform/graphics/GraphicsContext3D.h" |
42 | 42 |
43 #include "core/platform/chromium/TraceEvent.h" | 43 #include "core/platform/chromium/TraceEvent.h" |
44 #include "core/platform/graphics/chromium/DeferredImageDecoder.h" | 44 #include "core/platform/graphics/chromium/DeferredImageDecoder.h" |
45 | 45 |
46 namespace WebCore { | 46 namespace WebCore { |
47 | 47 |
48 NativeImageSkia::NativeImageSkia() | 48 NativeImageSkia::NativeImageSkia() |
49 : m_resolutionScale(1) | 49 : m_resolutionScale(1) |
50 , m_resizeRequests(0) | 50 , m_resizeRequests(0) |
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
188 info.addMember(m_resizedImage, "resizedImage"); | 188 info.addMember(m_resizedImage, "resizedImage"); |
189 info.addMember(m_cachedImageInfo, "cachedImageInfo"); | 189 info.addMember(m_cachedImageInfo, "cachedImageInfo"); |
190 } | 190 } |
191 | 191 |
192 void reportMemoryUsage(const NativeImageSkia* image, MemoryObjectInfo* memoryObj
ectInfo) | 192 void reportMemoryUsage(const NativeImageSkia* image, MemoryObjectInfo* memoryObj
ectInfo) |
193 { | 193 { |
194 image->reportMemoryUsage(memoryObjectInfo); | 194 image->reportMemoryUsage(memoryObjectInfo); |
195 } | 195 } |
196 | 196 |
197 } // namespace WebCore | 197 } // namespace WebCore |
OLD | NEW |