<!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>[177937] 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/177937">177937</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-01-05 16:10:52 -0800 (Mon, 05 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add copies of NPN_Evaluate and NPN_Invoke on Windows
https://bugs.webkit.org/show_bug.cgi?id=140103
Reviewed by Andreas Kling.
While this is unfortunate, it will allow us to get rid of PluginView.h and PluginViewNone.cpp
from the cross platform WebCore code and then move the plug-in code to WebKit/win (which is the only client of this plug-in implementation).
* plugins/PluginPackage.cpp:
(WebCore::NPN_Invoke):
(WebCore::NPN_Evaluate):
(WebCore::PluginPackage::initializeBrowserFuncs):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepluginsPluginPackagecpp">trunk/Source/WebCore/plugins/PluginPackage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177936 => 177937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-06 00:03:37 UTC (rev 177936)
+++ trunk/Source/WebCore/ChangeLog 2015-01-06 00:10:52 UTC (rev 177937)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-01-05 Anders Carlsson <andersca@apple.com>
+
+ Add copies of NPN_Evaluate and NPN_Invoke on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=140103
+
+ Reviewed by Andreas Kling.
+
+ While this is unfortunate, it will allow us to get rid of PluginView.h and PluginViewNone.cpp
+ from the cross platform WebCore code and then move the plug-in code to WebKit/win (which is the only client of this plug-in implementation).
+
+ * plugins/PluginPackage.cpp:
+ (WebCore::NPN_Invoke):
+ (WebCore::NPN_Evaluate):
+ (WebCore::PluginPackage::initializeBrowserFuncs):
+
</ins><span class="cx"> 2015-01-05 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Purge PassRefPtr from Page.
</span></span></pre></div>
<a id="trunkSourceWebCorepluginsPluginPackagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/PluginPackage.cpp (177936 => 177937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/PluginPackage.cpp 2015-01-06 00:03:37 UTC (rev 177936)
+++ trunk/Source/WebCore/plugins/PluginPackage.cpp 2015-01-06 00:10:52 UTC (rev 177937)
</span><span class="lines">@@ -29,8 +29,10 @@
</span><span class="cx"> #include "PluginPackage.h"
</span><span class="cx">
</span><span class="cx"> #include "MIMETypeRegistry.h"
</span><ins>+#include "NP_jsobject.h"
</ins><span class="cx"> #include "PluginDatabase.h"
</span><span class="cx"> #include "PluginDebug.h"
</span><ins>+#include "PluginView.h"
</ins><span class="cx"> #include "Timer.h"
</span><span class="cx"> #include "npruntime_impl.h"
</span><span class="cx"> #include <string.h>
</span><span class="lines">@@ -267,6 +269,82 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><ins>+static bool NPN_Invoke(NPP npp, NPObject* o, NPIdentifier methodName, const NPVariant* args, uint32_t argCount, NPVariant* result)
+{
+ if (o->_class == NPScriptObjectClass) {
+ JavaScriptObject* obj = reinterpret_cast<JavaScriptObject*>(o);
+
+ IdentifierRep* i = static_cast<IdentifierRep*>(methodName);
+ if (!i->isString())
+ return false;
+
+ // Special case the "eval" method.
+ if (methodName == _NPN_GetStringIdentifier("eval")) {
+ if (argCount != 1)
+ return false;
+ if (args[0].type != NPVariantType_String)
+ return false;
+ return NPN_Evaluate(npp, o, const_cast<NPString*>(&args[0].value.stringValue), result);
+ }
+
+ // Look up the function object.
+ RootObject* rootObject = obj->rootObject;
+ if (!rootObject || !rootObject->isValid())
+ return false;
+ ExecState* exec = rootObject->globalObject()->globalExec();
+ JSLockHolder lock(exec);
+ JSValue function = obj->imp->get(exec, identifierFromNPIdentifier(exec, i->string()));
+ CallData callData;
+ CallType callType = getCallData(function, callData);
+ if (callType == CallTypeNone)
+ return false;
+
+ // Call the function object.
+ MarkedArgumentBuffer argList;
+ getListFromVariantArgs(exec, args, argCount, rootObject, argList);
+ JSValue resultV = JSC::call(exec, function, callType, callData, obj->imp, argList);
+
+ // Convert and return the result of the function call.
+ convertValueToNPVariant(exec, resultV, result);
+ exec->clearException();
+ return true;
+ }
+
+ if (o->_class->invoke)
+ return o->_class->invoke(o, methodName, args, argCount, result);
+
+ VOID_TO_NPVARIANT(*result);
+ return true;
+}
+
+static bool NPN_Evaluate(NPP instance, NPObject* o, NPString* s, NPVariant* variant)
+{
+ if (o->_class == NPScriptObjectClass) {
+ JavaScriptObject* obj = reinterpret_cast<JavaScriptObject*>(o);
+
+ RootObject* rootObject = obj->rootObject;
+ if (!rootObject || !rootObject->isValid())
+ return false;
+
+ // There is a crash in Flash when evaluating a script that destroys the
+ // PluginView, so we destroy it asynchronously.
+ PluginView::keepAlive(instance);
+
+ ExecState* exec = rootObject->globalObject()->globalExec();
+ JSLockHolder lock(exec);
+ String scriptString = convertNPStringToUTF16(s);
+
+ JSValue returnValue = JSC::evaluate(rootObject->globalObject()->globalExec(), makeSource(scriptString), JSC::JSValue());
+
+ convertValueToNPVariant(exec, returnValue, variant);
+ exec->clearException();
+ return true;
+ }
+
+ VOID_TO_NPVARIANT(*variant);
+ return false;
+}
+
</ins><span class="cx"> void PluginPackage::initializeBrowserFuncs()
</span><span class="cx"> {
</span><span class="cx"> memset(&m_browserFuncs, 0, sizeof(m_browserFuncs));
</span><span class="lines">@@ -308,9 +386,9 @@
</span><span class="cx"> m_browserFuncs.createobject = _NPN_CreateObject;
</span><span class="cx"> m_browserFuncs.retainobject = _NPN_RetainObject;
</span><span class="cx"> m_browserFuncs.releaseobject = _NPN_ReleaseObject;
</span><del>- m_browserFuncs.invoke = _NPN_Invoke;
</del><ins>+ m_browserFuncs.invoke = NPN_Invoke;
</ins><span class="cx"> m_browserFuncs.invokeDefault = _NPN_InvokeDefault;
</span><del>- m_browserFuncs.evaluate = _NPN_Evaluate;
</del><ins>+ m_browserFuncs.evaluate = NPN_Evaluate;
</ins><span class="cx"> m_browserFuncs.getproperty = _NPN_GetProperty;
</span><span class="cx"> m_browserFuncs.setproperty = _NPN_SetProperty;
</span><span class="cx"> m_browserFuncs.removeproperty = _NPN_RemoveProperty;
</span></span></pre>
</div>
</div>
</body>
</html>