Changeset 191063 in webkit


Ignore:
Timestamp:
Oct 14, 2015 1:03:14 PM (9 years ago)
Author:
achristensen@apple.com
Message:

Add SPI for reloading without content blockers
​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.

Location:
trunk
Files:
3 deleted
25 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r191048 r191063  
     12015-10-14  Alex Christensen  <achristensen@webkit.org>
     2
     3        Add SPI for reloading without content blockers
     4        https://bugs.webkit.org/show_bug.cgi?id=150058
     5        rdar://problem/22742222
     6
     7        Reviewed by Sam Weinig.
     8
     9        * http/tests/contentextensions/disable-blocker-expected.txt: Removed.
     10        * http/tests/contentextensions/disable-blocker.html: Removed.
     11        * http/tests/contentextensions/disable-blocker.html.json: Removed.
     12        _userContentExtensionsEnabled is going to be removed, and its functionality is what this test tested.
     13
    1142015-10-14  Said Abou-Hallawa  <sabouhallawa@apple.com>
    215

  • trunk/Source/WebCore/ChangeLog

    r191060 r191063  
     12015-10-14  Alex Christensen  <achristensen@webkit.org>
     2
     3        Add SPI for reloading without content blockers
     4        https://bugs.webkit.org/show_bug.cgi?id=150058
     5        rdar://problem/22742222
     6
     7        Reviewed by Sam Weinig.
     8
     9        * loader/FrameLoader.cpp:
     10        (WebCore::FrameLoader::reloadWithOverrideEncoding):
     11        (WebCore::FrameLoader::reload):
     12        * loader/FrameLoader.h:
     13        * page/Page.h:
     14        (WebCore::Page::userContentController):
     15        (WebCore::Page::userContentExtensionsEnabled): Deleted.
     16        (WebCore::Page::setUserContentExtensionsEnabled): Deleted.
     17        * replay/UserInputBridge.cpp:
     18        (WebCore::UserInputBridge::loadRequest):
     19        (WebCore::UserInputBridge::reloadFrame):
     20        (WebCore::UserInputBridge::stopLoadingFrame):
     21        * replay/UserInputBridge.h:
     22        Pass a bool from the reloadWithoutContentBlockers call to the DocumentLoader,
     23        which stores the state of whether the content blockers are enabled or not.
     24        Remove the state from the Page and copying the state from the Page to the DocumentLoader
     25        because that caused issues with the content blockers being re-enabled at the wrong time.
     26
    1272015-10-14  Youenn Fablet  <youenn.fablet@crf.canon.fr>
    228

  • trunk/Source/WebCore/loader/FrameLoader.cpp

    r190611 r191063  
    15651565}
    15661566
    1567 void FrameLoader::reload(bool endToEndReload)
     1567void FrameLoader::reload(bool endToEndReload, bool contentBlockersEnabled)
    15681568{
    15691569    if (!m_documentLoader)
    … …  
    15861586    applyShouldOpenExternalURLsPolicyToNewDocumentLoader(loader, m_documentLoader->shouldOpenExternalURLsPolicyToPropagate());
    15871587
     1588    loader->setUserContentExtensionsEnabled(contentBlockersEnabled);
     1589   
    15881590    ResourceRequest& request = loader->request();
    15891591

  • trunk/Source/WebCore/loader/FrameLoader.h

    r190611 r191063  
    124124    void submitForm(PassRefPtr<FormSubmission>);
    125125
    126     WEBCORE_EXPORT void reload(bool endToEndReload = false);
     126    WEBCORE_EXPORT void reload(bool endToEndReload = false, bool contentBlockersEnabled = true);
    127127    WEBCORE_EXPORT void reloadWithOverrideEncoding(const String& overrideEncoding);
    128128

  • trunk/Source/WebCore/page/Page.h

    r190291 r191063  
    429429    WEBCORE_EXPORT void setUserContentController(UserContentController*);
    430430
    431     bool userContentExtensionsEnabled() const { return m_userContentExtensionsEnabled; }
    432     void setUserContentExtensionsEnabled(bool enabled) { m_userContentExtensionsEnabled = enabled; }
    433 
    434431    VisitedLinkStore& visitedLinkStore();
    435432    WEBCORE_EXPORT void setVisitedLinkStore(Ref<VisitedLinkStore>&&);
    … …  
    637634    MediaProducer::MediaStateFlags m_mediaState { MediaProducer::IsNotPlaying };
    638635   
    639     bool m_userContentExtensionsEnabled { true };
    640636    bool m_allowsMediaDocumentInlinePlayback { false };
    641637};

  • trunk/Source/WebCore/replay/UserInputBridge.cpp

    r182963 r191063  
    243243}
    244244
    245 void UserInputBridge::reloadFrame(Frame* frame, bool endToEndReload, InputSource)
    246 {
    247     frame->loader().reload(endToEndReload);
     245void UserInputBridge::reloadFrame(Frame* frame, bool endToEndReload, bool contentBlockersEnabled, InputSource)
     246{
     247    frame->loader().reload(endToEndReload, contentBlockersEnabled);
    248248}
    249249

  • trunk/Source/WebCore/replay/UserInputBridge.h

    r182963 r191063  
    9090    // Navigation APIs.
    9191    WEBCORE_EXPORT void loadRequest(const FrameLoadRequest&, InputSource source = InputSource::User);
    92     WEBCORE_EXPORT void reloadFrame(Frame*, bool endToEndReload, InputSource source = InputSource::User);
     92    WEBCORE_EXPORT void reloadFrame(Frame*, bool endToEndReload, bool contentBlockersEnabled, InputSource = InputSource::User);
    9393    WEBCORE_EXPORT void stopLoadingFrame(Frame*, InputSource source = InputSource::User);
    9494    WEBCORE_EXPORT bool tryClosePage(InputSource source = InputSource::User);

  • trunk/Source/WebKit2/ChangeLog

    r191049 r191063  
     12015-10-14  Alex Christensen  <achristensen@webkit.org>
     2
     3        Add SPI for reloading without content blockers
     4        https://bugs.webkit.org/show_bug.cgi?id=150058
     5        rdar://problem/22742222
     6
     7        Reviewed by Sam Weinig.
     8
     9        * Shared/WebPageCreationParameters.cpp:
     10        (WebKit::WebPageCreationParameters::encode):
     11        (WebKit::WebPageCreationParameters::decode):
     12        * Shared/WebPageCreationParameters.h:
     13        * UIProcess/API/C/WKPage.cpp:
     14        (WKPageReload):
     15        (WKPageReloadWithoutContentBlockers):
     16        (WKPageReloadFromOrigin):
     17        (WKPageTryClose):
     18        (WKPageSetUserContentExtensionsEnabled):
     19        (WKPageSupportsTextEncoding):
     20        * UIProcess/API/C/WKPage.h:
     21        * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
     22        (-[WKBrowsingContextController reload]):
     23        (-[WKBrowsingContextController reloadFromOrigin]):
     24        (-[WKBrowsingContextController applicationNameForUserAgent]):
     25        * UIProcess/API/Cocoa/WKWebView.mm:
     26        (-[WKWebView reload]):
     27        (-[WKWebView reloadFromOrigin]):
     28        (-[WKWebView _setUserContentExtensionsEnabled:]):
     29        (-[WKWebView _userContentExtensionsEnabled]):
     30        (-[WKWebView _webProcessIdentifier]):
     31        (-[WKWebView _killWebContentProcess]):
     32        (-[WKWebView _reloadWithoutContentBlockers]):
     33        (-[WKWebView _killWebContentProcessAndResetState]):
     34        * UIProcess/API/Cocoa/WKWebViewPrivate.h:
     35        * UIProcess/API/gtk/WebKitWebView.cpp:
     36        (webkit_web_view_reload):
     37        (webkit_web_view_reload_bypass_cache):
     38        * UIProcess/WebFrameProxy.cpp:
     39        (WebKit::WebFrameProxy::didHandleContentFilterUnblockNavigation):
     40        * UIProcess/WebPageProxy.cpp:
     41        (WebKit::WebPageProxy::stopLoading):
     42        (WebKit::WebPageProxy::reload):
     43        (WebKit::WebPageProxy::creationParameters):
     44        (WebKit::WebPageProxy::setShouldScaleViewToFitDocument):
     45        (WebKit::WebPageProxy::setUserContentExtensionsEnabled): Deleted.
     46        * UIProcess/WebPageProxy.h:
     47        (WebKit::WebPageProxy::userContentExtensionsEnabled): Deleted.
     48        * WebProcess/WebPage/WebPage.cpp:
     49        (WebKit::m_shouldDispatchFakeMouseMoveEvents):
     50        (WebKit::WebPage::setDefersLoading):
     51        (WebKit::WebPage::reload):
     52        (WebKit::WebPage::goForward):
     53        (WebKit::WebPage::createDocumentLoader):
     54        (WebKit::WebPage::setShouldScaleViewToFitDocument):
     55        (WebKit::WebPage::imageOrMediaDocumentSizeChanged):
     56        (WebKit::WebPage::setUserContentExtensionsEnabled): Deleted.
     57        * WebProcess/WebPage/WebPage.h:
     58        * WebProcess/WebPage/WebPage.messages.in:
     59
    1602015-10-14  Simon Fraser  <simon.fraser@apple.com>
    261

  • trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp

    r185840 r191063  
    8585    encoder << appleMailPaginationQuirkEnabled;
    8686    encoder << shouldScaleViewToFitDocument;
    87     encoder << userContentExtensionsEnabled;
    8887}
    8988
    … …  
    190189        return false;
    191190
    192     if (!decoder.decode(parameters.userContentExtensionsEnabled))
    193         return false;
    194 
    195191    return true;
    196192}

  • trunk/Source/WebKit2/Shared/WebPageCreationParameters.h

    r185840 r191063  
    131131    bool appleMailPaginationQuirkEnabled;
    132132    bool shouldScaleViewToFitDocument;
    133     bool userContentExtensionsEnabled;
    134133};
    135134

  • trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp

    r190823 r191063  
    229229void WKPageReload(WKPageRef pageRef)
    230230{
    231     toImpl(pageRef)->reload(false);
     231    const bool reloadFromOrigin = false;
     232    const bool contentBlockersEnabled = true;
     233    toImpl(pageRef)->reload(reloadFromOrigin, contentBlockersEnabled);
     234}
     235
     236void WKPageReloadWithoutContentBlockers(WKPageRef pageRef)
     237{
     238    const bool reloadFromOrigin = false;
     239    const bool contentBlockersEnabled = false;
     240    toImpl(pageRef)->reload(reloadFromOrigin, contentBlockersEnabled);
    232241}
    233242
    234243void WKPageReloadFromOrigin(WKPageRef pageRef)
    235244{
    236     toImpl(pageRef)->reload(true);
     245    const bool reloadFromOrigin = true;
     246    const bool contentBlockersEnabled = true;
     247    toImpl(pageRef)->reload(reloadFromOrigin, contentBlockersEnabled);
    237248}
    238249
    … …  
    364375void WKPageSetUserContentExtensionsEnabled(WKPageRef pageRef, bool enabled)
    365376{
    366     toImpl(pageRef)->setUserContentExtensionsEnabled(enabled);
     377    // FIXME: Remove this function once it is no longer used.
    367378}
    368379

  • trunk/Source/WebKit2/UIProcess/API/C/WKPage.h

    r188228 r191063  
    8484WK_EXPORT void WKPageStopLoading(WKPageRef page);
    8585WK_EXPORT void WKPageReload(WKPageRef page);
     86WK_EXPORT void WKPageReloadWithoutContentBlockers(WKPageRef page);
    8687WK_EXPORT void WKPageReloadFromOrigin(WKPageRef page);
    8788

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm

    r191013 r191063  
    188188- (void)reload
    189189{
    190     _page->reload(false);
     190    const bool reloadFromOrigin = false;
     191    const bool contentBlockersEnabled = true;
     192    _page->reload(reloadFromOrigin, contentBlockersEnabled);
    191193}
    192194
    193195- (void)reloadFromOrigin
    194196{
    195     _page->reload(true);
     197    const bool reloadFromOrigin = true;
     198    const bool contentBlockersEnabled = true;
     199    _page->reload(reloadFromOrigin, contentBlockersEnabled);
    196200}
    197201

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

    r190841 r191063  
    564564- (WKNavigation *)reload
    565565{
    566     auto navigation = _page->reload(false);
     566    const bool reloadFromOrigin = false;
     567    const bool contentBlockersEnabled = true;
     568    auto navigation = _page->reload(reloadFromOrigin, contentBlockersEnabled);
    567569    if (!navigation)
    568570        return nil;
    … …  
    573575- (WKNavigation *)reloadFromOrigin
    574576{
    575     auto navigation = _page->reload(true);
     577    const bool reloadFromOrigin = true;
     578    const bool contentBlockersEnabled = true;
     579    auto navigation = _page->reload(reloadFromOrigin, contentBlockersEnabled);
    576580    if (!navigation)
    577581        return nil;
    … …  
    20272031- (void)_setUserContentExtensionsEnabled:(BOOL)userContentExtensionsEnabled
    20282032{
    2029     _page->setUserContentExtensionsEnabled(userContentExtensionsEnabled);
     2033    // This is kept for binary compatibility with iOS 9.
    20302034}
    20312035
    20322036- (BOOL)_userContentExtensionsEnabled
    20332037{
    2034     return _page->userContentExtensionsEnabled();
     2038    // This is kept for binary compatibility with iOS 9.
     2039    return true;
    20352040}
    20362041
    … …  
    20462051
    20472052    _page->process().terminate();
     2053}
     2054
     2055- (WKNavigation *)_reloadWithoutContentBlockers
     2056{
     2057    const bool reloadFromOrigin = false;
     2058    const bool contentBlockersEnabled = false;
     2059    auto navigation = _page->reload(reloadFromOrigin, contentBlockersEnabled);
     2060    if (!navigation)
     2061        return nil;
     2062   
     2063    return [wrapper(*navigation.release().leakRef()) autorelease];
    20482064}
    20492065

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h

    r190823 r191063  
    188188#endif
    189189
     190- (WKNavigation *)_reloadWithoutContentBlockers WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
     191
    190192- (void)_killWebContentProcessAndResetState;
    191193

  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp

    r190823 r191063  
    24752475    g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
    24762476
    2477     getPage(webView)->reload(false);
     2477    const bool reloadFromOrigin = false;
     2478    const bool contentBlockersEnabled = true;
     2479    getPage(webView)->reload(reloadFromOrigin, contentBlockersEnabled);
    24782480}
    24792481
    … …  
    24892491    g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
    24902492
    2491     getPage(webView)->reload(true);
     2493    const bool reloadFromOrigin = true;
     2494    const bool contentBlockersEnabled = true;
     2495    getPage(webView)->reload(reloadFromOrigin, contentBlockersEnabled);
    24922496}
    24932497

  • trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp

    r188011 r191063  
    248248    ASSERT(page);
    249249    m_contentFilterUnblockHandler.requestUnblockAsync([page](bool unblocked) {
    250         if (unblocked)
    251             page->reload(false);
     250        if (unblocked) {
     251            const bool reloadFromOrigin = false;
     252            const bool contentBlockersEnabled = true;
     253            page->reload(reloadFromOrigin, contentBlockersEnabled);
     254        }
    252255    });
    253256    return true;

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r190823 r191063  
    10491049}
    10501050
    1051 RefPtr<API::Navigation> WebPageProxy::reload(bool reloadFromOrigin)
     1051RefPtr<API::Navigation> WebPageProxy::reload(bool reloadFromOrigin, bool contentBlockersEnabled)
    10521052{
    10531053    SandboxExtension::Handle sandboxExtensionHandle;
    … …  
    10691069    auto navigation = m_navigationState->createReloadNavigation();
    10701070
    1071     m_process->send(Messages::WebPage::Reload(navigation->navigationID(), reloadFromOrigin, sandboxExtensionHandle), m_pageID);
     1071    m_process->send(Messages::WebPage::Reload(navigation->navigationID(), reloadFromOrigin, contentBlockersEnabled, sandboxExtensionHandle), m_pageID);
    10721072    m_process->responsivenessTimer()->start();
    10731073
    … …  
    51685168#endif
    51695169    parameters.shouldScaleViewToFitDocument = m_shouldScaleViewToFitDocument;
    5170     parameters.userContentExtensionsEnabled = m_userContentExtensionsEnabled;
    51715170
    51725171    return parameters;
    … …  
    61046103}
    61056104
    6106 void WebPageProxy::setUserContentExtensionsEnabled(bool userContentExtensionsEnabled)
    6107 {
    6108     if (m_userContentExtensionsEnabled == userContentExtensionsEnabled)
    6109         return;
    6110 
    6111     m_userContentExtensionsEnabled = userContentExtensionsEnabled;
    6112 
    6113     if (!isValid())
    6114         return;
    6115 
    6116     m_process->send(Messages::WebPage::SetUserContentExtensionsEnabled(userContentExtensionsEnabled), m_pageID);
    6117 }
    6118 
    61196105} // namespace WebKit

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.h

    r190823 r191063  
    363363
    364364    void stopLoading();
    365     RefPtr<API::Navigation> reload(bool reloadFromOrigin);
     365    RefPtr<API::Navigation> reload(bool reloadFromOrigin, bool contentBlockersEnabled);
    366366
    367367    RefPtr<API::Navigation> goForward();
    … …  
    651651    void setShouldScaleViewToFitDocument(bool);
    652652   
    653     bool userContentExtensionsEnabled() { return m_userContentExtensionsEnabled; }
    654     void setUserContentExtensionsEnabled(bool);
    655 
    656653    float deviceScaleFactor() const;
    657654    void setIntrinsicDeviceScaleFactor(float);
    … …  
    17711768#endif
    17721769
    1773     bool m_userContentExtensionsEnabled { true };
    1774 
    17751770#if PLATFORM(IOS)
    17761771    bool m_hasDeferredStartAssistingNode { false };

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

    r190998 r191063  
    521521        scaleView(parameters.viewScaleFactor);
    522522
    523     m_page->setUserContentExtensionsEnabled(parameters.userContentExtensionsEnabled);
    524 
    525523#if PLATFORM(IOS)
    526524    m_page->settings().setContentDispositionAttachmentSandboxEnabled(true);
    … …  
    11651163}
    11661164
    1167 void WebPage::reload(uint64_t navigationID, bool reloadFromOrigin, const SandboxExtension::Handle& sandboxExtensionHandle)
     1165void WebPage::reload(uint64_t navigationID, bool reloadFromOrigin, bool contentBlockersEnabled, const SandboxExtension::Handle& sandboxExtensionHandle)
    11681166{
    11691167    SendStopResponsivenessTimer stopper(this);
    … …  
    11731171
    11741172    m_sandboxExtensionTracker.beginLoad(m_mainFrame.get(), sandboxExtensionHandle);
    1175     corePage()->userInputBridge().reloadFrame(m_mainFrame->coreFrame(), reloadFromOrigin);
     1173    corePage()->userInputBridge().reloadFrame(m_mainFrame->coreFrame(), reloadFromOrigin, contentBlockersEnabled);
    11761174}
    11771175
    … …  
    49044902            m_pendingNavigationID = 0;
    49054903        }
    4906         if (frame.page())
    4907             documentLoader->setUserContentExtensionsEnabled(frame.page()->userContentExtensionsEnabled());
    49084904    }
    49094905
    … …  
    50065002}
    50075003
    5008 void WebPage::setUserContentExtensionsEnabled(bool userContentExtensionsEnabled)
    5009 {
    5010     if (!m_page)
    5011         return;
    5012 
    5013     m_page->setUserContentExtensionsEnabled(userContentExtensionsEnabled);
    5014 }
    5015 
    50165004void WebPage::imageOrMediaDocumentSizeChanged(const IntSize& newSize)
    50175005{

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

    r190604 r191063  
    983983    void loadWebArchiveData(const IPC::DataReference&, const UserData&);
    984984    void navigateToPDFLinkWithSimulatedClick(const String& url, WebCore::IntPoint documentPoint, WebCore::IntPoint screenPoint);
    985     void reload(uint64_t navigationID, bool reloadFromOrigin, const SandboxExtension::Handle&);
     985    void reload(uint64_t navigationID, bool reloadFromOrigin, bool contentBlockersEnabled, const SandboxExtension::Handle&);
    986986    void goForward(uint64_t navigationID, uint64_t);
    987987    void goBack(uint64_t navigationID, uint64_t);
    … …  
    11611161
    11621162    void setShouldScaleViewToFitDocument(bool);
    1163     void setUserContentExtensionsEnabled(bool);
    11641163
    11651164    void pageStoppedScrolling();

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in

    r190604 r191063  
    133133    NavigateToPDFLinkWithSimulatedClick(String url, WebCore::IntPoint documentPoint, WebCore::IntPoint screenPoint)
    134134
    135     Reload(uint64_t navigationID, bool reloadFromOrigin, WebKit::SandboxExtension::Handle sandboxExtensionHandle)
     135    Reload(uint64_t navigationID, bool reloadFromOrigin, bool contentBlockersEnabled, WebKit::SandboxExtension::Handle sandboxExtensionHandle)
    136136    StopLoading()
    137137
    … …  
    429429    ClearWheelEventTestTrigger()
    430430    SetShouldScaleViewToFitDocument(bool shouldScaleViewToFitDocument)
    431     SetUserContentExtensionsEnabled(bool userContentExtensionsEnabled)
    432431
    433432#if ENABLE(VIDEO) && USE(GSTREAMER)

  • trunk/Tools/ChangeLog

    r191058 r191063  
     12015-10-14  Alex Christensen  <achristensen@webkit.org>
     2
     3        Add SPI for reloading without content blockers
     4        https://bugs.webkit.org/show_bug.cgi?id=150058
     5        rdar://problem/22742222
     6
     7        Reviewed by Sam Weinig.
     8
     9        * WebKitTestRunner/cocoa/TestControllerCocoa.mm:
     10        (WTR::TestController::cocoaResetStateToConsistentValues):
     11        * WebKitTestRunner/mac/TestControllerMac.mm:
     12        (WTR::TestController::platformConfigureViewForTest):
     13
    1142015-10-14  Mark Lam  <mark.lam@apple.com>
    215

  • trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm

    r190510 r191063  
    121121    [[_WKUserContentExtensionStore defaultStore] _removeAllContentExtensions];
    122122
    123     if (PlatformWebView* webView = mainWebView()) {
     123    if (PlatformWebView* webView = mainWebView())
    124124        [webView->platformView().configuration.userContentController _removeAllUserContentFilters];
    125         webView->platformView()._userContentExtensionsEnabled = true;
    126     }
    127125#endif
    128126}

  • trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm

    r190848 r191063  
    124124    }];
    125125    platformRunUntil(doneCompiling, 0);
    126 
    127     // This is for http/tests/contentextensions/disable-blocker.html
    128     if (!test.urlContains("disable-blocker"))
    129         return;
    130     mainWebView()->platformView()._userContentExtensionsEnabled = false;
    131126#endif
    132127}
Note: See TracChangeset for help on using the changeset viewer.