Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2013 Samsung Electronics. All rights reserved. | 3 * Copyright (C) 2013 Samsung Electronics. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * | 8 * |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 30 matching lines...) Expand all Loading... | |
| 41 #include "core/page/DOMWindow.h" | 41 #include "core/page/DOMWindow.h" |
| 42 #include "core/page/Frame.h" | 42 #include "core/page/Frame.h" |
| 43 #include "core/page/Page.h" | 43 #include "core/page/Page.h" |
| 44 #include "core/page/PageGroup.h" | 44 #include "core/page/PageGroup.h" |
| 45 #include "core/platform/JSONValues.h" | 45 #include "core/platform/JSONValues.h" |
| 46 #include "core/storage/Storage.h" | 46 #include "core/storage/Storage.h" |
| 47 #include "core/storage/StorageArea.h" | 47 #include "core/storage/StorageArea.h" |
| 48 #include "core/storage/StorageNamespace.h" | 48 #include "core/storage/StorageNamespace.h" |
| 49 #include "weborigin/SecurityOrigin.h" | 49 #include "weborigin/SecurityOrigin.h" |
| 50 | 50 |
| 51 #include <wtf/MemoryInstrumentationHashMap.h> | |
|
yurys
2013/06/24 15:00:44
Please return MemoryInstrumentationHashMap.h back
| |
| 52 #include <wtf/Vector.h> | |
| 53 | |
| 54 namespace WebCore { | 51 namespace WebCore { |
| 55 | 52 |
| 56 namespace DOMStorageAgentState { | 53 namespace DOMStorageAgentState { |
| 57 static const char domStorageAgentEnabled[] = "domStorageAgentEnabled"; | 54 static const char domStorageAgentEnabled[] = "domStorageAgentEnabled"; |
| 58 }; | 55 }; |
| 59 | 56 |
| 60 static bool hadException(ExceptionCode ec, ErrorString* errorString) | 57 static bool hadException(ExceptionCode ec, ErrorString* errorString) |
| 61 { | 58 { |
| 62 switch (ec) { | 59 switch (ec) { |
| 63 case 0: | 60 case 0: |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 237 | 234 |
| 238 void InspectorDOMStorageAgent::reportMemoryUsage(MemoryObjectInfo* memoryObjectI nfo) const | 235 void InspectorDOMStorageAgent::reportMemoryUsage(MemoryObjectInfo* memoryObjectI nfo) const |
| 239 { | 236 { |
| 240 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::InspectorDO MStorageAgent); | 237 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::InspectorDO MStorageAgent); |
| 241 InspectorBaseAgent<InspectorDOMStorageAgent>::reportMemoryUsage(memoryObject Info); | 238 InspectorBaseAgent<InspectorDOMStorageAgent>::reportMemoryUsage(memoryObject Info); |
| 242 info.addWeakPointer(m_frontend); | 239 info.addWeakPointer(m_frontend); |
| 243 } | 240 } |
| 244 | 241 |
| 245 } // namespace WebCore | 242 } // namespace WebCore |
| 246 | 243 |
| OLD | NEW |