Changeset 162673 in webkit


Ignore:
Timestamp:
Jan 23, 2014 6:20:08 PM (10 years ago)
Author:
andersca@apple.com
Message:

Simplify API::LoaderClient management
https://bugs.webkit.org/show_bug.cgi?id=127531

Reviewed by Tim Horton.

Add default implementations to API::LoaderClient and change WebPageProxy::setLoaderClient to
always create a policy client, even if the loader client set is null. That way we don't have to null
check the loader client everywhere.

  • UIProcess/API/APILoaderClient.h:

(API::LoaderClient::didStartProvisionalLoadForFrame):
(API::LoaderClient::didReceiveServerRedirectForProvisionalLoadForFrame):
(API::LoaderClient::didFailProvisionalLoadWithErrorForFrame):
(API::LoaderClient::didCommitLoadForFrame):
(API::LoaderClient::didFinishDocumentLoadForFrame):
(API::LoaderClient::didFinishLoadForFrame):
(API::LoaderClient::didFailLoadWithErrorForFrame):
(API::LoaderClient::didSameDocumentNavigationForFrame):
(API::LoaderClient::didReceiveTitleForFrame):
(API::LoaderClient::didFirstLayoutForFrame):
(API::LoaderClient::didFirstVisuallyNonEmptyLayoutForFrame):
(API::LoaderClient::didRemoveFrameFromHierarchy):
(API::LoaderClient::didDisplayInsecureContentForFrame):
(API::LoaderClient::didRunInsecureContentForFrame):
(API::LoaderClient::didDetectXSSForFrame):
(API::LoaderClient::didLayout):
(API::LoaderClient::canAuthenticateAgainstProtectionSpaceInFrame):
(API::LoaderClient::didReceiveAuthenticationChallengeInFrame):
(API::LoaderClient::didStartProgress):
(API::LoaderClient::didChangeProgress):
(API::LoaderClient::didFinishProgress):
(API::LoaderClient::processDidBecomeUnresponsive):
(API::LoaderClient::interactionOccurredWhileProcessUnresponsive):
(API::LoaderClient::processDidBecomeResponsive):
(API::LoaderClient::processDidCrash):
(API::LoaderClient::didChangeBackForwardList):
(API::LoaderClient::willGoToBackForwardListItem):
(API::LoaderClient::pluginLoadPolicy):
(API::LoaderClient::didFailToInitializePlugin):
(API::LoaderClient::didBlockInsecurePluginVersion):
(API::LoaderClient::webGLLoadPolicy):

  • UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::setLoaderClient):
(WebKit::WebPageProxy::didChangeBackForwardList):
(WebKit::WebPageProxy::willGoToBackForwardListItem):
(WebKit::WebPageProxy::findPlugin):
(WebKit::WebPageProxy::didStartProgress):
(WebKit::WebPageProxy::didChangeProgress):
(WebKit::WebPageProxy::didFinishProgress):
(WebKit::WebPageProxy::didStartProvisionalLoadForFrame):
(WebKit::WebPageProxy::didReceiveServerRedirectForProvisionalLoadForFrame):
(WebKit::WebPageProxy::didFailProvisionalLoadForFrame):
(WebKit::WebPageProxy::didCommitLoadForFrame):
(WebKit::WebPageProxy::didFinishDocumentLoadForFrame):
(WebKit::WebPageProxy::didFinishLoadForFrame):
(WebKit::WebPageProxy::didFailLoadForFrame):
(WebKit::WebPageProxy::didSameDocumentNavigationForFrame):
(WebKit::WebPageProxy::didReceiveTitleForFrame):
(WebKit::WebPageProxy::didFirstLayoutForFrame):
(WebKit::WebPageProxy::didFirstVisuallyNonEmptyLayoutForFrame):
(WebKit::WebPageProxy::didLayout):
(WebKit::WebPageProxy::didRemoveFrameFromHierarchy):
(WebKit::WebPageProxy::didDisplayInsecureContentForFrame):
(WebKit::WebPageProxy::didRunInsecureContentForFrame):
(WebKit::WebPageProxy::didDetectXSSForFrame):
(WebKit::WebPageProxy::webGLPolicyForURL):
(WebKit::WebPageProxy::processDidBecomeUnresponsive):
(WebKit::WebPageProxy::interactionOccurredWhileProcessUnresponsive):
(WebKit::WebPageProxy::processDidBecomeResponsive):
(WebKit::WebPageProxy::processDidCrash):
(WebKit::WebPageProxy::canAuthenticateAgainstProtectionSpaceInFrame):
(WebKit::WebPageProxy::didReceiveAuthenticationChallengeProxy):
(WebKit::WebPageProxy::didFailToInitializePlugin):
(WebKit::WebPageProxy::didBlockInsecurePluginVersion):

