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

Side by Side Diff: Source/WebCore/inspector/MemoryInstrumentationImpl.cpp

Issue 13646003: DevTools: Remove ENABLE(INSPECTOR) and ENABLE(JAVASCRIPT_DEBUGGER) from the code. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: comments addressed 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) 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 11 matching lines...) Expand all
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
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
33 #if ENABLE(INSPECTOR)
34
35 #include "MemoryInstrumentationImpl.h" 32 #include "MemoryInstrumentationImpl.h"
36 33
37 #include "HeapGraphSerializer.h" 34 #include "HeapGraphSerializer.h"
38 #include "WebCoreMemoryInstrumentation.h" 35 #include "WebCoreMemoryInstrumentation.h"
39 #include <wtf/Assertions.h> 36 #include <wtf/Assertions.h>
40 #include <wtf/MemoryInstrumentationHashMap.h> 37 #include <wtf/MemoryInstrumentationHashMap.h>
41 #include <wtf/MemoryInstrumentationHashSet.h> 38 #include <wtf/MemoryInstrumentationHashSet.h>
42 #include <wtf/MemoryInstrumentationVector.h> 39 #include <wtf/MemoryInstrumentationVector.h>
43 #include <wtf/text/StringHash.h> 40 #include <wtf/text/StringHash.h>
44 41
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 return !m_visitedObjects.add(object).isNewEntry; 77 return !m_visitedObjects.add(object).isNewEntry;
81 } 78 }
82 79
83 bool MemoryInstrumentationClientImpl::checkCountedObject(const void* object) 80 bool MemoryInstrumentationClientImpl::checkCountedObject(const void* object)
84 { 81 {
85 if (!checkInstrumentedObjects()) 82 if (!checkInstrumentedObjects())
86 return true; 83 return true;
87 if (!m_allocatedObjects.contains(object)) { 84 if (!m_allocatedObjects.contains(object)) {
88 ++m_totalObjectsNotInAllocatedSet; 85 ++m_totalObjectsNotInAllocatedSet;
89 return false; 86 return false;
90 #if 0
91 printf("Found unknown object referenced by pointer: %p\n", object);
92 WTFReportBacktrace();
93 #endif
94 } 87 }
95 return true; 88 return true;
96 } 89 }
97 90
98 void MemoryInstrumentationClientImpl::reportNode(const MemoryObjectInfo& node) 91 void MemoryInstrumentationClientImpl::reportNode(const MemoryObjectInfo& node)
99 { 92 {
100 if (m_graphSerializer) 93 if (m_graphSerializer)
101 m_graphSerializer->reportNode(node); 94 m_graphSerializer->reportNode(node);
102 } 95 }
103 96
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 145
153 void MemoryInstrumentationImpl::reportMemoryUsage(MemoryObjectInfo* memoryObject Info) const 146 void MemoryInstrumentationImpl::reportMemoryUsage(MemoryObjectInfo* memoryObject Info) const
154 { 147 {
155 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::InspectorMe moryAgent); 148 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::InspectorMe moryAgent);
156 info.addMember(m_deferredObjects, "deferredObjects"); 149 info.addMember(m_deferredObjects, "deferredObjects");
157 } 150 }
158 151
159 152
160 } // namespace WebCore 153 } // namespace WebCore
161 154
162 #endif // ENABLE(INSPECTOR)
OLDNEW
« no previous file with comments | « Source/WebCore/inspector/InstrumentingAgents.cpp ('k') | Source/WebCore/inspector/NetworkResourcesData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698