diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/bindings/js/ScriptProfiler.cpp | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/bindings/js/ScriptProfiler.cpp')
| -rw-r--r-- | Source/WebCore/bindings/js/ScriptProfiler.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/WebCore/bindings/js/ScriptProfiler.cpp b/Source/WebCore/bindings/js/ScriptProfiler.cpp index f372c3c..3468ae3 100644 --- a/Source/WebCore/bindings/js/ScriptProfiler.cpp +++ b/Source/WebCore/bindings/js/ScriptProfiler.cpp @@ -30,11 +30,17 @@ #include "ScriptProfiler.h" +#include "GCController.h" #include "JSDOMBinding.h" #include <profiler/Profiler.h> namespace WebCore { +void ScriptProfiler::collectGarbage() +{ + gcController().garbageCollectNow(); +} + void ScriptProfiler::start(ScriptState* state, const String& title) { JSC::Profiler::profiler()->startProfiling(state, stringToUString(title)); |