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

Unified Diff: third_party/WebKit/Source/platform/exported/Platform.cpp

Issue 1369253002: Add Web Resources usage to chrome://tracing. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@web_cache2_base
Patch Set: Use singleton provider. Created 5 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/exported/Platform.cpp
diff --git a/third_party/WebKit/Source/platform/exported/Platform.cpp b/third_party/WebKit/Source/platform/exported/Platform.cpp
index 2b2ccb844556789f76c7a95a312bf5460fffa513..1e501c5541c725648466f3bc20249299b70f26f0 100644
--- a/third_party/WebKit/Source/platform/exported/Platform.cpp
+++ b/third_party/WebKit/Source/platform/exported/Platform.cpp
@@ -29,9 +29,10 @@
*/
#include "config.h"
-#include "platform/PartitionAllocMemoryDumpProvider.h"
#include "public/platform/Platform.h"
+#include "platform/PartitionAllocMemoryDumpProvider.h"
+
namespace blink {
static Platform* s_platform = 0;
@@ -54,7 +55,7 @@ void Platform::initialize(Platform* platform)
void Platform::shutdown()
{
- if (s_platform->m_mainThread)
+ if (s_platform && s_platform->m_mainThread)
haraken 2015/10/14 00:57:41 I'm just curious but why do we need this change in
ssid 2015/10/14 05:01:22 Oh sorry. It came into this cl by mistake. I was m
s_platform->unregisterMemoryDumpProvider(PartitionAllocMemoryDumpProvider::instance());
if (s_platform)

Powered by Google App Engine
This is Rietveld 408576698