<!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>[203240] trunk/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/203240">203240</a></dd>

<dt>Author</dt> <dd>bfulgham@apple.com</dd>

<dt>Date</dt> <dd>2016-07-14 14:01:23 -0700 (Thu, 14 Jul 2016)</dd>

</dl>

<h3>Log Message</h3>

<pre>CSSStyleSheet members should clear their owner node when destroyed

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

Reviewed by Chris Dumez.

Make sure that CSSStyleSheet members are detached from their owner node when

the owning object is destroyed.

I audited other CSSStyleSheet uses, and found one other place where the owner node was not

being cleared during destruction. The Inspector also uses CSSStyleSheet, but seems to

handle the node ownership properly.

Fix based on a Blink change (patch by &lt;haraken@chromium.org&gt;):

&lt;https://chromium.googlesource.com/chromium/blink/+/c4949bfdeb2a613701afa1410bdae70531b8f6bf&gt;

Also includes a follow-up fix (patch by &lt;haraken@chromium.org&gt;):

&lt;https://chromium.googlesource.com/chromium/blink/+/9c3932dc80b33429db3a5873cb266b726c8a19bf&gt;

No test case. Was found by the Chromium team through review of their crash traces under minor DOM GC.

* contentextensions/ContentExtensionStyleSheet.cpp:

(WebCore::ContentExtensions::ContentExtensionStyleSheet::~ContentExtensionStyleSheet):

* contentextensions/ContentExtensionStyleSheet.h:

* dom/InlineStyleSheetOwner.cpp:

(WebCore::InlineStyleSheetOwner::~InlineStyleSheetOwner):

(WebCore::authorStyleSheetsForElement):</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>

<li><a href="#trunkSourceWebCorecontentextensionsContentExtensionStyleSheetcpp">trunk/Source/WebCore/contentextensions/ContentExtensionStyleSheet.cpp</a></li>

<li><a href="#trunkSourceWebCorecontentextensionsContentExtensionStyleSheeth">trunk/Source/WebCore/contentextensions/ContentExtensionStyleSheet.h</a></li>

<li><a href="#trunkSourceWebCoredomInlineStyleSheetOwnercpp">trunk/Source/WebCore/dom/InlineStyleSheetOwner.cpp</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceWebCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203239 => 203240)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-07-14 20:54:37 UTC (rev 203239)

+++ trunk/Source/WebCore/ChangeLog        2016-07-14 21:01:23 UTC (rev 203240)

</span><span class="lines">@@ -1,3 +1,32 @@

</span><ins>+2016-07-13  Brent Fulgham  &lt;bfulgham@apple.com&gt;

+

+        CSSStyleSheet members should clear their owner node when destroyed

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

+

+        Reviewed by Chris Dumez.

+

+        Make sure that CSSStyleSheet members are detached from their owner node when

+        the owning object is destroyed.

+

+        I audited other CSSStyleSheet uses, and found one other place where the owner node was not

+        being cleared during destruction. The Inspector also uses CSSStyleSheet, but seems to

+        handle the node ownership properly.

+

+        Fix based on a Blink change (patch by &lt;haraken@chromium.org&gt;):

+        &lt;https://chromium.googlesource.com/chromium/blink/+/c4949bfdeb2a613701afa1410bdae70531b8f6bf&gt;

+

+        Also includes a follow-up fix (patch by &lt;haraken@chromium.org&gt;):

+        &lt;https://chromium.googlesource.com/chromium/blink/+/9c3932dc80b33429db3a5873cb266b726c8a19bf&gt;

+

+        No test case. Was found by the Chromium team through review of their crash traces under minor DOM GC.

+

+        * contentextensions/ContentExtensionStyleSheet.cpp:

+        (WebCore::ContentExtensions::ContentExtensionStyleSheet::~ContentExtensionStyleSheet):

+        * contentextensions/ContentExtensionStyleSheet.h:

+        * dom/InlineStyleSheetOwner.cpp:

+        (WebCore::InlineStyleSheetOwner::~InlineStyleSheetOwner):

+        (WebCore::authorStyleSheetsForElement):

+

