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

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

<dt>Date</dt> <dd>2015-03-23 13:34:52 -0700 (Mon, 23 Mar 2015)</dd>

</dl>

<h3>Log Message</h3>

<pre>Source/WebKit2:

Make platform/mac-wk2/plugins/destroy-during-async-npp-new.html work again.

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

rdar://problem/17255947

Reviewed by Alexey Proskuryakov.

Add plug-in destruction protectors around message receiver code that can call out to NPObjects or JavaScript

where we need the plug-in to stay around after the call.

* Shared/Plugins/NPObjectMessageReceiver.cpp:

(WebKit::NPObjectMessageReceiver::invoke):

(WebKit::NPObjectMessageReceiver::invokeDefault):

(WebKit::NPObjectMessageReceiver::getProperty):

(WebKit::NPObjectMessageReceiver::setProperty):

(WebKit::NPObjectMessageReceiver::construct):

LayoutTests:

Make platform/mac-wk2/plugins/destroy-during-async-npp-new.html work again

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

rdar://problem/17255947

Reviewed by Alexey Proskuryakov.

* platform/mac-wk2/TestExpectations:

Unskip test.</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>

<li><a href="#trunkLayoutTestsplatformmacwk2TestExpectations">trunk/LayoutTests/platform/mac-wk2/TestExpectations</a></li>

<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>

<li><a href="#trunkSourceWebKit2SharedPluginsNPObjectMessageReceivercpp">trunk/Source/WebKit2/Shared/Plugins/NPObjectMessageReceiver.cpp</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkLayoutTestsChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (181863 => 181864)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/ChangeLog        2015-03-23 20:31:56 UTC (rev 181863)

+++ trunk/LayoutTests/ChangeLog        2015-03-23 20:34:52 UTC (rev 181864)

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

</span><ins>+2015-03-23  Anders Carlsson  &lt;andersca@apple.com&gt;

+

+        Make platform/mac-wk2/plugins/destroy-during-async-npp-new.html work again

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

+        rdar://problem/17255947

+

+        Reviewed by Alexey Proskuryakov.

+

+        * platform/mac-wk2/TestExpectations:

+        Unskip test.

+

</ins><span class="cx"> 2015-03-23  Alexey Proskuryakov  &lt;ap@apple.com&gt;

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

</span><span class="cx">         accessibility/textarea-selected-text-range.html is flaky

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

<a id="trunkLayoutTestsplatformmacwk2TestExpectations"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (181863 => 181864)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/platform/mac-wk2/TestExpectations        2015-03-23 20:31:56 UTC (rev 181863)

+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations        2015-03-23 20:34:52 UTC (rev 181864)

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

<span class="cx"> # testRunner.setUseDeferredFrameLoading is not implemented.

</span><span class="cx"> webkit.org/b/93980 http/tests/appcache/load-from-appcache-defer-resume-crash.html [ Skip ]

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

</span><del>-webkit.org/b/133692 platform/mac-wk2/plugins/destroy-during-async-npp-new.html [ Skip ]

-

</del><span class="cx"> webkit.org/b/136554 platform/mac-wk2/tiled-drawing/scrolling/frames/frameset-nested-frame-scrollability.html [ Pass Failure ]

</span><span class="cx"> webkit.org/b/139901 platform/mac-wk2/tiled-drawing/scrolling/frames/frameset-frame-scrollability.html [ Pass Failure ]

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

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

<a id="trunkSourceWebKit2ChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (181863 => 181864)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/ChangeLog        2015-03-23 20:31:56 UTC (rev 181863)

+++ trunk/Source/WebKit2/ChangeLog        2015-03-23 20:34:52 UTC (rev 181864)

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

</span><span class="cx"> 2015-03-23  Anders Carlsson  &lt;andersca@apple.com&gt;

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

<ins>+        Make platform/mac-wk2/plugins/destroy-during-async-npp-new.html work again.

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

+        rdar://problem/17255947

+

+        Reviewed by Alexey Proskuryakov.

+

+        Add plug-in destruction protectors around message receiver code that can call out to NPObjects or JavaScript

+        where we need the plug-in to stay around after the call.

+

+        * Shared/Plugins/NPObjectMessageReceiver.cpp:

+        (WebKit::NPObjectMessageReceiver::invoke):

+        (WebKit::NPObjectMessageReceiver::invokeDefault):

+        (WebKit::NPObjectMessageReceiver::getProperty):

+        (WebKit::NPObjectMessageReceiver::setProperty):

+        (WebKit::NPObjectMessageReceiver::construct):

+

+2015-03-23  Anders Carlsson  &lt;andersca@apple.com&gt;

+

