<!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>[46197] 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/46197">46197</a></dd>
<dt>Author</dt> <dd>jianli@chromium.org</dd>
<dt>Date</dt> <dd>2009-07-21 15:44:41 -0700 (Tue, 21 Jul 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>2009-07-21  Jian Li  &lt;jianli@chromium.org&gt;

        Reviewed by David Levin.

        Add onerror to WorkerContext.
        https://bugs.webkit.org/show_bug.cgi?id=27516

        * bindings/js/JSWorkerContextCustom.cpp:
        (WebCore::JSWorkerContext::mark):
        * workers/WorkerContext.h:
        (WebCore::WorkerContext::setOnerror):
        (WebCore::WorkerContext::onerror):
        * workers/WorkerContext.idl:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorebindingsjsJSWorkerContextCustomcpp">trunk/WebCore/bindings/js/JSWorkerContextCustom.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 (46196 => 46197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-07-21 22:42:21 UTC (rev 46196)
+++ trunk/WebCore/ChangeLog        2009-07-21 22:44:41 UTC (rev 46197)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2009-07-21  Jian Li  &lt;jianli@chromium.org&gt;
+
+        Reviewed by David Levin.
+
+        Add onerror to WorkerContext.
+        https://bugs.webkit.org/show_bug.cgi?id=27516
+
+        * bindings/js/JSWorkerContextCustom.cpp:
+        (WebCore::JSWorkerContext::mark):
+        * workers/WorkerContext.h:
+        (WebCore::WorkerContext::setOnerror):
+        (WebCore::WorkerContext::onerror):
+        * workers/WorkerContext.idl:
+
</ins><span class="cx"> 2009-07-21  Yong Li  &lt;yong.li@torchmobile.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by George Staikos.
</span></span></pre></div>
<a id="trunkWebCorebindingsjsJSWorkerContextCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/js/JSWorkerContextCustom.cpp (46196 => 46197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/js/JSWorkerContextCustom.cpp        2009-07-21 22:42:21 UTC (rev 46196)
+++ trunk/WebCore/bindings/js/JSWorkerContextCustom.cpp        2009-07-21 22:44:41 UTC (rev 46197)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx">     markDOMObjectWrapper(globalData, impl()-&gt;optionalLocation());
</span><span class="cx">     markDOMObjectWrapper(globalData, impl()-&gt;optionalNavigator());
</span><span class="cx"> 
</span><ins>+    markIfNotNull(impl()-&gt;onerror());
</ins><span class="cx">     markIfNotNull(impl()-&gt;onmessage());
</span><span class="cx"> 
</span><span class="cx">     typedef WorkerContext::EventListenersMap EventListenersMap;
</span></span></pre></div>
<a id="trunkWebCoreworkersWorkerContexth"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/workers/WorkerContext.h (46196 => 46197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/workers/WorkerContext.h        2009-07-21 22:42:21 UTC (rev 46196)
+++ trunk/WebCore/workers/WorkerContext.h        2009-07-21 22:44:41 UTC (rev 46197)
</span><span class="lines">@@ -84,6 +84,8 @@
</span><span class="cx">         WorkerContext* self() { return this; }
</span><span class="cx">         WorkerLocation* location() const;
</span><span class="cx">         void close();
</span><ins>+        void setOnerror(PassRefPtr&lt;EventListener&gt; eventListener) { m_onErrorListener = eventListener; }
+        EventListener* onerror() const { return m_onErrorListener.get(); }
</ins><span class="cx"> 
</span><span class="cx">         // WorkerUtils
</span><span class="cx">         void importScripts(const Vector&lt;String&gt;&amp; urls, const String&amp; callerURL, int callerLine, ExceptionCode&amp;);
</span><span class="lines">@@ -140,6 +142,7 @@
</span><span class="cx">         OwnPtr&lt;WorkerScriptController&gt; m_script;
</span><span class="cx">         WorkerThread* m_thread;
</span><span class="cx"> 
</span><ins>+        RefPtr&lt;EventListener&gt; m_onErrorListener;
</ins><span class="cx">         RefPtr&lt;EventListener&gt; m_onmessageListener;
</span><span class="cx">         EventListenersMap m_eventListeners;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCoreworkersWorkerContextidl"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/workers/WorkerContext.idl (46196 => 46197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/workers/WorkerContext.idl        2009-07-21 22:42:21 UTC (rev 46196)
+++ trunk/WebCore/workers/WorkerContext.idl        2009-07-21 22:44:41 UTC (rev 46197)
</span><span class="lines">@@ -37,11 +37,11 @@
</span><span class="cx"> 
</span><span class="cx">         // WorkerGlobalScope
</span><span class="cx"> #if defined(LANGUAGE_JAVASCRIPT) &amp;&amp; LANGUAGE_JAVASCRIPT
</span><del>-                 attribute [Replaceable] WorkerContext self;
</del><ins>+        attribute [Replaceable] WorkerContext self;
</ins><span class="cx"> #endif
</span><del>-                 attribute [Replaceable] WorkerLocation location;
</del><ins>+        attribute [Replaceable] WorkerLocation location;
</ins><span class="cx">         void close();
</span><del>-        //         attribute EventListener onerror;
</del><ins>+        attribute EventListener onerror;
</ins><span class="cx"> 
</span><span class="cx">         // WorkerUtils
</span><span class="cx">         [Custom] void importScripts(/*[Variadic] in DOMString urls */);
</span></span></pre>
</div>
</div>

</body>
</html>