Location:
trunk/Source/WebKit2
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r162672 r162673  
     12014-01-23  Anders Carlsson  <andersca@apple.com>
     2
     3        Simplify API::LoaderClient management
     4        https://bugs.webkit.org/show_bug.cgi?id=127531
     5
     6        Reviewed by Tim Horton.
     7
     8        Add default implementations to API::LoaderClient and change WebPageProxy::setLoaderClient to
     9        always create a policy client, even if the loader client set is null. That way we don't have to null
     10        check the loader client everywhere.
     11
     12        * UIProcess/API/APILoaderClient.h:
     13        (API::LoaderClient::didStartProvisionalLoadForFrame):
     14        (API::LoaderClient::didReceiveServerRedirectForProvisionalLoadForFrame):
     15        (API::LoaderClient::didFailProvisionalLoadWithErrorForFrame):
     16        (API::LoaderClient::didCommitLoadForFrame):
     17        (API::LoaderClient::didFinishDocumentLoadForFrame):
     18        (API::LoaderClient::didFinishLoadForFrame):
     19        (API::LoaderClient::didFailLoadWithErrorForFrame):
     20        (API::LoaderClient::didSameDocumentNavigationForFrame):
     21        (API::LoaderClient::didReceiveTitleForFrame):
     22        (API::LoaderClient::didFirstLayoutForFrame):
     23        (API::LoaderClient::didFirstVisuallyNonEmptyLayoutForFrame):
     24        (API::LoaderClient::didRemoveFrameFromHierarchy):
     25        (API::LoaderClient::didDisplayInsecureContentForFrame):
     26        (API::LoaderClient::didRunInsecureContentForFrame):
     27        (API::LoaderClient::didDetectXSSForFrame):
     28        (API::LoaderClient::didLayout):
     29        (API::LoaderClient::canAuthenticateAgainstProtectionSpaceInFrame):
     30        (API::LoaderClient::didReceiveAuthenticationChallengeInFrame):
     31        (API::LoaderClient::didStartProgress):
     32        (API::LoaderClient::didChangeProgress):
     33        (API::LoaderClient::didFinishProgress):
     34        (API::LoaderClient::processDidBecomeUnresponsive):
     35        (API::LoaderClient::interactionOccurredWhileProcessUnresponsive):
     36        (API::LoaderClient::processDidBecomeResponsive):
     37        (API::LoaderClient::processDidCrash):
     38        (API::LoaderClient::didChangeBackForwardList):
     39        (API::LoaderClient::willGoToBackForwardListItem):
     40        (API::LoaderClient::pluginLoadPolicy):
     41        (API::LoaderClient::didFailToInitializePlugin):
     42        (API::LoaderClient::didBlockInsecurePluginVersion):
     43        (API::LoaderClient::webGLLoadPolicy):
     44        * UIProcess/WebPageProxy.cpp:
     45        (WebKit::WebPageProxy::setLoaderClient):
     46        (WebKit::WebPageProxy::didChangeBackForwardList):
     47        (WebKit::WebPageProxy::willGoToBackForwardListItem):
     48        (WebKit::WebPageProxy::findPlugin):
     49        (WebKit::WebPageProxy::didStartProgress):
     50        (WebKit::WebPageProxy::didChangeProgress):
     51        (WebKit::WebPageProxy::didFinishProgress):
     52        (WebKit::WebPageProxy::didStartProvisionalLoadForFrame):
     53        (WebKit::WebPageProxy::didReceiveServerRedirectForProvisionalLoadForFrame):
     54        (WebKit::WebPageProxy::didFailProvisionalLoadForFrame):
     55        (WebKit::WebPageProxy::didCommitLoadForFrame):
     56        (WebKit::WebPageProxy::didFinishDocumentLoadForFrame):
     57        (WebKit::WebPageProxy::didFinishLoadForFrame):
     58        (WebKit::WebPageProxy::didFailLoadForFrame):
     59        (WebKit::WebPageProxy::didSameDocumentNavigationForFrame):
     60        (WebKit::WebPageProxy::didReceiveTitleForFrame):
     61        (WebKit::WebPageProxy::didFirstLayoutForFrame):
     62        (WebKit::WebPageProxy::didFirstVisuallyNonEmptyLayoutForFrame):
     63        (WebKit::WebPageProxy::didLayout):
     64        (WebKit::WebPageProxy::didRemoveFrameFromHierarchy):
     65        (WebKit::WebPageProxy::didDisplayInsecureContentForFrame):
     66        (WebKit::WebPageProxy::didRunInsecureContentForFrame):
     67        (WebKit::WebPageProxy::didDetectXSSForFrame):
     68        (WebKit::WebPageProxy::webGLPolicyForURL):
     69        (WebKit::WebPageProxy::processDidBecomeUnresponsive):
     70        (WebKit::WebPageProxy::interactionOccurredWhileProcessUnresponsive):
     71        (WebKit::WebPageProxy::processDidBecomeResponsive):
     72        (WebKit::WebPageProxy::processDidCrash):
     73        (WebKit::WebPageProxy::canAuthenticateAgainstProtectionSpaceInFrame):
     74        (WebKit::WebPageProxy::didReceiveAuthenticationChallengeProxy):
     75        (WebKit::WebPageProxy::didFailToInitializePlugin):
     76        (WebKit::WebPageProxy::didBlockInsecurePluginVersion):
     77
    1782014-01-23  Anders Carlsson  <andersca@apple.com>
    279
  • trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h

    r162670 r162673  
    5454    virtual ~LoaderClient() { }
    5555
    56     virtual void didStartProvisionalLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) = 0;
    57     virtual void didReceiveServerRedirectForProvisionalLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) = 0;
    58     virtual void didFailProvisionalLoadWithErrorForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebCore::ResourceError&, API::Object*) = 0;
    59     virtual void didCommitLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) = 0;
    60     virtual void didFinishDocumentLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) = 0;
    61     virtual void didFinishLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) = 0;
    62     virtual void didFailLoadWithErrorForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebCore::ResourceError&, API::Object*) = 0;
    63     virtual void didSameDocumentNavigationForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, WebKit::SameDocumentNavigationType, API::Object*) = 0;
    64     virtual void didReceiveTitleForFrame(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, API::Object*) = 0;
    65     virtual void didFirstLayoutForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) = 0;
     56    virtual void didStartProvisionalLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { }
     57    virtual void didReceiveServerRedirectForProvisionalLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { }
     58    virtual void didFailProvisionalLoadWithErrorForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebCore::ResourceError&, API::Object*) { }
     59    virtual void didCommitLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { }
     60    virtual void didFinishDocumentLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { }
     61    virtual void didFinishLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { }
     62    virtual void didFailLoadWithErrorForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebCore::ResourceError&, API::Object*) { }
     63    virtual void didSameDocumentNavigationForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, WebKit::SameDocumentNavigationType, API::Object*) { }
     64    virtual void didReceiveTitleForFrame(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, API::Object*) { }
     65    virtual void didFirstLayoutForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { }
    6666
    6767    // FIXME: We should consider removing didFirstVisuallyNonEmptyLayoutForFrame since it is replaced by didLayout.
    68     virtual void didFirstVisuallyNonEmptyLayoutForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) = 0;
     68    virtual void didFirstVisuallyNonEmptyLayoutForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { }
    6969
    70     virtual void didRemoveFrameFromHierarchy(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) = 0;
    71     virtual void didDisplayInsecureContentForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) = 0;
    72     virtual void didRunInsecureContentForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) = 0;
    73     virtual void didDetectXSSForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) = 0;
     70    virtual void didRemoveFrameFromHierarchy(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { }
     71    virtual void didDisplayInsecureContentForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { }
     72    virtual void didRunInsecureContentForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { }
     73    virtual void didDetectXSSForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { }
    7474
    75     virtual void didLayout(WebKit::WebPageProxy*, WebCore::LayoutMilestones, API::Object*) = 0;
     75    virtual void didLayout(WebKit::WebPageProxy*, WebCore::LayoutMilestones, API::Object*) { }
    7676   
    77     virtual bool canAuthenticateAgainstProtectionSpaceInFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, WebKit::WebProtectionSpace*) = 0;
    78     virtual void didReceiveAuthenticationChallengeInFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, WebKit::AuthenticationChallengeProxy*) = 0;
     77    virtual bool canAuthenticateAgainstProtectionSpaceInFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, WebKit::WebProtectionSpace*) { return false; }
     78    virtual void didReceiveAuthenticationChallengeInFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, WebKit::AuthenticationChallengeProxy*) { }
    7979
    80     virtual void didStartProgress(WebKit::WebPageProxy*) = 0;
    81     virtual void didChangeProgress(WebKit::WebPageProxy*)= 0;
    82     virtual void didFinishProgress(WebKit::WebPageProxy*)= 0;
     80    virtual void didStartProgress(WebKit::WebPageProxy*) { }
     81    virtual void didChangeProgress(WebKit::WebPageProxy*) { }
     82    virtual void didFinishProgress(WebKit::WebPageProxy*) { }
    8383
    8484    // FIXME: These three functions should not be part of this client.
    85     virtual void processDidBecomeUnresponsive(WebKit::WebPageProxy*) = 0;
    86     virtual void interactionOccurredWhileProcessUnresponsive(WebKit::WebPageProxy*) = 0;
    87     virtual void processDidBecomeResponsive(WebKit::WebPageProxy*) = 0;
    88     virtual void processDidCrash(WebKit::WebPageProxy*) = 0;
     85    virtual void processDidBecomeUnresponsive(WebKit::WebPageProxy*) { }
     86    virtual void interactionOccurredWhileProcessUnresponsive(WebKit::WebPageProxy*) { }
     87    virtual void processDidBecomeResponsive(WebKit::WebPageProxy*) { }
     88    virtual void processDidCrash(WebKit::WebPageProxy*) { }
    8989
    90     virtual void didChangeBackForwardList(WebKit::WebPageProxy*, WebKit::WebBackForwardListItem* addedItem, Vector<RefPtr<API::Object>>* removedItems) = 0;
    91     virtual void willGoToBackForwardListItem(WebKit::WebPageProxy*, WebKit::WebBackForwardListItem*, API::Object*) = 0;
     90    virtual void didChangeBackForwardList(WebKit::WebPageProxy*, WebKit::WebBackForwardListItem* addedItem, Vector<RefPtr<API::Object>>* removedItems) { }
     91    virtual void willGoToBackForwardListItem(WebKit::WebPageProxy*, WebKit::WebBackForwardListItem*, API::Object*) { }
    9292
    9393#if ENABLE(NETSCAPE_PLUGIN_API)
    94     virtual WebKit::PluginModuleLoadPolicy pluginLoadPolicy(WebKit::WebPageProxy*, WebKit::PluginModuleLoadPolicy currentPluginLoadPolicy, WebKit::ImmutableDictionary*, WTF::String& unavailabilityDescription, WTF::String& useBlockedPluginTitle) = 0;
    95     virtual void didFailToInitializePlugin(WebKit::WebPageProxy*, WebKit::ImmutableDictionary*) = 0;
    96     virtual void didBlockInsecurePluginVersion(WebKit::WebPageProxy*, WebKit::ImmutableDictionary*) = 0;
     94    virtual WebKit::PluginModuleLoadPolicy pluginLoadPolicy(WebKit::WebPageProxy*, WebKit::PluginModuleLoadPolicy currentPluginLoadPolicy, WebKit::ImmutableDictionary*, WTF::String& unavailabilityDescription, WTF::String& useBlockedPluginTitle) { return currentPluginLoadPolicy; }
     95    virtual void didFailToInitializePlugin(WebKit::WebPageProxy*, WebKit::ImmutableDictionary*) { }
     96    virtual void didBlockInsecurePluginVersion(WebKit::WebPageProxy*, WebKit::ImmutableDictionary*) { }
    9797#endif // ENABLE(NETSCAPE_PLUGIN_API)
    9898
    9999#if ENABLE(WEBGL)
    100     virtual WebCore::WebGLLoadPolicy webGLLoadPolicy(WebKit::WebPageProxy*, const WTF::String&) const = 0;
     100    virtual WebCore::WebGLLoadPolicy webGLLoadPolicy(WebKit::WebPageProxy*, const WTF::String&) const { return WebCore::WebGLLoadPolicy::WebGLAllow; }
    101101#endif // ENABLE(WEBGL)
    102102};
  • trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r162672 r162673  
    403403void WebPageProxy::setLoaderClient(std::unique_ptr<API::LoaderClient> loaderClient)
    404404{
     405    if (!loaderClient) {
     406        m_loaderClient = std::make_unique<API::LoaderClient>();
     407        return;
     408    }
     409
    405410    m_loaderClient = std::move(loaderClient);
    406411}
     
    823828void WebPageProxy::didChangeBackForwardList(WebBackForwardListItem* added, Vector<RefPtr<API::Object>>* removed)
    824829{
    825     if (m_loaderClient)
    826         m_loaderClient->didChangeBackForwardList(this, added, removed);
     830    m_loaderClient->didChangeBackForwardList(this, added, removed);
    827831}
    828832
     
    834838        return;
    835839
    836     if (WebBackForwardListItem* item = m_process->webBackForwardItem(itemID)) {
    837         if (m_loaderClient)
    838             m_loaderClient->willGoToBackForwardListItem(this, item, userData.get());
    839     }
     840    if (WebBackForwardListItem* item = m_process->webBackForwardItem(itemID))
     841        m_loaderClient->willGoToBackForwardListItem(this, item, userData.get());
    840842}
    841843
     
    13321334#if PLATFORM(MAC)
    13331335    RefPtr<ImmutableDictionary> pluginInformation = createPluginInformationDictionary(plugin, frameURLString, String(), pageURLString, String(), String());
    1334     if (m_loaderClient)
    1335         pluginLoadPolicy = m_loaderClient->pluginLoadPolicy(this, static_cast<PluginModuleLoadPolicy>(pluginLoadPolicy), pluginInformation.get(), unavailabilityDescription, useBlockedPluginTitle);
     1336    pluginLoadPolicy = m_loaderClient->pluginLoadPolicy(this, static_cast<PluginModuleLoadPolicy>(pluginLoadPolicy), pluginInformation.get(), unavailabilityDescription, useBlockedPluginTitle);
    13361337#else
    13371338    UNUSED_PARAM(frameURLString);
     
    20692070
    20702071    m_pageLoadState.commitChanges();
    2071     if (m_loaderClient)
    2072         m_loaderClient->didStartProgress(this);
     2072    m_loaderClient->didStartProgress(this);
    20732073}
    20742074
     
    20792079
    20802080    m_pageLoadState.commitChanges();
    2081     if (m_loaderClient)
    2082         m_loaderClient->didChangeProgress(this);
     2081    m_loaderClient->didChangeProgress(this);
    20832082}
    20842083
     
    20892088
    20902089    m_pageLoadState.commitChanges();
    2091     if (m_loaderClient)
    2092         m_loaderClient->didFinishProgress(this);
     2090    m_loaderClient->didFinishProgress(this);
    20932091}
    20942092
     
    21152113
    21162114    m_pageLoadState.commitChanges();
    2117     if (m_loaderClient)
    2118         m_loaderClient->didStartProvisionalLoadForFrame(this, frame, userData.get());
     2115    m_loaderClient->didStartProvisionalLoadForFrame(this, frame, userData.get());
    21192116}
    21202117
     
    21382135
    21392136    m_pageLoadState.commitChanges();
    2140     if (m_loaderClient)
    2141         m_loaderClient->didReceiveServerRedirectForProvisionalLoadForFrame(this, frame, userData.get());
     2137    m_loaderClient->didReceiveServerRedirectForProvisionalLoadForFrame(this, frame, userData.get());
    21422138}
    21432139
     
    21602156
    21612157    m_pageLoadState.commitChanges();
    2162     if (m_loaderClient)
    2163         m_loaderClient->didFailProvisionalLoadWithErrorForFrame(this, frame, error, userData.get());
     2158    m_loaderClient->didFailProvisionalLoadWithErrorForFrame(this, frame, error, userData.get());
    21642159}
    21652160
     
    22142209
    22152210    m_pageLoadState.commitChanges();
    2216     if (m_loaderClient)
    2217         m_loaderClient->didCommitLoadForFrame(this, frame, userData.get());
     2211    m_loaderClient->didCommitLoadForFrame(this, frame, userData.get());
    22182212}
    22192213
     
    22282222    MESSAGE_CHECK(frame);
    22292223
    2230     if (m_loaderClient)
    2231         m_loaderClient->didFinishDocumentLoadForFrame(this, frame, userData.get());
     2224    m_loaderClient->didFinishDocumentLoadForFrame(this, frame, userData.get());
    22322225}
    22332226
     
    22502243
    22512244    m_pageLoadState.commitChanges();
    2252     if (m_loaderClient)
    2253         m_loaderClient->didFinishLoadForFrame(this, frame, userData.get());
     2245    m_loaderClient->didFinishLoadForFrame(this, frame, userData.get());
    22542246}
    22552247
     
    22742266
    22752267    m_pageLoadState.commitChanges();
    2276     if (m_loaderClient)
    2277         m_loaderClient->didFailLoadWithErrorForFrame(this, frame, error, userData.get());
     2268    m_loaderClient->didFailLoadWithErrorForFrame(this, frame, error, userData.get());
    22782269}
    22792270
     
    22982289
    22992290    m_pageLoadState.commitChanges();
    2300     if (m_loaderClient)
    2301         m_loaderClient->didSameDocumentNavigationForFrame(this, frame, static_cast<SameDocumentNavigationType>(opaqueSameDocumentNavigationType), userData.get());
     2291    m_loaderClient->didSameDocumentNavigationForFrame(this, frame, static_cast<SameDocumentNavigationType>(opaqueSameDocumentNavigationType), userData.get());
    23022292}
    23032293
     
    23202310   
    23212311    m_pageLoadState.commitChanges();
    2322     if (m_loaderClient)
    2323         m_loaderClient->didReceiveTitleForFrame(this, title, frame, userData.get());
     2312    m_loaderClient->didReceiveTitleForFrame(this, title, frame, userData.get());
    23242313}
    23252314
     
    23342323    MESSAGE_CHECK(frame);
    23352324
    2336     if (m_loaderClient)
    2337         m_loaderClient->didFirstLayoutForFrame(this, frame, userData.get());
     2325    m_loaderClient->didFirstLayoutForFrame(this, frame, userData.get());
    23382326}
    23392327
     
    23482336    MESSAGE_CHECK(frame);
    23492337
    2350     if (m_loaderClient)
    2351         m_loaderClient->didFirstVisuallyNonEmptyLayoutForFrame(this, frame, userData.get());
     2338    m_loaderClient->didFirstVisuallyNonEmptyLayoutForFrame(this, frame, userData.get());
    23522339}
    23532340
     
    23592346        return;
    23602347
    2361     if (m_loaderClient)
    2362         m_loaderClient->didLayout(this, static_cast<LayoutMilestones>(layoutMilestones), userData.get());
     2348    m_loaderClient->didLayout(this, static_cast<LayoutMilestones>(layoutMilestones), userData.get());
    23632349}
    23642350
     
    23732359    MESSAGE_CHECK(frame);
    23742360
    2375     if (m_loaderClient)
    2376         m_loaderClient->didRemoveFrameFromHierarchy(this, frame, userData.get());
     2361    m_loaderClient->didRemoveFrameFromHierarchy(this, frame, userData.get());
    23772362}
    23782363
     
    23912376
    23922377    m_pageLoadState.commitChanges();
    2393     if (m_loaderClient)
    2394         m_loaderClient->didDisplayInsecureContentForFrame(this, frame, userData.get());
     2378    m_loaderClient->didDisplayInsecureContentForFrame(this, frame, userData.get());
    23952379}
    23962380
     
    24092393
    24102394    m_pageLoadState.commitChanges();
    2411     if (m_loaderClient)
    2412         m_loaderClient->didRunInsecureContentForFrame(this, frame, userData.get());
     2395    m_loaderClient->didRunInsecureContentForFrame(this, frame, userData.get());
    24132396}
    24142397
     
    24232406    MESSAGE_CHECK(frame);
    24242407
    2425     if (m_loaderClient)
    2426         m_loaderClient->didDetectXSSForFrame(this, frame, userData.get());
     2408    m_loaderClient->didDetectXSSForFrame(this, frame, userData.get());
    24272409}
    24282410
     
    27052687void WebPageProxy::webGLPolicyForURL(const String& url, uint32_t& loadPolicy)
    27062688{
    2707     if (!m_loaderClient)
    2708         loadPolicy = WebGLAllow;
    2709     else
    2710         loadPolicy = static_cast<uint32_t>(m_loaderClient->webGLLoadPolicy(this, url));
     2689    loadPolicy = static_cast<uint32_t>(m_loaderClient->webGLLoadPolicy(this, url));
    27112690}
    27122691#endif // ENABLE(WEBGL)
     
    37383717    updateBackingStoreDiscardableState();
    37393718
    3740     if (m_loaderClient)
    3741         m_loaderClient->processDidBecomeUnresponsive(this);
     3719    m_loaderClient->processDidBecomeUnresponsive(this);
    37423720}
    37433721
     
    37473725        return;
    37483726
    3749     if (m_loaderClient)
    3750         m_loaderClient->interactionOccurredWhileProcessUnresponsive(this);
     3727    m_loaderClient->interactionOccurredWhileProcessUnresponsive(this);
    37513728}
    37523729
     
    37583735    updateBackingStoreDiscardableState();
    37593736
    3760     if (m_loaderClient)
    3761         m_loaderClient->processDidBecomeResponsive(this);
     3737    m_loaderClient->processDidBecomeResponsive(this);
    37623738}
    37633739
     
    37743750    m_pageClient.processDidCrash();
    37753751
    3776     if (m_loaderClient)
    3777         m_loaderClient->processDidCrash(this);
     3752    m_loaderClient->processDidCrash(this);
    37783753}
    37793754
     
    39743949    RefPtr<WebProtectionSpace> protectionSpace = WebProtectionSpace::create(coreProtectionSpace);
    39753950
    3976     if (!m_loaderClient)
    3977         canAuthenticate = false;
    3978     else
    3979         canAuthenticate = m_loaderClient->canAuthenticateAgainstProtectionSpaceInFrame(this, frame, protectionSpace.get());
     3951    canAuthenticate = m_loaderClient->canAuthenticateAgainstProtectionSpaceInFrame(this, frame, protectionSpace.get());
    39803952}
    39813953
     
    39933965
    39943966    RefPtr<AuthenticationChallengeProxy> authenticationChallenge = prpAuthenticationChallenge;
    3995     if (m_loaderClient)
    3996         m_loaderClient->didReceiveAuthenticationChallengeInFrame(this, frame, authenticationChallenge.get());
     3967    m_loaderClient->didReceiveAuthenticationChallengeInFrame(this, frame, authenticationChallenge.get());
    39973968}
    39983969
     
    41524123void WebPageProxy::didFailToInitializePlugin(const String& mimeType, const String& frameURLString, const String& pageURLString)
    41534124{
    4154     if (m_loaderClient)
    4155         m_loaderClient->didFailToInitializePlugin(this, createPluginInformationDictionary(mimeType, frameURLString, pageURLString).get());
     4125    m_loaderClient->didFailToInitializePlugin(this, createPluginInformationDictionary(mimeType, frameURLString, pageURLString).get());
    41564126}
    41574127
     
    41724142#endif
    41734143
    4174     if (m_loaderClient)
    4175         m_loaderClient->didBlockInsecurePluginVersion(this, pluginInformation.get());
     4144    m_loaderClient->didBlockInsecurePluginVersion(this, pluginInformation.get());
    41764145}
    41774146#endif // ENABLE(NETSCAPE_PLUGIN_API)
Note: See TracChangeset for help on using the changeset viewer.