From d441d6f39bb846989d95bcf5caf387b42414718d Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 13 Sep 2013 12:51:20 +0200 Subject: Import Qt5x2 branch of QtWebkit for Qt 5.2 Importing a new snapshot of webkit. Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c Reviewed-by: Allan Sandfeld Jensen --- Source/JavaScriptCore/assembler/LinkBuffer.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Source/JavaScriptCore/assembler/LinkBuffer.h') diff --git a/Source/JavaScriptCore/assembler/LinkBuffer.h b/Source/JavaScriptCore/assembler/LinkBuffer.h index e1882433c..52630fe50 100644 --- a/Source/JavaScriptCore/assembler/LinkBuffer.h +++ b/Source/JavaScriptCore/assembler/LinkBuffer.h @@ -41,7 +41,7 @@ namespace JSC { -class JSGlobalData; +class VM; // LinkBuffer: // @@ -76,14 +76,14 @@ class LinkBuffer { #endif public: - LinkBuffer(JSGlobalData& globalData, MacroAssembler* masm, void* ownerUID, JITCompilationEffort effort = JITCompilationMustSucceed) + LinkBuffer(VM& vm, MacroAssembler* masm, void* ownerUID, JITCompilationEffort effort = JITCompilationMustSucceed) : m_size(0) #if ENABLE(BRANCH_COMPACTION) , m_initialSize(0) #endif , m_code(0) , m_assembler(masm) - , m_globalData(&globalData) + , m_vm(&vm) #ifndef NDEBUG , m_completed(false) , m_effort(effort) @@ -256,7 +256,7 @@ private: #endif void* m_code; MacroAssembler* m_assembler; - JSGlobalData* m_globalData; + VM* m_vm; #ifndef NDEBUG bool m_completed; JITCompilationEffort m_effort; -- cgit v1.2.1