Make ForInNode check for the timeout interrupt

Reviewed by Anders

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@30726 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index b4663b7..39057f0 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2008-03-03  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Anders.
+
+        Make ForInNode check for the timeout interrupt
+
+        * kjs/nodes.cpp:
+        (KJS::ForInNode::execute):
+
 2008-03-02  Brent Fulgham  <bfulgham@gmail.com>
 
         Reviewed by Alp Toker.

diff --git a/JavaScriptCore/kjs/nodes.cpp b/JavaScriptCore/kjs/nodes.cpp
index b149d59..4607edc 100644 (file)
--- a/JavaScriptCore/kjs/nodes.cpp
+++ b/JavaScriptCore/kjs/nodes.cpp
@@ -4028,6 +4028,9 @@ JSValue* ForInNode::execute(ExecState* exec)
         exec->popIteration();
         if (statementValue)
             value = statementValue;
+        
+        if (exec->dynamicGlobalObject()->timedOut())
+            return exec->setInterruptedCompletion();
 
         if (exec->completionType() != Normal) {
             if (exec->completionType() == Continue && m_labelStack.contains(exec->breakOrContinueTarget()))