<!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>[177959] 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/177959">177959</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-01-06 08:52:15 -0800 (Tue, 06 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] Another build fix attempt.
Reorder function declarations to avoid confusing compiler. Add explicit namespace for
out copied functions to avoid attempting to link against bindings version of these files.
* plugins/PluginPackage.cpp:
(WebCore::makeSource):
(WebCore::NPN_Evaluate):
(WebCore::NPN_Invoke):
(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 (177958 => 177959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-01-06 16:49:58 UTC (rev 177958)
+++ trunk/Source/WebCore/ChangeLog        2015-01-06 16:52:15 UTC (rev 177959)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-01-06 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Another build fix attempt.
+
+ Reorder function declarations to avoid confusing compiler. Add explicit namespace for
+ out copied functions to avoid attempting to link against bindings version of these files.
+
+ * plugins/PluginPackage.cpp:
+ (WebCore::makeSource):
+ (WebCore::NPN_Evaluate):
+ (WebCore::NPN_Invoke):
+ (WebCore::PluginPackage::initializeBrowserFuncs):
+
</ins><span class="cx"> 2015-01-06 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Move '-webkit-scroll-snap-*' CSS properties to the new StyleBuilder
</span></span></pre></div>
<a id="trunkSourceWebCorepluginsPluginPackagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/PluginPackage.cpp (177958 => 177959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/PluginPackage.cpp        2015-01-06 16:49:58 UTC (rev 177958)
+++ trunk/Source/WebCore/plugins/PluginPackage.cpp        2015-01-06 16:52:15 UTC (rev 177959)
</span><span class="lines">@@ -45,8 +45,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static bool NPN_Evaluate(NPP instance, NPObject*, NPString*, NPVariant*);
-
</del><span class="cx"> PluginPackage::~PluginPackage()
</span><span class="cx"> {
</span><span class="cx"> // This destructor gets called during refresh() if PluginDatabase's
</span><span class="lines">@@ -282,6 +280,39 @@
</span><span class="cx"> aList.append(JSC::Bindings::convertNPVariantToValue(exec, &args[i], rootObject));
</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());
+}
+
+static bool NPN_Evaluate(NPP instance, NPObject* o, NPString* s, NPVariant* variant)
+{
+ if (o->_class == NPScriptObjectClass) {
+ JavaScriptObject* obj = reinterpret_cast<JavaScriptObject*>(o);
+
+ JSC::Bindings::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);
+
+ JSC::ExecState* exec = rootObject->globalObject()->globalExec();
+ JSC::JSLockHolder lock(exec);
+ String scriptString = JSC::Bindings::convertNPStringToUTF16(s);
+
+ JSC::JSValue returnValue = JSC::evaluate(rootObject->globalObject()->globalExec(), makeSource(scriptString), JSC::JSValue());
+
+ JSC::Bindings::convertValueToNPVariant(exec, returnValue, variant);
+ exec->clearException();
+ return true;
+ }
+
+ VOID_TO_NPVARIANT(*variant);
+ return false;
+}
+
</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">@@ -297,7 +328,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (args[0].type != NPVariantType_String)
</span><span class="cx"> return false;
</span><del>- return NPN_Evaluate(npp, o, const_cast<NPString*>(&args[0].value.stringValue), result);
</del><ins>+ return WebCore::NPN_Evaluate(npp, o, const_cast<NPString*>(&args[0].value.stringValue), result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Look up the function object.
</span><span class="lines">@@ -330,39 +361,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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());
-}
-
-static bool NPN_Evaluate(NPP instance, NPObject* o, NPString* s, NPVariant* variant)
-{
- if (o->_class == NPScriptObjectClass) {
- JavaScriptObject* obj = reinterpret_cast<JavaScriptObject*>(o);
-
- JSC::Bindings::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);
-
- JSC::ExecState* exec = rootObject->globalObject()->globalExec();
- JSC::JSLockHolder lock(exec);
- String scriptString = JSC::Bindings::convertNPStringToUTF16(s);
-
- JSC::JSValue returnValue = JSC::evaluate(rootObject->globalObject()->globalExec(), makeSource(scriptString), JSC::JSValue());
-
- JSC::Bindings::convertValueToNPVariant(exec, returnValue, variant);
- exec->clearException();
- return true;
- }
-
- VOID_TO_NPVARIANT(*variant);
- return false;
-}
-
</del><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">@@ -404,9 +402,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 = WebCore::NPN_Invoke;
</ins><span class="cx"> m_browserFuncs.invokeDefault = _NPN_InvokeDefault;
</span><del>- m_browserFuncs.evaluate = NPN_Evaluate;
</del><ins>+ m_browserFuncs.evaluate = WebCore::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>