Changeset 255221 in webkit

Timestamp:

Jan 27, 2020 7:01:18 PM (4 years ago)

Author:

Devin Rousso

Message:

Unreviewed, speculative win build fix after r255191

• bindings/js/ScriptController.h:
• testing/Internals.cpp:

(WebCore::Internals::evaluateInWorldIgnoringException):
Don't use the ScriptSourceCode so we don't have to export its symbol.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/ScriptController.h (modified) (1 diff)
• testing/Internals.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-01-27  Devin Rousso  <drousso@apple.com>
+
+        Unreviewed, speculative win build fix after r255191
+
+        * bindings/js/ScriptController.h:
+        * testing/Internals.cpp:
+        (WebCore::Internals::evaluateInWorldIgnoringException):
+        Don't use the `ScriptSourceCode` so we don't have to export its symbol.
+
 2020-01-27  Jonathan Bedard  <jbedard@apple.com>
 

trunk/Source/WebCore/bindings/js/ScriptController.h

@@ -101 +101 @@
 
     WEBCORE_EXPORT JSC::JSValue executeScriptIgnoringException(const String& script, bool forceUserGesture = false);
-    JSC::JSValue executeScriptInWorldIgnoringException(DOMWrapperWorld&, const String& script, bool forceUserGesture = false);
+    WEBCORE_EXPORT JSC::JSValue executeScriptInWorldIgnoringException(DOMWrapperWorld&, const String& script, bool forceUserGesture = false);
     WEBCORE_EXPORT JSC::JSValue executeUserAgentScriptInWorldIgnoringException(DOMWrapperWorld&, const String& script, bool forceUserGesture);
     WEBCORE_EXPORT ValueOrException executeUserAgentScriptInWorld(DOMWrapperWorld&, const String& script, bool forceUserGesture);
     WEBCORE_EXPORT void executeAsynchronousUserAgentScriptInWorld(DOMWrapperWorld&, RunJavaScriptParameters&&, ResolveFunction&&);
     JSC::JSValue evaluateIgnoringException(const ScriptSourceCode&);
-    WEBCORE_EXPORT JSC::JSValue evaluateInWorldIgnoringException(const ScriptSourceCode&, DOMWrapperWorld&);
+    JSC::JSValue evaluateInWorldIgnoringException(const ScriptSourceCode&, DOMWrapperWorld&);
 
     Expected<void, ExceptionDetails> shouldAllowUserAgentScripts(Document&) const;

trunk/Source/WebCore/testing/Internals.cpp

@@ -3494 +3494 @@
     auto& scriptController = document->frame()->script();
     auto world = ScriptController::createWorld(name);
-    return scriptController.evaluateInWorldIgnoringException(ScriptSourceCode(source), world);
+    return scriptController.executeScriptInWorldIgnoringException(world, source);
 }