<!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>[177943] 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/177943">177943</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-01-05 18:01:45 -0800 (Mon, 05 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] Unreviewed build fix after <a href="http://trac.webkit.org/projects/webkit/changeset/177937">r177937</a>.
Add the missing #include and namespace declarations to get a clean build.
* bindings/js/JSWebGLRenderingContextCustom.cpp:
(WebCore::JSWebGLRenderingContext::getAttachedShaders):
* plugins/PluginPackage.cpp:
(WebCore::getListFromVariantArgs):
(WebCore::NPN_Invoke):
(WebCore::makeSource):
(WebCore::NPN_Evaluate):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSWebGLRenderingContextCustomcpp">trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp</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 (177942 => 177943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-01-06 01:54:32 UTC (rev 177942)
+++ trunk/Source/WebCore/ChangeLog        2015-01-06 02:01:45 UTC (rev 177943)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-01-05 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Unreviewed build fix after r177937.
+
+ Add the missing #include and namespace declarations to get a clean build.
+
+ * bindings/js/JSWebGLRenderingContextCustom.cpp:
+ (WebCore::JSWebGLRenderingContext::getAttachedShaders):
+ * plugins/PluginPackage.cpp:
+ (WebCore::getListFromVariantArgs):
+ (WebCore::NPN_Invoke):
+ (WebCore::makeSource):
+ (WebCore::NPN_Evaluate):
+
</ins><span class="cx"> 2015-01-05 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove PluginViewNone.cpp
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSWebGLRenderingContextCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp (177942 => 177943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp        2015-01-06 01:54:32 UTC (rev 177942)
+++ trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp        2015-01-06 02:01:45 UTC (rev 177943)
</span><span class="lines">@@ -280,7 +280,7 @@
</span><span class="cx"> }
</span><span class="cx"> if (!succeed)
</span><span class="cx"> return jsNull();
</span><del>- MarkedArgumentBuffer list;
</del><ins>+ JSC::MarkedArgumentBuffer list;
</ins><span class="cx"> for (size_t ii = 0; ii < shaders.size(); ++ii)
</span><span class="cx"> list.append(toJS(exec, globalObject(), shaders[ii].get()));
</span><span class="cx"> return constructArray(exec, 0, globalObject(), list);
</span></span></pre></div>
<a id="trunkSourceWebCorepluginsPluginPackagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/PluginPackage.cpp (177942 => 177943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/PluginPackage.cpp        2015-01-06 01:54:32 UTC (rev 177942)
+++ trunk/Source/WebCore/plugins/PluginPackage.cpp        2015-01-06 02:01:45 UTC (rev 177943)
</span><span class="lines">@@ -28,14 +28,19 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "PluginPackage.h"
</span><span class="cx">
</span><ins>+#include "c_utility.h"
+#include "IdentifierRep.h"
</ins><span class="cx"> #include "MIMETypeRegistry.h"
</span><span class="cx"> #include "NP_jsobject.h"
</span><span class="cx"> #include "PluginDatabase.h"
</span><span class="cx"> #include "PluginDebug.h"
</span><span class="cx"> #include "PluginView.h"
</span><ins>+#include "runtime_root.h"
</ins><span class="cx"> #include "Timer.h"
</span><span class="cx"> #include "npruntime_impl.h"
</span><span class="cx"> #include <string.h>
</span><ins>+#include <JavaScriptCore/Completion.h>
+#include <JavaScriptCore/JSGlobalObject.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -269,6 +274,12 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><ins>+static void getListFromVariantArgs(JSC::ExecState* exec, const NPVariant* args, unsigned argCount, JSC::Bindings::RootObject* rootObject, JSC::MarkedArgumentBuffer& aList)
+{
+ for (unsigned i = 0; i < argCount; ++i)
+ aList.append(JSC::Bindings::convertNPVariantToValue(exec, &args[i], rootObject));
+}
+
</ins><span class="cx"> static bool NPN_Invoke(NPP npp, NPObject* o, NPIdentifier methodName, const NPVariant* args, uint32_t argCount, NPVariant* result)
</span><span class="cx"> {
</span><span class="cx"> if (o->_class == NPScriptObjectClass) {
</span><span class="lines">@@ -288,24 +299,24 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Look up the function object.
</span><del>- RootObject* rootObject = obj->rootObject;
</del><ins>+ JSC::Bindings::RootObject* rootObject = obj->rootObject;
</ins><span class="cx"> if (!rootObject || !rootObject->isValid())
</span><span class="cx"> return false;
</span><del>- 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)
</del><ins>+ JSC::ExecState* exec = rootObject->globalObject()->globalExec();
+ JSC::JSLockHolder lock(exec);
+ JSC::JSValue function = obj->imp->get(exec, JSC::Bindings::identifierFromNPIdentifier(exec, i->string()));
+ JSC::CallData callData;
+ JSC::CallType callType = getCallData(function, callData);
+ if (callType == JSC::CallTypeNone)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Call the function object.
</span><del>- MarkedArgumentBuffer argList;
</del><ins>+ JSC::MarkedArgumentBuffer argList;
</ins><span class="cx"> getListFromVariantArgs(exec, args, argCount, rootObject, argList);
</span><del>- JSValue resultV = JSC::call(exec, function, callType, callData, obj->imp, argList);
</del><ins>+ JSC::JSValue resultV = JSC::call(exec, function, callType, callData, obj->imp, argList);
</ins><span class="cx">
</span><span class="cx"> // Convert and return the result of the function call.
</span><del>- convertValueToNPVariant(exec, resultV, result);
</del><ins>+ JSC::Bindings::convertValueToNPVariant(exec, resultV, result);
</ins><span class="cx"> exec->clearException();
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -317,12 +328,17 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline JSC::SourceCode makeSource(const String& source, const String& url = String(), const TextPosition& startPosition = TextPosition::minimumPosition())
+{
+ return JSC::SourceCode(JSC::StringSourceProvider::create(source, url, startPosition), startPosition.m_line.oneBasedInt(), startPosition.m_column.oneBasedInt());
+}
+
</ins><span class="cx"> static bool NPN_Evaluate(NPP instance, NPObject* o, NPString* s, NPVariant* variant)
</span><span class="cx"> {
</span><span class="cx"> if (o->_class == NPScriptObjectClass) {
</span><span class="cx"> JavaScriptObject* obj = reinterpret_cast<JavaScriptObject*>(o);
</span><span class="cx">
</span><del>- RootObject* rootObject = obj->rootObject;
</del><ins>+ JSC::Bindings::RootObject* rootObject = obj->rootObject;
</ins><span class="cx"> if (!rootObject || !rootObject->isValid())
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -330,13 +346,13 @@
</span><span class="cx"> // PluginView, so we destroy it asynchronously.
</span><span class="cx"> PluginView::keepAlive(instance);
</span><span class="cx">
</span><del>- ExecState* exec = rootObject->globalObject()->globalExec();
- JSLockHolder lock(exec);
- String scriptString = convertNPStringToUTF16(s);
</del><ins>+ JSC::ExecState* exec = rootObject->globalObject()->globalExec();
+ JSC::JSLockHolder lock(exec);
+ String scriptString = JSC::Bindings::convertNPStringToUTF16(s);
</ins><span class="cx">
</span><del>- JSValue returnValue = JSC::evaluate(rootObject->globalObject()->globalExec(), makeSource(scriptString), JSC::JSValue());
</del><ins>+ JSC::JSValue returnValue = JSC::evaluate(rootObject->globalObject()->globalExec(), makeSource(scriptString), JSC::JSValue());
</ins><span class="cx">
</span><del>- convertValueToNPVariant(exec, returnValue, variant);
</del><ins>+ JSC::Bindings::convertValueToNPVariant(exec, returnValue, variant);
</ins><span class="cx"> exec->clearException();
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>