From b1e9e47fa11f608ae16bc07f97a2acf95bf80272 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Fri, 1 Jun 2012 10:36:58 +0200
Subject: Imported WebKit commit 499c84c99aa98e9870fa7eaa57db476c6d160d46
 (http://svn.webkit.org/repository/webkit/trunk@119200)

Weekly update :). Particularly relevant changes for Qt are the use of the WebCore image decoders and direct usage
of libpng/libjpeg if available in the system.
---
 Source/JavaScriptCore/bytecode/CodeBlock.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'Source/JavaScriptCore/bytecode/CodeBlock.h')

diff --git a/Source/JavaScriptCore/bytecode/CodeBlock.h b/Source/JavaScriptCore/bytecode/CodeBlock.h
index ccaca3373..cdc6a19e8 100644
--- a/Source/JavaScriptCore/bytecode/CodeBlock.h
+++ b/Source/JavaScriptCore/bytecode/CodeBlock.h
@@ -462,11 +462,16 @@ namespace JSC {
             return needsFullScopeChain() && codeType() != GlobalCode;
         }
         
-        bool argumentIsCaptured(int) const
+        bool argumentsAreCaptured() const
         {
             return needsActivation() || usesArguments();
         }
         
+        bool argumentIsCaptured(int) const
+        {
+            return argumentsAreCaptured();
+        }
+        
         bool localIsCaptured(InlineCallFrame* inlineCallFrame, int operand) const
         {
             if (!inlineCallFrame)
-- 
cgit v1.2.1