From 4d6084feccab99c0a7b3ecef26bb49c41dd50201 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 18 Jul 2012 13:59:13 +0200 Subject: Imported WebKit commit ff52235a78888e5cb8e286a828a8698042200e67 (http://svn.webkit.org/repository/webkit/trunk@122948) New snapshot that should fix the rendering issues recently introduced --- Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h') diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h b/Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h index a1b3a8338..c6db26597 100644 --- a/Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h +++ b/Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h @@ -126,6 +126,13 @@ public: ASSERT_VALID_CODE_POINTER(m_value); } + template + FunctionPtr(returnType(*value)(argType1, argType2, argType3, argType4, argType5)) + : m_value((void*)value) + { + ASSERT_VALID_CODE_POINTER(m_value); + } + // MSVC doesn't seem to treat functions with different calling conventions as // different types; these methods already defined for fastcall, below. #if CALLING_CONVENTION_IS_STDCALL && !OS(WINDOWS) -- cgit v1.2.1