Changeset 253519 in webkit for trunk/Source/WebCore/xml/XMLTreeViewer.cpp

Timestamp:

Dec 13, 2019, 7:12:10 PM (5 years ago)

Author:

[email protected]

Message:

Refactor ScriptController's proliferation of ExceptionDetails*.
​https://bugs.webkit.org/show_bug.cgi?id=205151

Reviewed by Alex Christensen.

Source/WebCore:

No new tests (Refactor, no behavior change).

There's so many ExceptionDetails* null pointers being passed around in the ScriptController
family of functions.

Let's make it a little more explicit which callers get exceptions and which don't.

• Modules/plugins/QuickTimePluginReplacement.mm:

(WebCore::QuickTimePluginReplacement::ensureReplacementScriptInjected):

• bindings/js/ScheduledAction.cpp:

(WebCore::ScheduledAction::execute):

• bindings/js/ScriptController.cpp:

(WebCore::ScriptController::evaluateInWorldIgnoringException):
(WebCore::ScriptController::evaluateInWorld):
(WebCore::ScriptController::evaluateIgnoringException):
(WebCore::ScriptController::executeScriptInWorldIgnoringException):
(WebCore::ScriptController::executeScriptInWorld):
(WebCore::ScriptController::executeUserAgentScriptInWorld):
(WebCore::ScriptController::executeScriptIgnoringException):
(WebCore::ScriptController::executeIfJavaScriptURL):
(WebCore::ScriptController::evaluate): Deleted.
(WebCore::ScriptController::executeScript): Deleted.

• bindings/js/ScriptController.h:

• contentextensions/ContentExtensionsBackend.cpp:

(WebCore::ContentExtensions::ContentExtensionsBackend::processContentRuleListsForLoad):

• dom/Document.cpp:

(WebCore::Document::ensurePlugInsInjectedScript):

• dom/ScriptElement.cpp:

(WebCore::ScriptElement::executeClassicScript):

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::ensureMediaControlsInjectedScript):

• inspector/InspectorFrontendClientLocal.cpp:

(WebCore::InspectorFrontendClientLocal::evaluateAsBoolean):
(WebCore::InspectorFrontendClientLocal::evaluateOnLoad):

• inspector/agents/InspectorPageAgent.cpp:

(WebCore::InspectorPageAgent::didClearWindowObjectInWorld):

• loader/ContentFilter.cpp:

(WebCore::ContentFilter::didDecide):

• page/Frame.cpp:

(WebCore::Frame::injectUserScriptImmediately):

• xml/XMLTreeViewer.cpp:

(WebCore::XMLTreeViewer::transformDocumentToTreeView):

Source/WebKit:

• UIProcess/API/C/WKPage.cpp:

(WKPageRunJavaScriptInMainFrame):

• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _evaluateJavaScript:forceUserGesture:completionHandler:]):

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::runJavaScriptInMainFrame):
(WebKit::WebPageProxy::runJavaScriptInMainFrameScriptWorld):
(WebKit::WebPageProxy::runJavaScriptInFrame):

• UIProcess/WebPageProxy.h:
• UIProcess/WebPageProxy.messages.in:

• WebProcess/Plugins/PluginView.cpp:

(WebKit::PluginView::performJavaScriptURLRequest):

• WebProcess/WebPage/WebInspectorFrontendAPIDispatcher.cpp:

(WebKit::WebInspectorFrontendAPIDispatcher::evaluateOrQueueExpression):
(WebKit::WebInspectorFrontendAPIDispatcher::evaluateQueuedExpressions):

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::runJavaScript):

Source/WebKitLegacy/mac:

• WebCoreSupport/WebInspectorClient.mm:

(WebInspectorFrontendClient::save):
(WebInspectorFrontendClient::append):

• WebView/WebFrame.mm:

(-[WebFrame _stringByEvaluatingJavaScriptFromString:forceUserGesture:]):
(-[WebFrame _stringByEvaluatingJavaScriptFromString:withGlobalObject:inScriptWorld:]):

• WebView/WebView.mm:

(-[WebView aeDescByEvaluatingJavaScriptFromString:]):

Source/WebKitLegacy/win:

• Plugins/PluginView.cpp:

(WebCore::PluginView::performRequest):

• WebFrame.cpp:

(WebFrame::stringByEvaluatingJavaScriptInScriptWorld):

• WebView.cpp:

(WebView::stringByEvaluatingJavaScriptFromString):

File:

• trunk/Source/WebCore/xml/XMLTreeViewer.cpp (modified) (1 diff)

trunk/Source/WebCore/xml/XMLTreeViewer.cpp

@@ -57 +57 @@
 
     String scriptString = StringImpl::createWithoutCopying(XMLViewer_js, sizeof(XMLViewer_js));
-    m_document.frame()->script().evaluate(ScriptSourceCode(scriptString));
-    m_document.frame()->script().evaluate(ScriptSourceCode(AtomString("prepareWebKitXMLViewer('This XML file does not appear to have any style information associated with it. The document tree is shown below.');")));
+    m_document.frame()->script().evaluateIgnoringException(ScriptSourceCode(scriptString));
+    m_document.frame()->script().evaluateIgnoringException(ScriptSourceCode(AtomString("prepareWebKitXMLViewer('This XML file does not appear to have any style information associated with it. The document tree is shown below.');")));
 
     String cssString = StringImpl::createWithoutCopying(XMLViewer_css, sizeof(XMLViewer_css));