<!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>[56583] trunk/WebKitTools</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/56583">56583</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2010-03-25 17:46:55 -0700 (Thu, 25 Mar 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>2010-03-25  Simon Fraser  &lt;simon.fraser@apple.com&gt;

        Reviewed by Darin Adler, Alexey Proskuryakov.

        https://bugs.webkit.org/show_bug.cgi?id=36631
        Allow the test plugin to run scripts in response to NPP_SetWindow calls

        Hook up the ability for the TestNetscapePlugIn to run JavaScript in
        response to NPP_SetWindow.

        * DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.cpp:
        (pluginAllocate):
        * DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.h:
        * DumpRenderTree/TestNetscapePlugIn.subproj/main.cpp:
        (NPP_New):
        (NPP_Destroy):
        (NPP_SetWindow):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebKitToolsChangeLog">trunk/WebKitTools/ChangeLog</a></li>
<li><a href="#trunkWebKitToolsDumpRenderTreeTestNetscapePlugInsubprojPluginObjectcpp">trunk/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.cpp</a></li>
<li><a href="#trunkWebKitToolsDumpRenderTreeTestNetscapePlugInsubprojPluginObjecth">trunk/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.h</a></li>
<li><a href="#trunkWebKitToolsDumpRenderTreeTestNetscapePlugInsubprojmaincpp">trunk/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/main.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebKitToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/ChangeLog (56582 => 56583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/ChangeLog        2010-03-26 00:26:26 UTC (rev 56582)
+++ trunk/WebKitTools/ChangeLog        2010-03-26 00:46:55 UTC (rev 56583)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2010-03-25  Simon Fraser  &lt;simon.fraser@apple.com&gt;
+
+        Reviewed by Darin Adler, Alexey Proskuryakov.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36631
+        Allow the test plugin to run scripts in response to NPP_SetWindow calls
+        
+        Hook up the ability for the TestNetscapePlugIn to run JavaScript in
+        response to NPP_SetWindow.
+        
+        * DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.cpp:
+        (pluginAllocate):
+        * DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.h:
+        * DumpRenderTree/TestNetscapePlugIn.subproj/main.cpp:
+        (NPP_New):
+        (NPP_Destroy):
+        (NPP_SetWindow):
+
</ins><span class="cx"> 2010-03-25  Laszlo Gombos  &lt;laszlo.1.gombos@nokia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Unreviewed, build fix.
</span></span></pre></div>
<a id="trunkWebKitToolsDumpRenderTreeTestNetscapePlugInsubprojPluginObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.cpp (56582 => 56583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.cpp        2010-03-26 00:26:26 UTC (rev 56582)
+++ trunk/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.cpp        2010-03-26 00:46:55 UTC (rev 56583)
</span><span class="lines">@@ -960,6 +960,7 @@
</span><span class="cx">     newInstance-&gt;onStreamDestroy = 0;
</span><span class="cx">     newInstance-&gt;onDestroy = 0;
</span><span class="cx">     newInstance-&gt;onURLNotify = 0;
</span><ins>+    newInstance-&gt;onSetWindow = 0;
</ins><span class="cx">     newInstance-&gt;logDestroy = FALSE;
</span><span class="cx">     newInstance-&gt;logSetWindow = FALSE;
</span><span class="cx">     newInstance-&gt;returnErrorFromNewStream = FALSE;
</span></span></pre></div>
<a id="trunkWebKitToolsDumpRenderTreeTestNetscapePlugInsubprojPluginObjecth"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.h (56582 => 56583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.h        2010-03-26 00:26:26 UTC (rev 56582)
+++ trunk/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.h        2010-03-26 00:46:55 UTC (rev 56583)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx">     char* onStreamDestroy;
</span><span class="cx">     char* onDestroy;
</span><span class="cx">     char* onURLNotify;
</span><ins>+    char* onSetWindow;
</ins><span class="cx">     char* firstUrl;
</span><span class="cx">     char* firstHeaders;
</span><span class="cx">     char* lastUrl;
</span></span></pre></div>
<a id="trunkWebKitToolsDumpRenderTreeTestNetscapePlugInsubprojmaincpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/main.cpp (56582 => 56583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/main.cpp        2010-03-26 00:26:26 UTC (rev 56582)
+++ trunk/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/main.cpp        2010-03-26 00:46:55 UTC (rev 56583)
</span><span class="lines">@@ -93,6 +93,8 @@
</span><span class="cx">         else if (strcasecmp(argn[i], &quot;src&quot;) == 0 &amp;&amp;
</span><span class="cx">                  strcasecmp(argv[i], &quot;data:application/x-webkit-test-netscape,returnerrorfromnewstream&quot;) == 0)
</span><span class="cx">             obj-&gt;returnErrorFromNewStream = TRUE;
</span><ins>+        else if (strcasecmp(argn[i], &quot;onSetWindow&quot;) == 0 &amp;&amp; !obj-&gt;onSetWindow)
+            obj-&gt;onSetWindow = strdup(argv[i]);
</ins><span class="cx">         else if (strcasecmp(argn[i], &quot;logfirstsetwindow&quot;) == 0)
</span><span class="cx">             obj-&gt;logSetWindow = TRUE;
</span><span class="cx">         else if (strcasecmp(argn[i], &quot;testnpruntime&quot;) == 0)
</span><span class="lines">@@ -162,6 +164,9 @@
</span><span class="cx"> 
</span><span class="cx">         if (obj-&gt;onURLNotify)
</span><span class="cx">             free(obj-&gt;onURLNotify);
</span><ins>+
+        if (obj-&gt;onSetWindow)
+            free(obj-&gt;onSetWindow);
</ins><span class="cx">         
</span><span class="cx">         if (obj-&gt;logDestroy)
</span><span class="cx">             pluginLog(instance, &quot;NPP_Destroy&quot;);
</span><span class="lines">@@ -183,6 +188,9 @@
</span><span class="cx">             obj-&gt;logSetWindow = FALSE;
</span><span class="cx">         }
</span><span class="cx"> 
</span><ins>+        if (obj-&gt;onSetWindow)
+            executeScript(obj, obj-&gt;onSetWindow);
+
</ins><span class="cx">         if (obj-&gt;testWindowOpen) {
</span><span class="cx">             testWindowOpen(instance);
</span><span class="cx">             obj-&gt;testWindowOpen = FALSE;
</span></span></pre>
</div>
</div>

</body>
</html>