</ins><span class="cx">         Put the WK_NULLABLE_SPECIFIER in the right place for block parameters

</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=142975

</span><span class="cx">         rdar://problem/19863930

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

<a id="trunkSourceWebKit2SharedPluginsNPObjectMessageReceivercpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Plugins/NPObjectMessageReceiver.cpp (181863 => 181864)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/Shared/Plugins/NPObjectMessageReceiver.cpp        2015-03-23 20:31:56 UTC (rev 181863)

+++ trunk/Source/WebKit2/Shared/Plugins/NPObjectMessageReceiver.cpp        2015-03-23 20:34:52 UTC (rev 181864)

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

</span><span class="cx"> #include &quot;NPRemoteObjectMap.h&quot;

</span><span class="cx"> #include &quot;NPRuntimeUtilities.h&quot;

</span><span class="cx"> #include &quot;NPVariantData.h&quot;

</span><ins>+#include &quot;Plugin.h&quot;

+#include &quot;PluginController.h&quot;

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

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

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

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

</span><span class="cx">     NPVariant result;

</span><span class="cx">     VOID_TO_NPVARIANT(result);

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

</span><ins>+    PluginController::PluginDestructionProtector protector(m_plugin-&gt;controller());

+

</ins><span class="cx">     returnValue = m_npObject-&gt;_class-&gt;invoke(m_npObject, methodNameData.createNPIdentifier(), arguments.data(), arguments.size(), &amp;result);

</span><span class="cx">     if (returnValue) {

<span class="cx">         // Convert the NPVariant to an NPVariantData.

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

</span><span class="cx">     NPVariant result;

</span><span class="cx">     VOID_TO_NPVARIANT(result);

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

</span><ins>+    PluginController::PluginDestructionProtector protector(m_plugin-&gt;controller());

+

</ins><span class="cx">     returnValue = m_npObject-&gt;_class-&gt;invokeDefault(m_npObject, arguments.data(), arguments.size(), &amp;result);

</span><span class="cx">     if (returnValue) {

<span class="cx">         // Convert the NPVariant to an NPVariantData.

</span><span class="lines">@@ -142,14 +148,15 @@

</span><span class="cx">     NPVariant result;

</span><span class="cx">     VOID_TO_NPVARIANT(result);

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

</span><ins>+    PluginController::PluginDestructionProtector protector(m_plugin-&gt;controller());

+

</ins><span class="cx">     returnValue = m_npObject-&gt;_class-&gt;getProperty(m_npObject, propertyNameData.createNPIdentifier(), &amp;result);

</span><span class="cx">     if (!returnValue)

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

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

<del>-    // Convert the NPVariant to an NPVariantData.

</del><ins>+

</ins><span class="cx">     resultData = m_npRemoteObjectMap-&gt;npVariantToNPVariantData(result, m_plugin);

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

<del>-    // And release the result.

</del><span class="cx">     releaseNPVariantValue(&amp;result);

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

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

</span><span class="lines">@@ -162,10 +169,10 @@

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

</span><span class="cx">     NPVariant propertyValue = m_npRemoteObjectMap-&gt;npVariantDataToNPVariant(propertyValueData, m_plugin);

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

<del>-    // Set the property.

</del><ins>+    PluginController::PluginDestructionProtector protector(m_plugin-&gt;controller());

+

</ins><span class="cx">     returnValue = m_npObject-&gt;_class-&gt;setProperty(m_npObject, propertyNameData.createNPIdentifier(), &amp;propertyValue);

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

<del>-    // And release the value.

</del><span class="cx">     releaseNPVariantValue(&amp;propertyValue);

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

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

</span><span class="lines">@@ -213,17 +220,15 @@

</span><span class="cx">     NPVariant result;

</span><span class="cx">     VOID_TO_NPVARIANT(result);

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

</span><ins>+    PluginController::PluginDestructionProtector protector(m_plugin-&gt;controller());

+

</ins><span class="cx">     returnValue = m_npObject-&gt;_class-&gt;construct(m_npObject, arguments.data(), arguments.size(), &amp;result);

</span><del>-    if (returnValue) {

-        // Convert the NPVariant to an NPVariantData.

</del><ins>+    if (returnValue)

</ins><span class="cx">         resultData = m_npRemoteObjectMap-&gt;npVariantToNPVariantData(result, m_plugin);

</span><del>-    }

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

<del>-    // Release all arguments.

</del><span class="cx">     for (size_t i = 0; i &lt; argumentsData.size(); ++i)

</span><span class="cx">         releaseNPVariantValue(&amp;arguments[i]);

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

<del>-    // And release the result.

</del><span class="cx">     releaseNPVariantValue(&amp;result);

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

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

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

</div>

</div>

</body>

</html>