<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[42958] trunk/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/42958">42958</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2009-04-28 13:30:52 -0700 (Tue, 28 Apr 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>2009-04-28  Sam Weinig  &lt;sam@webkit.org&gt;

        Reviewed by Beth Dakin.

        Consolidate ScheduleAction creation into ScheduledAction::create.
        Autogenerate JSWorkerContext.clearTimeout and clearInterval.

        * bindings/js/JSDOMWindowCustom.cpp:
        (WebCore::JSDOMWindow::setTimeout):
        (WebCore::JSDOMWindow::setInterval):
        * bindings/js/JSWorkerContextCustom.cpp:
        (WebCore::JSWorkerContext::setTimeout):
        (WebCore::JSWorkerContext::setInterval):
        * bindings/js/ScheduledAction.cpp:
        (WebCore::ScheduledAction::create):
        (WebCore::ScheduledAction::ScheduledAction):
        (WebCore::ScheduledAction::execute):
        * bindings/js/ScheduledAction.h:
        * workers/WorkerContext.cpp:
        (WebCore::DOMWindow::setTimeout):
        (WebCore::DOMWindow::clearTimeout):
        (WebCore::DOMWindow::setInterval):
        (WebCore::DOMWindow::clearInterval):
        * workers/WorkerContext.h:
        * workers/WorkerContext.idl:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorebindingsjsJSDOMWindowCustomcpp">trunk/WebCore/bindings/js/JSDOMWindowCustom.cpp</a></li>
