diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
| tree | e367e64a75991c554930278175d403c072de6bb8 /Source/JavaScriptCore/bytecode/SamplingTool.h | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
| download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz | |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/JavaScriptCore/bytecode/SamplingTool.h')
| -rw-r--r-- | Source/JavaScriptCore/bytecode/SamplingTool.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Source/JavaScriptCore/bytecode/SamplingTool.h b/Source/JavaScriptCore/bytecode/SamplingTool.h index 6c9df62ee..516968a33 100644 --- a/Source/JavaScriptCore/bytecode/SamplingTool.h +++ b/Source/JavaScriptCore/bytecode/SamplingTool.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008 Apple Inc. All rights reserved. + * Copyright (C) 2008, 2013 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,7 +30,6 @@ #define SamplingTool_h #include "Strong.h" -#include "Nodes.h" #include "Opcode.h" #include "SamplingCounter.h" #include <wtf/Assertions.h> @@ -186,8 +185,8 @@ namespace JSC { struct Instruction; struct ScriptSampleRecord { - ScriptSampleRecord(JSGlobalData& globalData, ScriptExecutable* executable) - : m_executable(globalData, executable) + ScriptSampleRecord(VM& vm, ScriptExecutable* executable) + : m_executable(vm, executable) , m_codeBlock(0) , m_sampleCount(0) , m_opcodeSampleCount(0) @@ -282,7 +281,7 @@ namespace JSC { JS_EXPORT_PRIVATE void setup(); void dump(ExecState*); - void notifyOfScope(JSGlobalData&, ScriptExecutable* scope); + void notifyOfScope(VM&, ScriptExecutable* scope); void sample(CodeBlock* codeBlock, Instruction* vPC) { |