| Index: Source/bindings/core/v8/ScriptProfiler.cpp
|
| diff --git a/Source/bindings/v8/ScriptProfiler.cpp b/Source/bindings/core/v8/ScriptProfiler.cpp
|
| similarity index 97%
|
| rename from Source/bindings/v8/ScriptProfiler.cpp
|
| rename to Source/bindings/core/v8/ScriptProfiler.cpp
|
| index 07a65f74a49c0346d9d78b73c4ded219104407e2..5fe451d43aca6dd702cfe61b89d3a95316226434 100644
|
| --- a/Source/bindings/v8/ScriptProfiler.cpp
|
| +++ b/Source/bindings/core/v8/ScriptProfiler.cpp
|
| @@ -29,22 +29,21 @@
|
| */
|
|
|
| #include "config.h"
|
| -#include "bindings/v8/ScriptProfiler.h"
|
| +#include "bindings/core/v8/ScriptProfiler.h"
|
|
|
| +#include "bindings/core/v8/RetainedDOMInfo.h"
|
| +#include "bindings/core/v8/ScriptValue.h"
|
| +#include "bindings/core/v8/V8Binding.h"
|
| #include "bindings/core/v8/V8Node.h"
|
| #include "bindings/core/v8/V8Window.h"
|
| -#include "bindings/v8/RetainedDOMInfo.h"
|
| -#include "bindings/v8/ScriptValue.h"
|
| -#include "bindings/v8/V8Binding.h"
|
| -#include "bindings/v8/WrapperTypeInfo.h"
|
| +#include "bindings/core/v8/WrapperTypeInfo.h"
|
| #include "core/dom/Document.h"
|
| #include "core/inspector/BindingVisitors.h"
|
| +#include "wtf/ThreadSpecific.h"
|
|
|
| #include <v8-profiler.h>
|
| #include <v8.h>
|
|
|
| -#include "wtf/ThreadSpecific.h"
|
| -
|
| namespace WebCore {
|
|
|
| typedef HashMap<String, double> ProfileNameIdleTimeMap;
|
| @@ -143,15 +142,16 @@ namespace {
|
| class ActivityControlAdapter FINAL : public v8::ActivityControl {
|
| public:
|
| ActivityControlAdapter(ScriptProfiler::HeapSnapshotProgress* progress)
|
| - : m_progress(progress), m_firstReport(true) { }
|
| + : m_progress(progress), m_firstReport(true) { }
|
| virtual ControlOption ReportProgressValue(int done, int total) OVERRIDE
|
| {
|
| ControlOption result = m_progress->isCanceled() ? kAbort : kContinue;
|
| if (m_firstReport) {
|
| m_firstReport = false;
|
| m_progress->Start(total);
|
| - } else
|
| + } else {
|
| m_progress->Worked(done);
|
| + }
|
| if (done >= total)
|
| m_progress->Done();
|
| return result;
|
|
|