Changeset 177943 in webkit

Timestamp:

Jan 5, 2015, 6:01:45 PM (11 years ago)

Author:

Brent Fulgham

Message:

[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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSWebGLRenderingContextCustom.cpp (modified) (1 diff)
• plugins/PluginPackage.cpp (modified) (7 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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):
+
 2015-01-05  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp

@@ -281 +281 @@
     if (!succeed)
         return jsNull();
-    MarkedArgumentBuffer list;
+    JSC::MarkedArgumentBuffer list;
     for (size_t ii = 0; ii < shaders.size(); ++ii)
         list.append(toJS(exec, globalObject(), shaders[ii].get()));

trunk/Source/WebCore/plugins/PluginPackage.cpp

@@ -29 +29 @@
 #include "PluginPackage.h"
 
+#include "c_utility.h"
+#include "IdentifierRep.h"
 #include "MIMETypeRegistry.h"
 #include "NP_jsobject.h"
@@ -34 +36 @@
 #include "PluginDebug.h"
 #include "PluginView.h"
+#include "runtime_root.h"
 #include "Timer.h"
 #include "npruntime_impl.h"
 #include <string.h>
+#include <JavaScriptCore/Completion.h>
+#include <JavaScriptCore/JSGlobalObject.h>
 #include <wtf/text/CString.h>
 
@@ -270 +275 @@
 
 #if ENABLE(NETSCAPE_PLUGIN_API)
+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));
+}
+
 static bool NPN_Invoke(NPP npp, NPObject* o, NPIdentifier methodName, const NPVariant* args, uint32_t argCount, NPVariant* result)
 {
@@ -289 +300 @@
 
         // Look up the function object.
-        RootObject* rootObject = obj->rootObject;
+        JSC::Bindings::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)
+        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)
             return false;
 
         // Call the function object.
-        MarkedArgumentBuffer argList;
+        JSC::MarkedArgumentBuffer argList;
         getListFromVariantArgs(exec, args, argCount, rootObject, argList);
-        JSValue resultV = JSC::call(exec, function, callType, callData, obj->imp, argList);
+        JSC::JSValue resultV = JSC::call(exec, function, callType, callData, obj->imp, argList);
 
         // Convert and return the result of the function call.
-        convertValueToNPVariant(exec, resultV, result);
+        JSC::Bindings::convertValueToNPVariant(exec, resultV, result);
         exec->clearException();
         return true;
@@ -318 +329 @@
 }
 
+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)
 {
@@ -323 +339 @@
         JavaScriptObject* obj = reinterpret_cast<JavaScriptObject*>(o);
 
-        RootObject* rootObject = obj->rootObject;
+        JSC::Bindings::RootObject* rootObject = obj->rootObject;
         if (!rootObject || !rootObject->isValid())
             return false;
@@ -331 +347 @@
         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);
+        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;