<!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>[184165] releases/WebKitGTK/webkit-2.8/Source/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/184165">184165</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-12 00:58:48 -0700 (Tue, 12 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/183729">r183729</a> - [GTK] API tests crashing on debug builds due to extra unref
https://bugs.webkit.org/show_bug.cgi?id=144508
Reviewed by Mario Sanchez Prada.
The problem is that we were assuming that when a new DOMWindow is
created, the DOM object cache was notified about the previous
DOMWindow being destroyed before objects for the new DOMWindow are
added to the cache. However, that's not always the case and we
only create a DOMWindowObserver for the first DOMWindow. We need
to keep a pointer to the DOMWindow being observed to clear() the
cache and create a new DOMWindowObserver when it changes in the
Frame.
Fixes crashes in several unit tests in debug builds.
* bindings/gobject/DOMObjectCache.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorebindingsgobjectDOMObjectCachecpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/bindings/gobject/DOMObjectCache.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (184164 => 184165)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-05-12 07:57:04 UTC (rev 184164)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-05-12 07:58:48 UTC (rev 184165)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-05-03 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] API tests crashing on debug builds due to extra unref
+ https://bugs.webkit.org/show_bug.cgi?id=144508
+
+ Reviewed by Mario Sanchez Prada.
+
+ The problem is that we were assuming that when a new DOMWindow is
+ created, the DOM object cache was notified about the previous
+ DOMWindow being destroyed before objects for the new DOMWindow are
+ added to the cache. However, that's not always the case and we
+ only create a DOMWindowObserver for the first DOMWindow. We need
+ to keep a pointer to the DOMWindow being observed to clear() the
+ cache and create a new DOMWindowObserver when it changes in the
+ Frame.
+
+ Fixes crashes in several unit tests in debug builds.
+
+ * bindings/gobject/DOMObjectCache.cpp:
+
</ins><span class="cx"> 2015-05-01 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Reproducible crash removing name attribute from <img> node
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorebindingsgobjectDOMObjectCachecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/bindings/gobject/DOMObjectCache.cpp (184164 => 184165)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/bindings/gobject/DOMObjectCache.cpp 2015-05-12 07:57:04 UTC (rev 184164)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/bindings/gobject/DOMObjectCache.cpp 2015-05-12 07:58:48 UTC (rev 184165)
</span><span class="lines">@@ -100,8 +100,12 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_objects.contains(&data));
</span><span class="cx">
</span><del>- if (!m_domWindowObserver && m_frame->document()->domWindow())
- m_domWindowObserver = std::make_unique<DOMWindowObserver>(*m_frame, *this);
</del><ins>+ WebCore::DOMWindow* domWindow = m_frame->document()->domWindow();
+ if (domWindow && (!m_domWindowObserver || m_domWindowObserver->domWindow() != domWindow)) {
+ // New DOMWindow, clear the cache and create a new DOMWindowObserver.
+ clear();
+ m_domWindowObserver = std::make_unique<DOMWindowObserver>(*m_frame, *this, domWindow);
+ }
</ins><span class="cx">
</span><span class="cx"> m_objects.append(&data);
</span><span class="cx"> g_object_weak_ref(data.object, DOMObjectCacheFrameObserver::objectFinalizedCallback, this);
</span><span class="lines">@@ -111,16 +115,20 @@
</span><span class="cx"> class DOMWindowObserver final: public WebCore::DOMWindowProperty {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- DOMWindowObserver(WebCore::Frame& frame, DOMObjectCacheFrameObserver& frameObserver)
</del><ins>+ DOMWindowObserver(WebCore::Frame& frame, DOMObjectCacheFrameObserver& frameObserver, WebCore::DOMWindow* window)
</ins><span class="cx"> : DOMWindowProperty(&frame)
</span><span class="cx"> , m_frameObserver(frameObserver)
</span><ins>+ , m_domWindow(window)
</ins><span class="cx"> {
</span><ins>+ ASSERT(m_domWindow);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual ~DOMWindowObserver()
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ WebCore::DOMWindow* domWindow() const { return m_domWindow; }
+
</ins><span class="cx"> private:
</span><span class="cx"> virtual void willDetachGlobalObjectFromFrame() override
</span><span class="cx"> {
</span><span class="lines">@@ -130,6 +138,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DOMObjectCacheFrameObserver& m_frameObserver;
</span><ins>+ WebCore::DOMWindow* m_domWindow;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static void objectFinalizedCallback(gpointer userData, GObject* finalizedObject)
</span></span></pre>
</div>
</div>
</body>
</html>