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

Side by Side Diff: Source/core/platform/graphics/BitmapImage.cpp

Issue 13973026: remove memoryinstrumentation Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: remove the rest part of MemoryInstrumentation Created 7 years, 8 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 | Annotate | Revision Log
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
(...skipping 13 matching lines...) Expand all
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 "config.h" 27 #include "config.h"
28 #include "BitmapImage.h" 28 #include "BitmapImage.h"
29 29
30 #include "FloatRect.h" 30 #include "FloatRect.h"
31 #include "ImageObserver.h" 31 #include "ImageObserver.h"
32 #include "IntRect.h" 32 #include "IntRect.h"
33 #include "MIMETypeRegistry.h" 33 #include "MIMETypeRegistry.h"
34 #include "PlatformMemoryInstrumentation.h"
35 #include "Timer.h" 34 #include "Timer.h"
36 #include <wtf/CurrentTime.h> 35 #include <wtf/CurrentTime.h>
37 #include <wtf/MemoryInstrumentationVector.h>
38 #include <wtf/MemoryObjectInfo.h>
39 #include <wtf/Vector.h> 36 #include <wtf/Vector.h>
40 #include <wtf/text/WTFString.h> 37 #include <wtf/text/WTFString.h>
41 38
42 namespace WebCore { 39 namespace WebCore {
43 40
44 BitmapImage::BitmapImage(ImageObserver* observer) 41 BitmapImage::BitmapImage(ImageObserver* observer)
45 : Image(observer) 42 : Image(observer)
46 , m_currentFrame(0) 43 , m_currentFrame(0)
47 , m_frames(0) 44 , m_frames(0)
48 , m_frameTimer(0) 45 , m_frameTimer(0)
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after
563 ASSERT(m_checkedForSolidColor); 560 ASSERT(m_checkedForSolidColor);
564 } 561 }
565 return m_isSolidColor && !m_currentFrame; 562 return m_isSolidColor && !m_currentFrame;
566 } 563 }
567 564
568 Color BitmapImage::solidColor() const 565 Color BitmapImage::solidColor() const
569 { 566 {
570 return m_solidColor; 567 return m_solidColor;
571 } 568 }
572 569
573 void BitmapImage::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
574 {
575 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Image);
576 memoryObjectInfo->setClassName("BitmapImage");
577 Image::reportMemoryUsage(memoryObjectInfo);
578 info.addMember(m_source, "source");
579 info.addMember(m_frameTimer, "frameTimer");
580 info.addMember(m_frames, "frames");
581 } 570 }
582
583 void FrameData::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
584 {
585 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Image);
586 memoryObjectInfo->setClassName("FrameData");
587 info.addMember(m_frame, "frame", WTF::RetainingPointer);
588 }
589
590 }
OLDNEW
« no previous file with comments | « Source/core/platform/graphics/BitmapImage.h ('k') | Source/core/platform/graphics/CrossfadeGeneratedImage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698