<!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>[42510] 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/42510">42510</a></dd>
<dt>Author</dt> <dd>dimich@chromium.org</dd>
<dt>Date</dt> <dd>2009-04-14 11:55:13 -0700 (Tue, 14 Apr 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>2009-04-14  Antony Sargent  &lt;asargent@chromium.org&gt;

        Reviewed by Dimitri Glazkov.

        This is some cleanup motivated by the crash in http://crbug.com/9775 , which
        happens because of calling window.open inside a window.onload handler.

        These changes are just part of the fix, along with some asserts to help prevent
        breakage on future changes.

        https://bugs.webkit.org/show_bug.cgi?id=25132

        * bindings/v8/V8EventListenerList.cpp:
        (WebCore::V8EventListenerList::add):
        (WebCore::V8EventListenerList::remove):
        (WebCore::V8EventListenerList::clear):
        * bindings/v8/V8EventListenerList.h:
        (WebCore::V8EventListenerList::size):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorebindingsv8V8EventListenerListcpp">trunk/WebCore/bindings/v8/V8EventListenerList.cpp</a></li>
<li><a href="#trunkWebCorebindingsv8V8EventListenerListh">trunk/WebCore/bindings/v8/V8EventListenerList.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (42509 => 42510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-04-14 18:55:07 UTC (rev 42509)
+++ trunk/WebCore/ChangeLog        2009-04-14 18:55:13 UTC (rev 42510)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2009-04-14  Antony Sargent  &lt;asargent@chromium.org&gt;
+
+        Reviewed by Dimitri Glazkov.
+
+        This is some cleanup motivated by the crash in http://crbug.com/9775 , which 
+        happens because of calling window.open inside a window.onload handler. 
+
+        These changes are just part of the fix, along with some asserts to help prevent
+        breakage on future changes. 
+
+        https://bugs.webkit.org/show_bug.cgi?id=25132
+
+        * bindings/v8/V8EventListenerList.cpp:
+        (WebCore::V8EventListenerList::add):
+        (WebCore::V8EventListenerList::remove):
+        (WebCore::V8EventListenerList::clear):
+        * bindings/v8/V8EventListenerList.h:
+        (WebCore::V8EventListenerList::size):
+
</ins><span class="cx"> 2009-04-14  Evan Martin  &lt;evan@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Darin Adler.
</span></span></pre></div>
<a id="trunkWebCorebindingsv8V8EventListenerListcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/v8/V8EventListenerList.cpp (42509 => 42510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/v8/V8EventListenerList.cpp        2009-04-14 18:55:07 UTC (rev 42509)
+++ trunk/WebCore/bindings/v8/V8EventListenerList.cpp        2009-04-14 18:55:13 UTC (rev 42510)
</span><span class="lines">@@ -74,6 +74,7 @@
</span><span class="cx"> // See comment in .h file for this function, and update accordingly if implementation details change here.
</span><span class="cx"> void V8EventListenerList::add(V8EventListener* listener)
</span><span class="cx"> {
</span><ins>+    ASSERT(v8::Context::InContext());
</ins><span class="cx">     m_list.append(listener);
</span><span class="cx"> 
</span><span class="cx">     v8::HandleScope handleScope;
</span><span class="lines">@@ -84,12 +85,19 @@
</span><span class="cx"> 
</span><span class="cx"> void V8EventListenerList::remove(V8EventListener* listener)
</span><span class="cx"> {
</span><ins>+    ASSERT(v8::Context::InContext());
</ins><span class="cx">     v8::HandleScope handleScope;
</span><ins>+    v8::Handle&lt;v8::String&gt; key = getKey(listener-&gt;isInline());
</ins><span class="cx">     for (size_t i = 0; i &lt; m_list.size(); i++) {
</span><span class="cx">         V8EventListener* element = m_list.at(i);
</span><span class="cx">         if (element-&gt;isInline() == listener-&gt;isInline() &amp;&amp; element == listener) {
</span><span class="cx">             v8::Local&lt;v8::Object&gt; object = listener-&gt;getListenerObject();
</span><del>-            object-&gt;DeleteHiddenValue(getKey(listener-&gt;isInline()));
</del><ins>+
+            // FIXME(asargent) this check for hidden value being !empty is a workaround for
+            // http://code.google.com/p/v8/issues/detail?id=300
+            // Once the fix for that is pulled into chromium we can remove the check here.
+            if (!object-&gt;GetHiddenValue(key).IsEmpty())
+              object-&gt;DeleteHiddenValue(getKey(listener-&gt;isInline()));
</ins><span class="cx">             m_list.remove(i);
</span><span class="cx">             break;
</span><span class="cx">         }
</span><span class="lines">@@ -98,6 +106,7 @@
</span><span class="cx"> 
</span><span class="cx"> void V8EventListenerList::clear()
</span><span class="cx"> {
</span><ins>+    ASSERT(v8::Context::InContext());
</ins><span class="cx">     v8::HandleScope handleScope;
</span><span class="cx">     for (size_t i = 0; i &lt; m_list.size(); i++) {
</span><span class="cx">         V8EventListener* element = m_list.at(i);
</span></span></pre></div>
<a id="trunkWebCorebindingsv8V8EventListenerListh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/v8/V8EventListenerList.h (42509 => 42510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/v8/V8EventListenerList.h        2009-04-14 18:55:07 UTC (rev 42509)
+++ trunk/WebCore/bindings/v8/V8EventListenerList.h        2009-04-14 18:55:13 UTC (rev 42510)
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx">         void remove(V8EventListener*);
</span><span class="cx">         V8EventListener* find(v8::Local&lt;v8::Object&gt;, bool isInline);
</span><span class="cx">         void clear();
</span><ins>+        size_t size() { return m_list.size(); }
</ins><span class="cx"> 
</span><span class="cx">     private:
</span><span class="cx">         v8::Handle&lt;v8::String&gt; getKey(bool isInline);
</span></span></pre>
</div>
</div>

</body>
</html>