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

Side by Side Diff: Source/core/loader/ImageLoader.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
« no previous file with comments | « Source/core/loader/ImageLoader.h ('k') | Source/core/loader/Prerenderer.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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010 Apple Inc. All rights reserv ed. 4 * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010 Apple Inc. All rights reserv ed.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 19 matching lines...) Expand all
30 #include "Element.h" 30 #include "Element.h"
31 #include "Event.h" 31 #include "Event.h"
32 #include "EventSender.h" 32 #include "EventSender.h"
33 #include "Frame.h" 33 #include "Frame.h"
34 #include "HTMLNames.h" 34 #include "HTMLNames.h"
35 #include "HTMLObjectElement.h" 35 #include "HTMLObjectElement.h"
36 #include "HTMLParserIdioms.h" 36 #include "HTMLParserIdioms.h"
37 #include "RenderImage.h" 37 #include "RenderImage.h"
38 #include "ScriptCallStack.h" 38 #include "ScriptCallStack.h"
39 #include "SecurityOrigin.h" 39 #include "SecurityOrigin.h"
40 #include "WebCoreMemoryInstrumentation.h"
41 40
42 #if ENABLE(SVG) 41 #if ENABLE(SVG)
43 #include "RenderSVGImage.h" 42 #include "RenderSVGImage.h"
44 #endif 43 #endif
45 #if ENABLE(VIDEO) 44 #if ENABLE(VIDEO)
46 #include "RenderVideo.h" 45 #include "RenderVideo.h"
47 #endif 46 #endif
48 47
49 #if !ASSERT_DISABLED 48 #if !ASSERT_DISABLED
50 // ImageLoader objects are allocated as members of other objects, so generic poi nter check would always fail. 49 // ImageLoader objects are allocated as members of other objects, so generic poi nter check would always fail.
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
472 { 471 {
473 clearFailedLoadURL(); 472 clearFailedLoadURL();
474 setImage(0); 473 setImage(0);
475 } 474 }
476 475
477 inline void ImageLoader::clearFailedLoadURL() 476 inline void ImageLoader::clearFailedLoadURL()
478 { 477 {
479 m_failedLoadURL = AtomicString(); 478 m_failedLoadURL = AtomicString();
480 } 479 }
481 480
482 void ImageLoader::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
483 {
484 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Image);
485 info.addMember(m_element, "element");
486 info.addMember(m_image.get(), "image", WTF::RetainingPointer);
487 info.addMember(m_derefElementTimer, "derefElementTimer");
488 info.addMember(m_failedLoadURL, "failedLoadURL");
489 } 481 }
490
491 }
OLDNEW
« no previous file with comments | « Source/core/loader/ImageLoader.h ('k') | Source/core/loader/Prerenderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698