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

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

Issue 2718023002: //third_party/WebKit/Source/core: include v8 as a user, not system, header (Closed)
Patch Set: Fix plugin/BUILD.gn deps Created 3 years, 9 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
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 12 matching lines...) Expand all
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 "core/timing/MemoryInfo.h" 31 #include "core/timing/MemoryInfo.h"
32 32
33 #include <limits>
34
33 #include "core/frame/LocalFrame.h" 35 #include "core/frame/LocalFrame.h"
34 #include "core/frame/Settings.h" 36 #include "core/frame/Settings.h"
35 #include "platform/RuntimeEnabledFeatures.h" 37 #include "platform/RuntimeEnabledFeatures.h"
38 #include "v8/include/v8.h"
36 #include "wtf/CurrentTime.h" 39 #include "wtf/CurrentTime.h"
37 #include "wtf/MathExtras.h" 40 #include "wtf/MathExtras.h"
38 #include "wtf/ThreadSpecific.h" 41 #include "wtf/ThreadSpecific.h"
39 #include <limits>
40 #include <v8.h>
41 42
42 namespace blink { 43 namespace blink {
43 44
44 static const double TwentyMinutesInSeconds = 20 * 60; 45 static const double TwentyMinutesInSeconds = 20 * 60;
45 46
46 static void getHeapSize(HeapInfo& info) { 47 static void getHeapSize(HeapInfo& info) {
47 v8::HeapStatistics heapStatistics; 48 v8::HeapStatistics heapStatistics;
48 v8::Isolate::GetCurrent()->GetHeapStatistics(&heapStatistics); 49 v8::Isolate::GetCurrent()->GetHeapStatistics(&heapStatistics);
49 info.usedJSHeapSize = heapStatistics.used_heap_size(); 50 info.usedJSHeapSize = heapStatistics.used_heap_size();
50 info.totalJSHeapSize = heapStatistics.total_physical_size(); 51 info.totalJSHeapSize = heapStatistics.total_physical_size();
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 } 147 }
147 148
148 MemoryInfo::MemoryInfo() { 149 MemoryInfo::MemoryInfo() {
149 if (RuntimeEnabledFeatures::preciseMemoryInfoEnabled()) 150 if (RuntimeEnabledFeatures::preciseMemoryInfoEnabled())
150 getHeapSize(m_info); 151 getHeapSize(m_info);
151 else 152 else
152 HeapSizeCache::forCurrentThread().getCachedHeapSize(m_info); 153 HeapSizeCache::forCurrentThread().getCachedHeapSize(m_info);
153 } 154 }
154 155
155 } // namespace blink 156 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698