OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 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 30 matching lines...) Expand all Loading... |
41 #include "core/dom/Attr.h" | 41 #include "core/dom/Attr.h" |
42 #include "core/dom/NodeTraversal.h" | 42 #include "core/dom/NodeTraversal.h" |
43 #include "core/dom/TemplateContentDocumentFragment.h" | 43 #include "core/dom/TemplateContentDocumentFragment.h" |
44 #include "core/dom/shadow/ElementShadow.h" | 44 #include "core/dom/shadow/ElementShadow.h" |
45 #include "core/dom/shadow/ShadowRoot.h" | 45 #include "core/dom/shadow/ShadowRoot.h" |
46 #include "core/html/HTMLImageElement.h" | 46 #include "core/html/HTMLImageElement.h" |
47 #include "core/html/HTMLTemplateElement.h" | 47 #include "core/html/HTMLTemplateElement.h" |
48 #include "core/html/imports/HTMLImportsController.h" | 48 #include "core/html/imports/HTMLImportsController.h" |
49 #include "core/inspector/InspectorTraceEvents.h" | 49 #include "core/inspector/InspectorTraceEvents.h" |
50 #include "core/svg/SVGElement.h" | 50 #include "core/svg/SVGElement.h" |
| 51 #include "platform/Partitions.h" |
51 #include "platform/TraceEvent.h" | 52 #include "platform/TraceEvent.h" |
52 #include <algorithm> | 53 #include <algorithm> |
53 | 54 |
54 namespace WebCore { | 55 namespace WebCore { |
55 | 56 |
56 // FIXME: This should use opaque GC roots. | 57 // FIXME: This should use opaque GC roots. |
57 static void addReferencesForNodeWithEventListeners(v8::Isolate* isolate, Node* n
ode, const v8::Persistent<v8::Object>& wrapper) | 58 static void addReferencesForNodeWithEventListeners(v8::Isolate* isolate, Node* n
ode, const v8::Persistent<v8::Object>& wrapper) |
58 { | 59 { |
59 ASSERT(node->hasEventListeners()); | 60 ASSERT(node->hasEventListeners()); |
60 | 61 |
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
430 | 431 |
431 void V8GCController::collectGarbage(v8::Isolate* isolate) | 432 void V8GCController::collectGarbage(v8::Isolate* isolate) |
432 { | 433 { |
433 v8::HandleScope handleScope(isolate); | 434 v8::HandleScope handleScope(isolate); |
434 RefPtr<ScriptState> scriptState = ScriptState::create(v8::Context::New(isola
te), DOMWrapperWorld::create()); | 435 RefPtr<ScriptState> scriptState = ScriptState::create(v8::Context::New(isola
te), DOMWrapperWorld::create()); |
435 ScriptState::Scope scope(scriptState.get()); | 436 ScriptState::Scope scope(scriptState.get()); |
436 V8ScriptRunner::compileAndRunInternalScript(v8String(isolate, "if (gc) gc();
"), isolate); | 437 V8ScriptRunner::compileAndRunInternalScript(v8String(isolate, "if (gc) gc();
"), isolate); |
437 scriptState->disposePerContextData(); | 438 scriptState->disposePerContextData(); |
438 } | 439 } |
439 | 440 |
| 441 void V8GCController::reportDOMMemoryUsageToV8(v8::Isolate* isolate) |
| 442 { |
| 443 if (!isMainThread()) |
| 444 return; |
| 445 |
| 446 static size_t lastUsageReportedToV8 = 0; |
| 447 |
| 448 size_t currentUsage = Partitions::currentDOMMemoryUsage(); |
| 449 int64_t diff = static_cast<int64_t>(currentUsage) - static_cast<int64_t>(las
tUsageReportedToV8); |
| 450 isolate->AdjustAmountOfExternalAllocatedMemory(diff); |
| 451 |
| 452 lastUsageReportedToV8 = currentUsage; |
| 453 } |
| 454 |
440 } // namespace WebCore | 455 } // namespace WebCore |
OLD | NEW |