</ins><span class="cx"> 2016-07-14  Csaba Osztrogonác  &lt;ossy@webkit.org&gt;

</span><span class="cx"> 

</span><span class="cx">         Fix the !ENABLE(WEB_SOCKETS) build after r202930

</span></span></pre></div>

<a id="trunkSourceWebCorecontentextensionsContentExtensionStyleSheetcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionStyleSheet.cpp (203239 => 203240)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionStyleSheet.cpp        2016-07-14 20:54:37 UTC (rev 203239)

+++ trunk/Source/WebCore/contentextensions/ContentExtensionStyleSheet.cpp        2016-07-14 21:01:23 UTC (rev 203240)

</span><span class="lines">@@ -1,5 +1,5 @@

</span><span class="cx"> /*

</del><ins>+ * Copyright (C) 2015-2016 Apple Inc. All rights reserved.

</ins><span class="cx">  *

</span><span class="cx">  * Redistribution and use in source and binary forms, with or without

</span><span class="cx">  * modification, are permitted provided that the following conditions

</span><span class="lines">@@ -43,6 +43,11 @@

</span><span class="cx">     m_styleSheet-&gt;contents().setIsUserStyleSheet(true);

</span><span class="cx"> }

</span><span class="cx"> 

</span><ins>+ContentExtensionStyleSheet::~ContentExtensionStyleSheet()

+{

+    m_styleSheet-&gt;clearOwnerNode();

+}

+

</ins><span class="cx"> bool ContentExtensionStyleSheet::addDisplayNoneSelector(const String&amp; selector, uint32_t selectorID)

</span><span class="cx"> {

</span><span class="cx">     ASSERT(selectorID != std::numeric_limits&lt;uint32_t&gt;::max());

</span></span></pre></div>

<a id="trunkSourceWebCorecontentextensionsContentExtensionStyleSheeth"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionStyleSheet.h (203239 => 203240)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionStyleSheet.h        2016-07-14 20:54:37 UTC (rev 203239)

+++ trunk/Source/WebCore/contentextensions/ContentExtensionStyleSheet.h        2016-07-14 21:01:23 UTC (rev 203240)

</span><span class="lines">@@ -1,5 +1,5 @@

</span><span class="cx"> /*

</del><ins>+ * Copyright (C) 2015-2016 Apple Inc. All rights reserved.

</ins><span class="cx">  *

</span><span class="cx">  * Redistribution and use in source and binary forms, with or without

</span><span class="cx">  * modification, are permitted provided that the following conditions

</span><span class="lines">@@ -45,6 +45,7 @@

</span><span class="cx">     {

</span><span class="cx">         return adoptRef(*new ContentExtensionStyleSheet(document));

</span><span class="cx">     }

</span><ins>+    virtual ~ContentExtensionStyleSheet();

</ins><span class="cx"> 

</span><span class="cx">     bool addDisplayNoneSelector(const String&amp; selector, uint32_t selectorID);

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunkSourceWebCoredomInlineStyleSheetOwnercpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/InlineStyleSheetOwner.cpp (203239 => 203240)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/dom/InlineStyleSheetOwner.cpp        2016-07-14 20:54:37 UTC (rev 203239)

+++ trunk/Source/WebCore/dom/InlineStyleSheetOwner.cpp        2016-07-14 21:01:23 UTC (rev 203240)

</span><span class="lines">@@ -1,6 +1,6 @@

</span><span class="cx"> /*

</span><span class="cx">  * Copyright (C) 2006, 2007 Rob Buis

</span><del>- * Copyright (C) 2008, 2013 Apple, Inc. All rights reserved.

</del><ins>+ * Copyright (C) 2008-2016 Apple, Inc. All rights reserved.

</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 Library General Public

</span><span class="lines">@@ -46,6 +46,8 @@

</span><span class="cx"> 

</span><span class="cx"> InlineStyleSheetOwner::~InlineStyleSheetOwner()

</span><span class="cx"> {

</span><ins>+    if (m_sheet)

+        clearSheet();

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> static AuthorStyleSheets&amp; authorStyleSheetsForElement(Element&amp; element)

</span></span></pre>

</div>

</div>

</body>

</html>