OLD | NEW |
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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
87 return s_platform; | 87 return s_platform; |
88 } | 88 } |
89 | 89 |
90 WebThread* Platform::mainThread() const | 90 WebThread* Platform::mainThread() const |
91 { | 91 { |
92 return m_mainThread; | 92 return m_mainThread; |
93 } | 93 } |
94 | 94 |
95 void Platform::registerMemoryDumpProvider(WebMemoryDumpProvider* provider, const
char* name) | 95 void Platform::registerMemoryDumpProvider(WebMemoryDumpProvider* provider, const
char* name) |
96 { | 96 { |
| 97 // MemoryDumpProvider needs a meessage loop. |
| 98 if (!Platform::current()->currentThread()) |
| 99 return; |
| 100 |
97 WebMemoryDumpProviderAdapter* adapter = new WebMemoryDumpProviderAdapter(pro
vider); | 101 WebMemoryDumpProviderAdapter* adapter = new WebMemoryDumpProviderAdapter(pro
vider); |
98 ProviderToAdapterMap::AddResult result = memoryDumpProviders().add(provider,
adoptPtr(adapter)); | 102 ProviderToAdapterMap::AddResult result = memoryDumpProviders().add(provider,
adoptPtr(adapter)); |
99 if (!result.isNewEntry) | 103 if (!result.isNewEntry) |
100 return; | 104 return; |
101 adapter->set_is_registered(true); | 105 adapter->set_is_registered(true); |
102 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(ad
apter, name, base::ThreadTaskRunnerHandle::Get()); | 106 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(ad
apter, name, base::ThreadTaskRunnerHandle::Get()); |
103 } | 107 } |
104 | 108 |
105 void Platform::unregisterMemoryDumpProvider(WebMemoryDumpProvider* provider) | 109 void Platform::unregisterMemoryDumpProvider(WebMemoryDumpProvider* provider) |
106 { | 110 { |
| 111 if (!Platform::current()->currentThread()) |
| 112 return; |
| 113 |
107 ProviderToAdapterMap::iterator it = memoryDumpProviders().find(provider); | 114 ProviderToAdapterMap::iterator it = memoryDumpProviders().find(provider); |
108 if (it == memoryDumpProviders().end()) | 115 if (it == memoryDumpProviders().end()) |
109 return; | 116 return; |
110 WebMemoryDumpProviderAdapter* adapter = it->value.get(); | 117 WebMemoryDumpProviderAdapter* adapter = it->value.get(); |
111 base::trace_event::MemoryDumpManager::GetInstance()->UnregisterDumpProvider(
adapter); | 118 base::trace_event::MemoryDumpManager::GetInstance()->UnregisterDumpProvider(
adapter); |
112 adapter->set_is_registered(false); | 119 adapter->set_is_registered(false); |
113 memoryDumpProviders().remove(it); | 120 memoryDumpProviders().remove(it); |
114 } | 121 } |
115 | 122 |
116 } // namespace blink | 123 } // namespace blink |
OLD | NEW |