| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright (C) 2012 Google Inc. All rights reserved. | 2  * Copyright (C) 2012 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 17 matching lines...) Expand all  Loading... | 
| 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 #include "core/platform/graphics/skia/MemoryInstrumentationSkia.h" | 32 #include "core/platform/graphics/skia/MemoryInstrumentationSkia.h" | 
| 33 | 33 | 
| 34 #include "SkBitmap.h" | 34 #include "SkBitmap.h" | 
| 35 #include "SkCanvas.h" | 35 #include "SkCanvas.h" | 
| 36 #include "SkDevice.h" | 36 #include "SkDevice.h" | 
| 37 #include "SkPixelRef.h" | 37 #include "SkPixelRef.h" | 
| 38 #include "core/platform/PlatformMemoryInstrumentation.h" |  | 
| 39 #include <wtf/MemoryObjectInfo.h> | 38 #include <wtf/MemoryObjectInfo.h> | 
| 40 | 39 | 
| 41 void reportMemoryUsage(const SkBitmap* const& image, WTF::MemoryObjectInfo* memo
    ryObjectInfo) | 40 void reportMemoryUsage(const SkBitmap* const& image, WTF::MemoryObjectInfo* memo
    ryObjectInfo) | 
| 42 { | 41 { | 
| 43     WTF::MemoryClassInfo info(memoryObjectInfo, image); | 42     WTF::MemoryClassInfo info(memoryObjectInfo, image); | 
| 44     memoryObjectInfo->setClassName("SkBitmap"); | 43     memoryObjectInfo->setClassName("SkBitmap"); | 
| 45     SkPixelRef* pixelRef = image->pixelRef(); | 44     SkPixelRef* pixelRef = image->pixelRef(); | 
| 46     info.addMember(pixelRef, "pixelRef"); | 45     info.addMember(pixelRef, "pixelRef"); | 
| 47     if (pixelRef) | 46     if (pixelRef) | 
| 48         info.addRawBuffer(pixelRef->pixels(), image->getSize(), "Pixels", "pixel
    Ref"); | 47         info.addRawBuffer(pixelRef->pixels(), image->getSize(), "Pixels", "pixel
    Ref"); | 
| 49 } | 48 } | 
| 50 | 49 | 
| 51 void reportMemoryUsage(const SkDevice* const& device, WTF::MemoryObjectInfo* mem
    oryObjectInfo) | 50 void reportMemoryUsage(const SkDevice* const& device, WTF::MemoryObjectInfo* mem
    oryObjectInfo) | 
| 52 { | 51 { | 
| 53     WTF::MemoryClassInfo info(memoryObjectInfo, device); | 52     WTF::MemoryClassInfo info(memoryObjectInfo, device); | 
| 54     info.addMember(const_cast<SkDevice*>(device)->accessBitmap(false), "bitmap",
     WTF::RetainingPointer); | 53     info.addMember(const_cast<SkDevice*>(device)->accessBitmap(false), "bitmap",
     WTF::RetainingPointer); | 
| 55 } | 54 } | 
| 56 | 55 | 
| 57 void reportMemoryUsage(const SkCanvas* const& canvas, WTF::MemoryObjectInfo* mem
    oryObjectInfo) | 56 void reportMemoryUsage(const SkCanvas* const& canvas, WTF::MemoryObjectInfo* mem
    oryObjectInfo) | 
| 58 { | 57 { | 
| 59     WTF::MemoryClassInfo info(memoryObjectInfo, canvas); | 58     WTF::MemoryClassInfo info(memoryObjectInfo, canvas); | 
| 60     info.addMember(canvas->getDevice(), "canvas", WTF::RetainingPointer); | 59     info.addMember(canvas->getDevice(), "canvas", WTF::RetainingPointer); | 
| 61 } | 60 } | 
| OLD | NEW | 
|---|