https://bugs.webkit.org/show_bug.cgi?id=150058
rdar://problem/
22742222
Reviewed by Sam Weinig.
Source/WebCore:
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::reloadWithOverrideEncoding):
(WebCore::FrameLoader::reload):
* loader/FrameLoader.h:
* page/Page.h:
(WebCore::Page::userContentController):
(WebCore::Page::userContentExtensionsEnabled): Deleted.
(WebCore::Page::setUserContentExtensionsEnabled): Deleted.
* replay/UserInputBridge.cpp:
(WebCore::UserInputBridge::loadRequest):
(WebCore::UserInputBridge::reloadFrame):
(WebCore::UserInputBridge::stopLoadingFrame):
* replay/UserInputBridge.h:
Pass a bool from the reloadWithoutContentBlockers call to the DocumentLoader,
which stores the state of whether the content blockers are enabled or not.
Remove the state from the Page and copying the state from the Page to the DocumentLoader
because that caused issues with the content blockers being re-enabled at the wrong time.
Source/WebKit2:
* Shared/WebPageCreationParameters.cpp:
(WebKit::WebPageCreationParameters::encode):
(WebKit::WebPageCreationParameters::decode):
* Shared/WebPageCreationParameters.h:
* UIProcess/API/C/WKPage.cpp:
(WKPageReload):
(WKPageReloadWithoutContentBlockers):
(WKPageReloadFromOrigin):
(WKPageTryClose):
(WKPageSetUserContentExtensionsEnabled):
(WKPageSupportsTextEncoding):
* UIProcess/API/C/WKPage.h:
* UIProcess/API/Cocoa/WKBrowsingContextController.mm:
(-[WKBrowsingContextController reload]):
(-[WKBrowsingContextController reloadFromOrigin]):
(-[WKBrowsingContextController applicationNameForUserAgent]):
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView reload]):
(-[WKWebView reloadFromOrigin]):
(-[WKWebView _setUserContentExtensionsEnabled:]):
(-[WKWebView _userContentExtensionsEnabled]):
(-[WKWebView _webProcessIdentifier]):
(-[WKWebView _killWebContentProcess]):
(-[WKWebView _reloadWithoutContentBlockers]):
(-[WKWebView _killWebContentProcessAndResetState]):
* UIProcess/API/Cocoa/WKWebViewPrivate.h:
* UIProcess/API/gtk/WebKitWebView.cpp:
(webkit_web_view_reload):
(webkit_web_view_reload_bypass_cache):
* UIProcess/WebFrameProxy.cpp:
(WebKit::WebFrameProxy::didHandleContentFilterUnblockNavigation):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::stopLoading):
(WebKit::WebPageProxy::reload):
(WebKit::WebPageProxy::creationParameters):
(WebKit::WebPageProxy::setShouldScaleViewToFitDocument):
(WebKit::WebPageProxy::setUserContentExtensionsEnabled): Deleted.
* UIProcess/WebPageProxy.h:
(WebKit::WebPageProxy::userContentExtensionsEnabled): Deleted.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::m_shouldDispatchFakeMouseMoveEvents):
(WebKit::WebPage::setDefersLoading):
(WebKit::WebPage::reload):
(WebKit::WebPage::goForward):
(WebKit::WebPage::createDocumentLoader):
(WebKit::WebPage::setShouldScaleViewToFitDocument):
(WebKit::WebPage::imageOrMediaDocumentSizeChanged):
(WebKit::WebPage::setUserContentExtensionsEnabled): Deleted.
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:
Tools:
* WebKitTestRunner/cocoa/TestControllerCocoa.mm:
(WTR::TestController::cocoaResetStateToConsistentValues):
* WebKitTestRunner/mac/TestControllerMac.mm:
(WTR::TestController::platformConfigureViewForTest):
LayoutTests:
* http/tests/contentextensions/disable-blocker-expected.txt: Removed.
* http/tests/contentextensions/disable-blocker.html: Removed.
* http/tests/contentextensions/disable-blocker.html.json: Removed.
_userContentExtensionsEnabled is going to be removed, and its functionality is what this test tested.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@191063
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2015-10-14 Alex Christensen <achristensen@webkit.org>
+
+ Add SPI for reloading without content blockers
+ https://bugs.webkit.org/show_bug.cgi?id=150058
+ rdar://problem/22742222
+
+ Reviewed by Sam Weinig.
+
+ * http/tests/contentextensions/disable-blocker-expected.txt: Removed.
+ * http/tests/contentextensions/disable-blocker.html: Removed.
+ * http/tests/contentextensions/disable-blocker.html.json: Removed.
+ _userContentExtensionsEnabled is going to be removed, and its functionality is what this test tested.
+
2015-10-14 Said Abou-Hallawa <sabouhallawa@apple.com>
REGRESSION(r53318): background-repeat: space with gradients doesn't render correctly
+++ /dev/null
-CONSOLE MESSAGE: line 12: status: 0, readyState:1, responseText:
-CONSOLE MESSAGE: line 12: status: 200, readyState:2, responseText:
-CONSOLE MESSAGE: line 12: status: 200, readyState:3, responseText:
-CONSOLE MESSAGE: line 12: status: 200, readyState:4, responseText: This page should load.
-<script>
- console.log("This page should load.");
-</script>
-
-This page should load successfully. The content blocker is disabled in WebKitTestRunner before loading the page.
+++ /dev/null
-<head>
-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-}
-
-function sendRequest()
-{
- var xhr = new XMLHttpRequest();
- xhr.onreadystatechange = function() {
- console.log("status: " + xhr.status + ", readyState:" + xhr.readyState + ", responseText: " + xhr.responseText);
- if (xhr.readyState == 4) {
- testRunner.notifyDone();
- }
- }
-
- xhr.open("GET", "resources/should-load.html", true);
- xhr.send();
-}
-</script>
-</head>
-<body onload="sendRequest()">
-This page should load successfully. The content blocker is disabled in WebKitTestRunner before loading the page.
-</body>
+++ /dev/null
-[
- {
- "action": {
- "type": "block"
- },
- "trigger": {
- "url-filter": ".*"
- }
- }
-]
+2015-10-14 Alex Christensen <achristensen@webkit.org>
+
+ Add SPI for reloading without content blockers
+ https://bugs.webkit.org/show_bug.cgi?id=150058
+ rdar://problem/22742222
+
+ Reviewed by Sam Weinig.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::reloadWithOverrideEncoding):
+ (WebCore::FrameLoader::reload):
+ * loader/FrameLoader.h:
+ * page/Page.h:
+ (WebCore::Page::userContentController):
+ (WebCore::Page::userContentExtensionsEnabled): Deleted.
+ (WebCore::Page::setUserContentExtensionsEnabled): Deleted.
+ * replay/UserInputBridge.cpp:
+ (WebCore::UserInputBridge::loadRequest):
+ (WebCore::UserInputBridge::reloadFrame):
+ (WebCore::UserInputBridge::stopLoadingFrame):
+ * replay/UserInputBridge.h:
+ Pass a bool from the reloadWithoutContentBlockers call to the DocumentLoader,
+ which stores the state of whether the content blockers are enabled or not.
+ Remove the state from the Page and copying the state from the Page to the DocumentLoader
+ because that caused issues with the content blockers being re-enabled at the wrong time.
+
2015-10-14 Youenn Fablet <youenn.fablet@crf.canon.fr>
Rename JSDOMWrapper to JSDOMObject and JSDOMWrapperWithImplementation to JSDOMWrapper
loadWithDocumentLoader(loader.ptr(), FrameLoadType::Reload, 0, AllowNavigationToInvalidURL::Yes);
}
-void FrameLoader::reload(bool endToEndReload)
+void FrameLoader::reload(bool endToEndReload, bool contentBlockersEnabled)
{
if (!m_documentLoader)
return;
Ref<DocumentLoader> loader = m_client.createDocumentLoader(initialRequest, defaultSubstituteDataForURL(initialRequest.url()));
applyShouldOpenExternalURLsPolicyToNewDocumentLoader(loader, m_documentLoader->shouldOpenExternalURLsPolicyToPropagate());
+ loader->setUserContentExtensionsEnabled(contentBlockersEnabled);
+
ResourceRequest& request = loader->request();
// FIXME: We don't have a mechanism to revalidate the main resource without reloading at the moment.
WEBCORE_EXPORT void urlSelected(const URL&, const String& target, Event*, LockHistory, LockBackForwardList, ShouldSendReferrer, ShouldOpenExternalURLsPolicy);
void submitForm(PassRefPtr<FormSubmission>);
- WEBCORE_EXPORT void reload(bool endToEndReload = false);
+ WEBCORE_EXPORT void reload(bool endToEndReload = false, bool contentBlockersEnabled = true);
WEBCORE_EXPORT void reloadWithOverrideEncoding(const String& overrideEncoding);
void open(CachedFrameBase&);
UserContentController* userContentController() { return m_userContentController.get(); }
WEBCORE_EXPORT void setUserContentController(UserContentController*);
- bool userContentExtensionsEnabled() const { return m_userContentExtensionsEnabled; }
- void setUserContentExtensionsEnabled(bool enabled) { m_userContentExtensionsEnabled = enabled; }
-
VisitedLinkStore& visitedLinkStore();
WEBCORE_EXPORT void setVisitedLinkStore(Ref<VisitedLinkStore>&&);
MediaProducer::MediaStateFlags m_mediaState { MediaProducer::IsNotPlaying };
- bool m_userContentExtensionsEnabled { true };
bool m_allowsMediaDocumentInlinePlayback { false };
};
m_page.mainFrame().loader().load(request);
}
-void UserInputBridge::reloadFrame(Frame* frame, bool endToEndReload, InputSource)
+void UserInputBridge::reloadFrame(Frame* frame, bool endToEndReload, bool contentBlockersEnabled, InputSource)
{
- frame->loader().reload(endToEndReload);
+ frame->loader().reload(endToEndReload, contentBlockersEnabled);
}
void UserInputBridge::stopLoadingFrame(Frame* frame, InputSource)
// Navigation APIs.
WEBCORE_EXPORT void loadRequest(const FrameLoadRequest&, InputSource source = InputSource::User);
- WEBCORE_EXPORT void reloadFrame(Frame*, bool endToEndReload, InputSource source = InputSource::User);
+ WEBCORE_EXPORT void reloadFrame(Frame*, bool endToEndReload, bool contentBlockersEnabled, InputSource = InputSource::User);
WEBCORE_EXPORT void stopLoadingFrame(Frame*, InputSource source = InputSource::User);
WEBCORE_EXPORT bool tryClosePage(InputSource source = InputSource::User);
+2015-10-14 Alex Christensen <achristensen@webkit.org>
+
+ Add SPI for reloading without content blockers
+ https://bugs.webkit.org/show_bug.cgi?id=150058
+ rdar://problem/22742222
+
+ Reviewed by Sam Weinig.
+
+ * Shared/WebPageCreationParameters.cpp:
+ (WebKit::WebPageCreationParameters::encode):
+ (WebKit::WebPageCreationParameters::decode):
+ * Shared/WebPageCreationParameters.h:
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageReload):
+ (WKPageReloadWithoutContentBlockers):
+ (WKPageReloadFromOrigin):
+ (WKPageTryClose):
+ (WKPageSetUserContentExtensionsEnabled):
+ (WKPageSupportsTextEncoding):
+ * UIProcess/API/C/WKPage.h:
+ * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
+ (-[WKBrowsingContextController reload]):
+ (-[WKBrowsingContextController reloadFromOrigin]):
+ (-[WKBrowsingContextController applicationNameForUserAgent]):
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView reload]):
+ (-[WKWebView reloadFromOrigin]):
+ (-[WKWebView _setUserContentExtensionsEnabled:]):
+ (-[WKWebView _userContentExtensionsEnabled]):
+ (-[WKWebView _webProcessIdentifier]):
+ (-[WKWebView _killWebContentProcess]):
+ (-[WKWebView _reloadWithoutContentBlockers]):
+ (-[WKWebView _killWebContentProcessAndResetState]):
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+ * UIProcess/API/gtk/WebKitWebView.cpp:
+ (webkit_web_view_reload):
+ (webkit_web_view_reload_bypass_cache):
+ * UIProcess/WebFrameProxy.cpp:
+ (WebKit::WebFrameProxy::didHandleContentFilterUnblockNavigation):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::stopLoading):
+ (WebKit::WebPageProxy::reload):
+ (WebKit::WebPageProxy::creationParameters):
+ (WebKit::WebPageProxy::setShouldScaleViewToFitDocument):
+ (WebKit::WebPageProxy::setUserContentExtensionsEnabled): Deleted.
+ * UIProcess/WebPageProxy.h:
+ (WebKit::WebPageProxy::userContentExtensionsEnabled): Deleted.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::m_shouldDispatchFakeMouseMoveEvents):
+ (WebKit::WebPage::setDefersLoading):
+ (WebKit::WebPage::reload):
+ (WebKit::WebPage::goForward):
+ (WebKit::WebPage::createDocumentLoader):
+ (WebKit::WebPage::setShouldScaleViewToFitDocument):
+ (WebKit::WebPage::imageOrMediaDocumentSizeChanged):
+ (WebKit::WebPage::setUserContentExtensionsEnabled): Deleted.
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+
2015-10-14 Simon Fraser <simon.fraser@apple.com>
Change GraphicsContext image-drawing functions to take references
#endif
encoder << appleMailPaginationQuirkEnabled;
encoder << shouldScaleViewToFitDocument;
- encoder << userContentExtensionsEnabled;
}
bool WebPageCreationParameters::decode(IPC::ArgumentDecoder& decoder, WebPageCreationParameters& parameters)
if (!decoder.decode(parameters.shouldScaleViewToFitDocument))
return false;
- if (!decoder.decode(parameters.userContentExtensionsEnabled))
- return false;
-
return true;
}
#endif
bool appleMailPaginationQuirkEnabled;
bool shouldScaleViewToFitDocument;
- bool userContentExtensionsEnabled;
};
} // namespace WebKit
void WKPageReload(WKPageRef pageRef)
{
- toImpl(pageRef)->reload(false);
+ const bool reloadFromOrigin = false;
+ const bool contentBlockersEnabled = true;
+ toImpl(pageRef)->reload(reloadFromOrigin, contentBlockersEnabled);
+}
+
+void WKPageReloadWithoutContentBlockers(WKPageRef pageRef)
+{
+ const bool reloadFromOrigin = false;
+ const bool contentBlockersEnabled = false;
+ toImpl(pageRef)->reload(reloadFromOrigin, contentBlockersEnabled);
}
void WKPageReloadFromOrigin(WKPageRef pageRef)
{
- toImpl(pageRef)->reload(true);
+ const bool reloadFromOrigin = true;
+ const bool contentBlockersEnabled = true;
+ toImpl(pageRef)->reload(reloadFromOrigin, contentBlockersEnabled);
}
bool WKPageTryClose(WKPageRef pageRef)
void WKPageSetUserContentExtensionsEnabled(WKPageRef pageRef, bool enabled)
{
- toImpl(pageRef)->setUserContentExtensionsEnabled(enabled);
+ // FIXME: Remove this function once it is no longer used.
}
bool WKPageSupportsTextEncoding(WKPageRef pageRef)
WK_EXPORT void WKPageStopLoading(WKPageRef page);
WK_EXPORT void WKPageReload(WKPageRef page);
+WK_EXPORT void WKPageReloadWithoutContentBlockers(WKPageRef page);
WK_EXPORT void WKPageReloadFromOrigin(WKPageRef page);
WK_EXPORT bool WKPageTryClose(WKPageRef page);
- (void)reload
{
- _page->reload(false);
+ const bool reloadFromOrigin = false;
+ const bool contentBlockersEnabled = true;
+ _page->reload(reloadFromOrigin, contentBlockersEnabled);
}
- (void)reloadFromOrigin
{
- _page->reload(true);
+ const bool reloadFromOrigin = true;
+ const bool contentBlockersEnabled = true;
+ _page->reload(reloadFromOrigin, contentBlockersEnabled);
}
- (NSString *)applicationNameForUserAgent
- (WKNavigation *)reload
{
- auto navigation = _page->reload(false);
+ const bool reloadFromOrigin = false;
+ const bool contentBlockersEnabled = true;
+ auto navigation = _page->reload(reloadFromOrigin, contentBlockersEnabled);
if (!navigation)
return nil;
- (WKNavigation *)reloadFromOrigin
{
- auto navigation = _page->reload(true);
+ const bool reloadFromOrigin = true;
+ const bool contentBlockersEnabled = true;
+ auto navigation = _page->reload(reloadFromOrigin, contentBlockersEnabled);
if (!navigation)
return nil;
- (void)_setUserContentExtensionsEnabled:(BOOL)userContentExtensionsEnabled
{
- _page->setUserContentExtensionsEnabled(userContentExtensionsEnabled);
+ // This is kept for binary compatibility with iOS 9.
}
- (BOOL)_userContentExtensionsEnabled
{
- return _page->userContentExtensionsEnabled();
+ // This is kept for binary compatibility with iOS 9.
+ return true;
}
- (pid_t)_webProcessIdentifier
_page->process().terminate();
}
+- (WKNavigation *)_reloadWithoutContentBlockers
+{
+ const bool reloadFromOrigin = false;
+ const bool contentBlockersEnabled = false;
+ auto navigation = _page->reload(reloadFromOrigin, contentBlockersEnabled);
+ if (!navigation)
+ return nil;
+
+ return [wrapper(*navigation.release().leakRef()) autorelease];
+}
+
- (void)_killWebContentProcessAndResetState
{
_page->terminateProcess();
- (id)_immediateActionAnimationControllerForHitTestResult:(_WKHitTestResult *)hitTestResult withType:(_WKImmediateActionType)type userData:(id<NSSecureCoding>)userData;
#endif
+- (WKNavigation *)_reloadWithoutContentBlockers WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+
- (void)_killWebContentProcessAndResetState;
- (void)_getMainResourceDataWithCompletionHandler:(void (^)(NSData *, NSError *))completionHandler;
{
g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
- getPage(webView)->reload(false);
+ const bool reloadFromOrigin = false;
+ const bool contentBlockersEnabled = true;
+ getPage(webView)->reload(reloadFromOrigin, contentBlockersEnabled);
}
/**
{
g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
- getPage(webView)->reload(true);
+ const bool reloadFromOrigin = true;
+ const bool contentBlockersEnabled = true;
+ getPage(webView)->reload(reloadFromOrigin, contentBlockersEnabled);
}
/**
RefPtr<WebPageProxy> page { m_page };
ASSERT(page);
m_contentFilterUnblockHandler.requestUnblockAsync([page](bool unblocked) {
- if (unblocked)
- page->reload(false);
+ if (unblocked) {
+ const bool reloadFromOrigin = false;
+ const bool contentBlockersEnabled = true;
+ page->reload(reloadFromOrigin, contentBlockersEnabled);
+ }
});
return true;
}
m_process->responsivenessTimer()->start();
}
-RefPtr<API::Navigation> WebPageProxy::reload(bool reloadFromOrigin)
+RefPtr<API::Navigation> WebPageProxy::reload(bool reloadFromOrigin, bool contentBlockersEnabled)
{
SandboxExtension::Handle sandboxExtensionHandle;
auto navigation = m_navigationState->createReloadNavigation();
- m_process->send(Messages::WebPage::Reload(navigation->navigationID(), reloadFromOrigin, sandboxExtensionHandle), m_pageID);
+ m_process->send(Messages::WebPage::Reload(navigation->navigationID(), reloadFromOrigin, contentBlockersEnabled, sandboxExtensionHandle), m_pageID);
m_process->responsivenessTimer()->start();
return WTF::move(navigation);
parameters.appleMailPaginationQuirkEnabled = false;
#endif
parameters.shouldScaleViewToFitDocument = m_shouldScaleViewToFitDocument;
- parameters.userContentExtensionsEnabled = m_userContentExtensionsEnabled;
return parameters;
}
m_process->send(Messages::WebPage::SetShouldScaleViewToFitDocument(shouldScaleViewToFitDocument), m_pageID);
}
-void WebPageProxy::setUserContentExtensionsEnabled(bool userContentExtensionsEnabled)
-{
- if (m_userContentExtensionsEnabled == userContentExtensionsEnabled)
- return;
-
- m_userContentExtensionsEnabled = userContentExtensionsEnabled;
-
- if (!isValid())
- return;
-
- m_process->send(Messages::WebPage::SetUserContentExtensionsEnabled(userContentExtensionsEnabled), m_pageID);
-}
-
} // namespace WebKit
void navigateToPDFLinkWithSimulatedClick(const String& url, WebCore::IntPoint documentPoint, WebCore::IntPoint screenPoint);
void stopLoading();
- RefPtr<API::Navigation> reload(bool reloadFromOrigin);
+ RefPtr<API::Navigation> reload(bool reloadFromOrigin, bool contentBlockersEnabled);
RefPtr<API::Navigation> goForward();
RefPtr<API::Navigation> goBack();
void scaleView(double scale);
void setShouldScaleViewToFitDocument(bool);
- bool userContentExtensionsEnabled() { return m_userContentExtensionsEnabled; }
- void setUserContentExtensionsEnabled(bool);
-
float deviceScaleFactor() const;
void setIntrinsicDeviceScaleFactor(float);
void setCustomDeviceScaleFactor(float);
bool m_requiresTargetMonitoring { false };
#endif
- bool m_userContentExtensionsEnabled { true };
-
#if PLATFORM(IOS)
bool m_hasDeferredStartAssistingNode { false };
std::unique_ptr<NodeAssistanceArguments> m_deferredNodeAssistanceArguments;
if (parameters.viewScaleFactor != 1)
scaleView(parameters.viewScaleFactor);
- m_page->setUserContentExtensionsEnabled(parameters.userContentExtensionsEnabled);
-
#if PLATFORM(IOS)
m_page->settings().setContentDispositionAttachmentSandboxEnabled(true);
#endif
m_page->setDefersLoading(defersLoading);
}
-void WebPage::reload(uint64_t navigationID, bool reloadFromOrigin, const SandboxExtension::Handle& sandboxExtensionHandle)
+void WebPage::reload(uint64_t navigationID, bool reloadFromOrigin, bool contentBlockersEnabled, const SandboxExtension::Handle& sandboxExtensionHandle)
{
SendStopResponsivenessTimer stopper(this);
m_pendingNavigationID = navigationID;
m_sandboxExtensionTracker.beginLoad(m_mainFrame.get(), sandboxExtensionHandle);
- corePage()->userInputBridge().reloadFrame(m_mainFrame->coreFrame(), reloadFromOrigin);
+ corePage()->userInputBridge().reloadFrame(m_mainFrame->coreFrame(), reloadFromOrigin, contentBlockersEnabled);
}
void WebPage::goForward(uint64_t navigationID, uint64_t backForwardItemID)
documentLoader->setNavigationID(m_pendingNavigationID);
m_pendingNavigationID = 0;
}
- if (frame.page())
- documentLoader->setUserContentExtensionsEnabled(frame.page()->userContentExtensionsEnabled());
}
return WTF::move(documentLoader);
m_drawingArea->setShouldScaleViewToFitDocument(shouldScaleViewToFitDocument);
}
-void WebPage::setUserContentExtensionsEnabled(bool userContentExtensionsEnabled)
-{
- if (!m_page)
- return;
-
- m_page->setUserContentExtensionsEnabled(userContentExtensionsEnabled);
-}
-
void WebPage::imageOrMediaDocumentSizeChanged(const IntSize& newSize)
{
send(Messages::WebPageProxy::ImageOrMediaDocumentSizeChanged(newSize));
void loadPlainTextString(const String&, const UserData&);
void loadWebArchiveData(const IPC::DataReference&, const UserData&);
void navigateToPDFLinkWithSimulatedClick(const String& url, WebCore::IntPoint documentPoint, WebCore::IntPoint screenPoint);
- void reload(uint64_t navigationID, bool reloadFromOrigin, const SandboxExtension::Handle&);
+ void reload(uint64_t navigationID, bool reloadFromOrigin, bool contentBlockersEnabled, const SandboxExtension::Handle&);
void goForward(uint64_t navigationID, uint64_t);
void goBack(uint64_t navigationID, uint64_t);
void goToBackForwardItem(uint64_t navigationID, uint64_t);
void clearWheelEventTestTrigger();
void setShouldScaleViewToFitDocument(bool);
- void setUserContentExtensionsEnabled(bool);
void pageStoppedScrolling();
LoadWebArchiveData(IPC::DataReference webArchiveData, WebKit::UserData userData)
NavigateToPDFLinkWithSimulatedClick(String url, WebCore::IntPoint documentPoint, WebCore::IntPoint screenPoint)
- Reload(uint64_t navigationID, bool reloadFromOrigin, WebKit::SandboxExtension::Handle sandboxExtensionHandle)
+ Reload(uint64_t navigationID, bool reloadFromOrigin, bool contentBlockersEnabled, WebKit::SandboxExtension::Handle sandboxExtensionHandle)
StopLoading()
StopLoadingFrame(uint64_t frameID)
ClearWheelEventTestTrigger()
SetShouldScaleViewToFitDocument(bool shouldScaleViewToFitDocument)
- SetUserContentExtensionsEnabled(bool userContentExtensionsEnabled)
#if ENABLE(VIDEO) && USE(GSTREAMER)
DidEndRequestInstallMissingMediaPlugins(uint32_t result)
+2015-10-14 Alex Christensen <achristensen@webkit.org>
+
+ Add SPI for reloading without content blockers
+ https://bugs.webkit.org/show_bug.cgi?id=150058
+ rdar://problem/22742222
+
+ Reviewed by Sam Weinig.
+
+ * WebKitTestRunner/cocoa/TestControllerCocoa.mm:
+ (WTR::TestController::cocoaResetStateToConsistentValues):
+ * WebKitTestRunner/mac/TestControllerMac.mm:
+ (WTR::TestController::platformConfigureViewForTest):
+
2015-10-14 Mark Lam <mark.lam@apple.com>
Rename some JSC option names to be more uniform.
platformRunUntil(doneRemoving, 0);
[[_WKUserContentExtensionStore defaultStore] _removeAllContentExtensions];
- if (PlatformWebView* webView = mainWebView()) {
+ if (PlatformWebView* webView = mainWebView())
[webView->platformView().configuration.userContentController _removeAllUserContentFilters];
- webView->platformView()._userContentExtensionsEnabled = true;
- }
#endif
}
doneCompiling = true;
}];
platformRunUntil(doneCompiling, 0);
-
- // This is for http/tests/contentextensions/disable-blocker.html
- if (!test.urlContains("disable-blocker"))
- return;
- mainWebView()->platformView()._userContentExtensionsEnabled = false;
#endif
}
git://git.webkit.org / WebKit-https.git / commitdiff