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

Side by Side Diff: third_party/WebKit/Source/platform/exported/Platform.cpp

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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) 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 22 matching lines...) Expand all
33 #include "platform/Histogram.h" 33 #include "platform/Histogram.h"
34 #include "platform/MemoryCacheDumpProvider.h" 34 #include "platform/MemoryCacheDumpProvider.h"
35 #include "platform/PartitionAllocMemoryDumpProvider.h" 35 #include "platform/PartitionAllocMemoryDumpProvider.h"
36 #include "platform/fonts/FontCacheMemoryDumpProvider.h" 36 #include "platform/fonts/FontCacheMemoryDumpProvider.h"
37 #include "platform/heap/BlinkGCMemoryDumpProvider.h" 37 #include "platform/heap/BlinkGCMemoryDumpProvider.h"
38 #include "platform/heap/GCTaskRunner.h" 38 #include "platform/heap/GCTaskRunner.h"
39 #include "public/platform/Platform.h" 39 #include "public/platform/Platform.h"
40 #include "public/platform/ServiceRegistry.h" 40 #include "public/platform/ServiceRegistry.h"
41 #include "public/platform/WebPrerenderingSupport.h" 41 #include "public/platform/WebPrerenderingSupport.h"
42 #include "wtf/HashMap.h" 42 #include "wtf/HashMap.h"
43 #include "wtf/OwnPtr.h"
43 44
44 namespace blink { 45 namespace blink {
45 46
46 static Platform* s_platform = nullptr; 47 static Platform* s_platform = nullptr;
47 48
48 static GCTaskRunner* s_gcTaskRunner = nullptr; 49 static GCTaskRunner* s_gcTaskRunner = nullptr;
49 50
50 Platform::Platform() 51 Platform::Platform()
51 : m_mainThread(0) 52 : m_mainThread(0)
52 { 53 {
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 { 139 {
139 return m_mainThread; 140 return m_mainThread;
140 } 141 }
141 142
142 ServiceRegistry* Platform::serviceRegistry() 143 ServiceRegistry* Platform::serviceRegistry()
143 { 144 {
144 return ServiceRegistry::getEmptyServiceRegistry(); 145 return ServiceRegistry::getEmptyServiceRegistry();
145 } 146 }
146 147
147 } // namespace blink 148 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698