<li><a href="#trunkWebCorebindingsjsJSWorkerContextCustomcpp">trunk/WebCore/bindings/js/JSWorkerContextCustom.cpp</a></li>
<li><a href="#trunkWebCorebindingsjsScheduledActioncpp">trunk/WebCore/bindings/js/ScheduledAction.cpp</a></li>
<li><a href="#trunkWebCorebindingsjsScheduledActionh">trunk/WebCore/bindings/js/ScheduledAction.h</a></li>
<li><a href="#trunkWebCoreworkersWorkerContextcpp">trunk/WebCore/workers/WorkerContext.cpp</a></li>
<li><a href="#trunkWebCoreworkersWorkerContexth">trunk/WebCore/workers/WorkerContext.h</a></li>
<li><a href="#trunkWebCoreworkersWorkerContextidl">trunk/WebCore/workers/WorkerContext.idl</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (42957 => 42958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-04-28 20:22:03 UTC (rev 42957)
+++ trunk/WebCore/ChangeLog        2009-04-28 20:30:52 UTC (rev 42958)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2009-04-28  Sam Weinig  &lt;sam@webkit.org&gt;
+
+        Reviewed by Beth Dakin.
+
+        Consolidate ScheduleAction creation into ScheduledAction::create.
+        Autogenerate JSWorkerContext.clearTimeout and clearInterval.
+
+        * bindings/js/JSDOMWindowCustom.cpp:
+        (WebCore::JSDOMWindow::setTimeout):
+        (WebCore::JSDOMWindow::setInterval):
+        * bindings/js/JSWorkerContextCustom.cpp:
+        (WebCore::JSWorkerContext::setTimeout):
+        (WebCore::JSWorkerContext::setInterval):
+        * bindings/js/ScheduledAction.cpp:
+        (WebCore::ScheduledAction::create):
+        (WebCore::ScheduledAction::ScheduledAction):
+        (WebCore::ScheduledAction::execute):
+        * bindings/js/ScheduledAction.h:
+        * workers/WorkerContext.cpp:
+        (WebCore::DOMWindow::setTimeout):
+        (WebCore::DOMWindow::clearTimeout):
+        (WebCore::DOMWindow::setInterval):
+        (WebCore::DOMWindow::clearInterval):
+        * workers/WorkerContext.h:
+        * workers/WorkerContext.idl:
+
</ins><span class="cx"> 2009-04-28  Brady Eidson  &lt;beidson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Darin Adler
</span></span></pre></div>
<a id="trunkWebCorebindingsjsJSDOMWindowCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/js/JSDOMWindowCustom.cpp (42957 => 42958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/js/JSDOMWindowCustom.cpp        2009-04-28 20:22:03 UTC (rev 42957)
+++ trunk/WebCore/bindings/js/JSDOMWindowCustom.cpp        2009-04-28 20:30:52 UTC (rev 42958)
</span><span class="lines">@@ -495,22 +495,9 @@
</span><span class="cx">     return jsUndefined();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static ScheduledAction* createScheduledAction(ExecState* exec, const ArgList&amp; args)
-{
-    JSValuePtr v = args.at(exec, 0);
-    if (v.isString())
-        return new ScheduledAction(asString(v)-&gt;value());
-    CallData callData;
-    if (v.getCallData(callData) == CallTypeNone)
-        return 0;
-    ArgList argsTail;
-    args.getSlice(2, argsTail);
-    return new ScheduledAction(exec, v, argsTail);
-}
-
</del><span class="cx"> JSValuePtr JSDOMWindow::setTimeout(ExecState* exec, const ArgList&amp; args)
</span><span class="cx"> {
</span><del>-    ScheduledAction* action = createScheduledAction(exec, args);
</del><ins>+    ScheduledAction* action = ScheduledAction::create(exec, args);
</ins><span class="cx">     if (!action)
</span><span class="cx">         return jsUndefined();
</span><span class="cx">     int delay = args.at(exec, 1).toInt32(exec);
</span><span class="lines">@@ -519,7 +506,7 @@
</span><span class="cx"> 
</span><span class="cx"> JSValuePtr JSDOMWindow::setInterval(ExecState* exec, const ArgList&amp; args)
</span><span class="cx"> {
</span><del>-    ScheduledAction* action = createScheduledAction(exec, args);
</del><ins>+    ScheduledAction* action = ScheduledAction::create(exec, args);
</ins><span class="cx">     if (!action)
</span><span class="cx">         return jsUndefined();
</span><span class="cx">     int delay = args.at(exec, 1).toInt32(exec);
</span></span></pre></div>
<a id="trunkWebCorebindingsjsJSWorkerContextCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/js/JSWorkerContextCustom.cpp (42957 => 42958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/js/JSWorkerContextCustom.cpp        2009-04-28 20:22:03 UTC (rev 42957)
+++ trunk/WebCore/bindings/js/JSWorkerContextCustom.cpp        2009-04-28 20:30:52 UTC (rev 42958)
</span><span class="lines">@@ -121,42 +121,24 @@
</span><span class="cx">     return jsUndefined();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static JSValuePtr setTimeoutOrInterval(ExecState* exec, WorkerContext* workerContext, const ArgList&amp; args, bool singleShot)
</del><ins>+JSValuePtr JSWorkerContext::setTimeout(ExecState* exec, const ArgList&amp; args)
</ins><span class="cx"> {
</span><del>-    JSValuePtr v = args.at(exec, 0);
-    int delay = args.at(exec, 1).toInt32(exec);
-    if (v.isString())
-        return jsNumber(exec, workerContext-&gt;installTimeout(new ScheduledAction(asString(v)-&gt;value()), delay, singleShot));
-    CallData callData;
-    if (v.getCallData(callData) == CallTypeNone)
</del><ins>+    ScheduledAction* action = ScheduledAction::create(exec, args);
+    if (!action)
</ins><span class="cx">         return jsUndefined();
</span><del>-    ArgList argsTail;
-    args.getSlice(2, argsTail);
-    return jsNumber(exec, workerContext-&gt;installTimeout(new ScheduledAction(exec, v, argsTail), delay, singleShot));
</del><ins>+    int delay = args.at(exec, 1).toInt32(exec);
+    return jsNumber(exec, impl()-&gt;setTimeout(action, delay));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValuePtr JSWorkerContext::setTimeout(ExecState* exec, const ArgList&amp; args)
-{
-    return setTimeoutOrInterval(exec, impl(), args, true);
-}
-
-JSValuePtr JSWorkerContext::clearTimeout(ExecState* exec, const ArgList&amp; args)
-{
-    impl()-&gt;removeTimeout(args.at(exec, 0).toInt32(exec));
-    return jsUndefined();
-}
-
</del><span class="cx"> JSValuePtr JSWorkerContext::setInterval(ExecState* exec, const ArgList&amp; args)
</span><span class="cx"> {
</span><del>-    return setTimeoutOrInterval(exec, impl(), args, false);
</del><ins>+    ScheduledAction* action = ScheduledAction::create(exec, args);
+    if (!action)
+        return jsUndefined();
+    int delay = args.at(exec, 1).toInt32(exec);
+    return jsNumber(exec, impl()-&gt;setInterval(action, delay));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValuePtr JSWorkerContext::clearInterval(ExecState* exec, const ArgList&amp; args)
-{
-    impl()-&gt;removeTimeout(args.at(exec, 0).toInt32(exec));
-    return jsUndefined();
-}
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx"> 
</span><span class="cx"> #endif // ENABLE(WORKERS)
</span></span></pre></div>
<a id="trunkWebCorebindingsjsScheduledActioncpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/js/ScheduledAction.cpp (42957 => 42958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/js/ScheduledAction.cpp        2009-04-28 20:22:03 UTC (rev 42957)
+++ trunk/WebCore/bindings/js/ScheduledAction.cpp        2009-04-28 20:30:52 UTC (rev 42958)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> /*
</span><span class="cx">  *  Copyright (C) 2000 Harri Porten (porten@kde.org)
</span><span class="cx">  *  Copyright (C) 2006 Jon Shier (jshier@iastate.edu)
</span><del>- *  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reseved.
</del><ins>+ *  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reseved.
</ins><span class="cx">  *  Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
</span><span class="cx">  *  Copyright (C) 2009 Google Inc. All rights reseved.
</span><span class="cx">  *
</span><span class="lines">@@ -47,13 +47,25 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><ins>+ScheduledAction* ScheduledAction::create(ExecState* exec, const ArgList&amp; args)
+{
+    JSValuePtr v = args.at(exec, 0);
+    if (v.isString())
+        return new ScheduledAction(asString(v)-&gt;value());
+    CallData callData;
+    if (v.getCallData(callData) == CallTypeNone)
+        return 0;
+    ArgList argsTail;
+    args.getSlice(2, argsTail);
+    return new ScheduledAction(exec, v, argsTail);
+}
+
</ins><span class="cx"> ScheduledAction::ScheduledAction(ExecState* exec, JSValuePtr function, const ArgList&amp; args)
</span><span class="cx">     : m_function(function)
</span><span class="cx"> {
</span><span class="cx">     ArgList::const_iterator end = args.end();
</span><del>-    for (ArgList::const_iterator it = args.begin(); it != end; ++it) {
</del><ins>+    for (ArgList::const_iterator it = args.begin(); it != end; ++it)
</ins><span class="cx">         m_args.append((*it).jsValue(exec));
</span><del>-    }
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void ScheduledAction::execute(ScriptExecutionContext* context)
</span><span class="lines">@@ -95,24 +107,6 @@
</span><span class="cx">         reportCurrentException(exec);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if ENABLE(WORKERS)
-void ScheduledAction::execute(WorkerContext* workerContext)
-{
-    // In a Worker, the execution should always happen on a worker thread.
-    ASSERT(workerContext-&gt;thread()-&gt;threadID() == currentThread());
-
-    WorkerScriptController* scriptController = workerContext-&gt;script();
-
-    if (m_function) {
-        JSWorkerContext* contextWrapper = scriptController-&gt;workerContextWrapper();
-        executeFunctionInContext(contextWrapper, contextWrapper);
-    } else {
-        ScriptSourceCode code(m_code, workerContext-&gt;url());
-        scriptController-&gt;evaluate(code);
-    }
-}
-#endif // ENABLE(WORKERS)
-
</del><span class="cx"> void ScheduledAction::execute(Document* document)
</span><span class="cx"> {
</span><span class="cx">     JSDOMWindow* window = toJSDOMWindow(document-&gt;frame());
</span><span class="lines">@@ -134,4 +128,22 @@
</span><span class="cx">     frame-&gt;script()-&gt;setProcessingTimerCallback(false);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+#if ENABLE(WORKERS)
+void ScheduledAction::execute(WorkerContext* workerContext)
+{
+    // In a Worker, the execution should always happen on a worker thread.
+    ASSERT(workerContext-&gt;thread()-&gt;threadID() == currentThread());
+
+    WorkerScriptController* scriptController = workerContext-&gt;script();
+
+    if (m_function) {
+        JSWorkerContext* contextWrapper = scriptController-&gt;workerContextWrapper();
+        executeFunctionInContext(contextWrapper, contextWrapper);
+    } else {
+        ScriptSourceCode code(m_code, workerContext-&gt;url());
+        scriptController-&gt;evaluate(code);
+    }
+}
+#endif // ENABLE(WORKERS)
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkWebCorebindingsjsScheduledActionh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/js/ScheduledAction.h (42957 => 42958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/js/ScheduledAction.h        2009-04-28 20:22:03 UTC (rev 42957)
+++ trunk/WebCore/bindings/js/ScheduledAction.h        2009-04-28 20:30:52 UTC (rev 42958)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx">  *  Copyright (C) 2000 Harri Porten (porten@kde.org)
</span><del>- *  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reseved.
</del><ins>+ *  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reseved.
</ins><span class="cx">  *
</span><span class="cx">  *  This library is free software; you can redistribute it and/or
</span><span class="cx">  *  modify it under the terms of the GNU Lesser General Public
</span><span class="lines">@@ -40,15 +40,17 @@
</span><span class="cx">     */
</span><span class="cx">     class ScheduledAction {
</span><span class="cx">     public:
</span><ins>+        static ScheduledAction* create(JSC::ExecState*, const JSC::ArgList&amp;);
+
+        void execute(ScriptExecutionContext*);
+
+    private:
</ins><span class="cx">         ScheduledAction(JSC::ExecState* exec, JSC::JSValuePtr function, const JSC::ArgList&amp;);
</span><span class="cx">         ScheduledAction(const String&amp; code)
</span><span class="cx">             : m_code(code)
</span><span class="cx">         {
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        void execute(ScriptExecutionContext*);
-
-    private:
</del><span class="cx">         void executeFunctionInContext(JSC::JSGlobalObject*, JSC::JSValuePtr thisValue);
</span><span class="cx">         void execute(Document*);
</span><span class="cx"> #if ENABLE(WORKERS)        
</span></span></pre></div>
<a id="trunkWebCoreworkersWorkerContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/workers/WorkerContext.cpp (42957 => 42958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/workers/WorkerContext.cpp        2009-04-28 20:22:03 UTC (rev 42957)
+++ trunk/WebCore/workers/WorkerContext.cpp        2009-04-28 20:30:52 UTC (rev 42958)
</span><span class="lines">@@ -201,16 +201,26 @@
</span><span class="cx">     thread()-&gt;runLoop().postTask(task);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-int WorkerContext::installTimeout(ScheduledAction* action, int timeout, bool singleShot)
</del><ins>+int WorkerContext::setTimeout(ScheduledAction* action, int timeout)
</ins><span class="cx"> {
</span><del>-    return DOMTimer::install(scriptExecutionContext(), action, timeout, singleShot);
</del><ins>+    return DOMTimer::install(scriptExecutionContext(), action, timeout, true);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WorkerContext::removeTimeout(int timeoutId)
</del><ins>+void WorkerContext::clearTimeout(int timeoutId)
</ins><span class="cx"> {
</span><span class="cx">     DOMTimer::removeById(scriptExecutionContext(), timeoutId);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+int WorkerContext::setInterval(ScheduledAction* action, int timeout)
+{
+    return DOMTimer::install(scriptExecutionContext(), action, timeout, false);
+}
+
+void WorkerContext::clearInterval(int timeoutId)
+{
+    DOMTimer::removeById(scriptExecutionContext(), timeoutId);
+}
+
</ins><span class="cx"> void WorkerContext::dispatchMessage(const String&amp; message)
</span><span class="cx"> {
</span><span class="cx">     RefPtr&lt;Event&gt; evt = MessageEvent::create(message, &quot;&quot;, &quot;&quot;, 0, 0);
</span></span></pre></div>
<a id="trunkWebCoreworkersWorkerContexth"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/workers/WorkerContext.h (42957 => 42958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/workers/WorkerContext.h        2009-04-28 20:22:03 UTC (rev 42957)
+++ trunk/WebCore/workers/WorkerContext.h        2009-04-28 20:30:52 UTC (rev 42958)
</span><span class="lines">@@ -83,8 +83,11 @@
</span><span class="cx">         void postMessage(const String&amp; message);
</span><span class="cx">         virtual void postTask(PassRefPtr&lt;Task&gt;); // Executes the task on context's thread asynchronously.
</span><span class="cx"> 
</span><del>-        int installTimeout(ScheduledAction*, int timeout, bool singleShot);
-        void removeTimeout(int timeoutId);
</del><ins>+        // Timers
+        int setTimeout(ScheduledAction*, int timeout);
+        void clearTimeout(int timeoutId);
+        int setInterval(ScheduledAction*, int timeout);
+        void clearInterval(int timeoutId);
</ins><span class="cx"> 
</span><span class="cx">         void dispatchMessage(const String&amp;);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCoreworkersWorkerContextidl"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/workers/WorkerContext.idl (42957 => 42958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/workers/WorkerContext.idl        2009-04-28 20:22:03 UTC (rev 42957)
+++ trunk/WebCore/workers/WorkerContext.idl        2009-04-28 20:30:52 UTC (rev 42958)
</span><span class="lines">@@ -53,11 +53,11 @@
</span><span class="cx">         // Timers
</span><span class="cx">         [Custom] long setTimeout(in TimeoutHandler handler, in long timeout);
</span><span class="cx">         // [Custom] long setTimeout(in DOMString code, in long timeout);
</span><del>-        [Custom] void clearTimeout(in long handle);
</del><ins>+        void clearTimeout(in long handle);
</ins><span class="cx"> 
</span><span class="cx">         [Custom] long setInterval(in TimeoutHandler handler, in long timeout);
</span><span class="cx">         // [Custom] long setInterval(in DOMString code, in long timeout);
</span><del>-        [Custom] void clearInterval(in long handle);
</del><ins>+        void clearInterval(in long handle);
</ins><span class="cx"> 
</span><span class="cx">         // EventTarget interface
</span><span class="cx">         [Custom] void addEventListener(in DOMString type, 
</span></span></pre>
</div>
</div>

</body>
</html>