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

Side by Side Diff: third_party/WebKit/Source/core/timing/MemoryInfo.h

Issue 1406923009: Rename DISALLOW_ALLOCATION and ALLOW_ONLY_INLINE_ALLOCATION (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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
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 21 matching lines...) Expand all
32 #define MemoryInfo_h 32 #define MemoryInfo_h
33 33
34 #include "bindings/core/v8/ScriptWrappable.h" 34 #include "bindings/core/v8/ScriptWrappable.h"
35 #include "core/CoreExport.h" 35 #include "core/CoreExport.h"
36 #include "platform/heap/Handle.h" 36 #include "platform/heap/Handle.h"
37 #include "wtf/Allocator.h" 37 #include "wtf/Allocator.h"
38 38
39 namespace blink { 39 namespace blink {
40 40
41 struct HeapInfo { 41 struct HeapInfo {
42 DISALLOW_ALLOCATION(); 42 DISALLOW_NEW();
43 HeapInfo() 43 HeapInfo()
44 : usedJSHeapSize(0) 44 : usedJSHeapSize(0)
45 , totalJSHeapSize(0) 45 , totalJSHeapSize(0)
46 , jsHeapSizeLimit(0) 46 , jsHeapSizeLimit(0)
47 { 47 {
48 } 48 }
49 49
50 size_t usedJSHeapSize; 50 size_t usedJSHeapSize;
51 size_t totalJSHeapSize; 51 size_t totalJSHeapSize;
52 size_t jsHeapSizeLimit; 52 size_t jsHeapSizeLimit;
(...skipping 17 matching lines...) Expand all
70 MemoryInfo(); 70 MemoryInfo();
71 71
72 HeapInfo m_info; 72 HeapInfo m_info;
73 }; 73 };
74 74
75 CORE_EXPORT size_t quantizeMemorySize(size_t); 75 CORE_EXPORT size_t quantizeMemorySize(size_t);
76 76
77 } // namespace blink 77 } // namespace blink
78 78
79 #endif // MemoryInfo_h 79 #endif // MemoryInfo_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698