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

Side by Side Diff: Source/core/timing/MemoryInfo.cpp

Issue 169293002: Oilpan: Remove GC_INFO_{DEFINE,DECLARE} macros (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fixheaptest Created 6 years, 10 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/timing/MemoryInfo.h ('k') | Source/core/timing/Performance.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) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 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 22 matching lines...) Expand all
33 33
34 #include <limits> 34 #include <limits>
35 #include "core/frame/Frame.h" 35 #include "core/frame/Frame.h"
36 #include "core/frame/Settings.h" 36 #include "core/frame/Settings.h"
37 #include "wtf/CurrentTime.h" 37 #include "wtf/CurrentTime.h"
38 #include "wtf/MainThread.h" 38 #include "wtf/MainThread.h"
39 #include "wtf/MathExtras.h" 39 #include "wtf/MathExtras.h"
40 40
41 namespace WebCore { 41 namespace WebCore {
42 42
43 DEFINE_GC_INFO(MemoryInfo);
44
45 class HeapSizeCache { 43 class HeapSizeCache {
46 WTF_MAKE_NONCOPYABLE(HeapSizeCache); WTF_MAKE_FAST_ALLOCATED; 44 WTF_MAKE_NONCOPYABLE(HeapSizeCache); WTF_MAKE_FAST_ALLOCATED;
47 public: 45 public:
48 HeapSizeCache() 46 HeapSizeCache()
49 : m_lastUpdateTime(0) 47 : m_lastUpdateTime(0)
50 { 48 {
51 } 49 }
52 50
53 void getCachedHeapSize(HeapInfo& info) 51 void getCachedHeapSize(HeapInfo& info)
54 { 52 {
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 139
142 if (frame->settings()->memoryInfoEnabled()) { 140 if (frame->settings()->memoryInfoEnabled()) {
143 ScriptGCEvent::getHeapSize(m_info); 141 ScriptGCEvent::getHeapSize(m_info);
144 } else { 142 } else {
145 DEFINE_STATIC_LOCAL(HeapSizeCache, heapSizeCache, ()); 143 DEFINE_STATIC_LOCAL(HeapSizeCache, heapSizeCache, ());
146 heapSizeCache.getCachedHeapSize(m_info); 144 heapSizeCache.getCachedHeapSize(m_info);
147 } 145 }
148 } 146 }
149 147
150 } // namespace WebCore 148 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/timing/MemoryInfo.h ('k') | Source/core/timing/Performance.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698