Changeset 260751 in webkit


Ignore:
Timestamp:
Apr 27, 2020 5:55:44 AM (4 years ago)
Author:
commit-queue@webkit.org
Message:

Make loadURLIntoChildFrame private and non-exported
​https://bugs.webkit.org/show_bug.cgi?id=211051

Patch by Rob Buis <​rbuis@igalia.com> on 2020-04-27
Reviewed by Darin Adler.

Source/WebCore:

Make loadURLIntoChildFrame private and non-exported to reduce the amount of public API functions
that start loads. In order to do this loadURLIntoChildFrame is being called from SubframeLoader
and SubframeLoader is made an inner class of FrameLoader. Because this simplifies createFrame (and
makes createFrame behave strictly like its name) url and referrer do not have to be passed.

  • html/HTMLObjectElement.cpp:

(WebCore::HTMLObjectElement::parametersForPlugin):

  • loader/EmptyClients.cpp:

(WebCore::EmptyFrameLoaderClient::createFrame):

  • loader/EmptyFrameLoaderClient.h:
  • loader/FrameLoader.h:
  • loader/FrameLoaderClient.h:
  • loader/SubframeLoader.cpp:

(WebCore::FrameLoader::SubframeLoader::SubframeLoader):
(WebCore::FrameLoader::SubframeLoader::clear):
(WebCore::FrameLoader::SubframeLoader::requestFrame):
(WebCore::FrameLoader::SubframeLoader::resourceWillUsePlugin):
(WebCore::FrameLoader::SubframeLoader::pluginIsLoadable):
(WebCore::FrameLoader::SubframeLoader::requestPlugin):
(WebCore::FrameLoader::SubframeLoader::requestObject):
(WebCore::FrameLoader::SubframeLoader::createJavaAppletWidget):
(WebCore::FrameLoader::SubframeLoader::loadOrRedirectSubframe):
(WebCore::FrameLoader::SubframeLoader::loadSubframe):
(WebCore::FrameLoader::SubframeLoader::shouldUsePlugin):
(WebCore::FrameLoader::SubframeLoader::loadPlugin):
(WebCore::FrameLoader::SubframeLoader::completeURL const):
(WebCore::FrameLoader::SubframeLoader::shouldConvertInvalidURLsToBlank const):
(WebCore::SubframeLoader::SubframeLoader): Deleted.
(WebCore::SubframeLoader::clear): Deleted.
(WebCore::SubframeLoader::requestFrame): Deleted.
(WebCore::SubframeLoader::resourceWillUsePlugin): Deleted.
(WebCore::SubframeLoader::pluginIsLoadable): Deleted.
(WebCore::SubframeLoader::requestPlugin): Deleted.
(WebCore::SubframeLoader::requestObject): Deleted.
(WebCore::SubframeLoader::createJavaAppletWidget): Deleted.
(WebCore::SubframeLoader::loadOrRedirectSubframe): Deleted.
(WebCore::SubframeLoader::loadSubframe): Deleted.
(WebCore::SubframeLoader::shouldUsePlugin): Deleted.
(WebCore::SubframeLoader::loadPlugin): Deleted.
(WebCore::SubframeLoader::completeURL const): Deleted.
(WebCore::SubframeLoader::shouldConvertInvalidURLsToBlank const): Deleted.

  • loader/SubframeLoader.h:

(WebCore::SubframeLoader::containsPlugins const): Deleted.

Source/WebKit:

Adapt createFrame to strictly create a subframe and
not load anything.

  • WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebKit::WebFrameLoaderClient::createFrame):

  • WebProcess/WebCoreSupport/WebFrameLoaderClient.h:

Source/WebKitLegacy/mac:

Adapt createFrame to strictly create a subframe and
not load anything.

  • WebCoreSupport/WebFrameLoaderClient.h:
  • WebCoreSupport/WebFrameLoaderClient.mm:

(WebFrameLoaderClient::createFrame):

Source/WebKitLegacy/win:

Adapt createFrame to strictly create a subframe and
not load anything.

  • WebCoreSupport/WebFrameLoaderClient.cpp:

(WebFrameLoaderClient::createFrame):

  • WebCoreSupport/WebFrameLoaderClient.h:
Location:
trunk/Source
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r260750 r260751  
     12020-04-27  Rob Buis  <rbuis@igalia.com>
     2
     3        Make loadURLIntoChildFrame private and non-exported
     4        https://bugs.webkit.org/show_bug.cgi?id=211051
     5
     6        Reviewed by Darin Adler.
     7
     8        Make loadURLIntoChildFrame private and non-exported to reduce the amount of public API functions
     9        that start loads. In order to do this loadURLIntoChildFrame is being called from SubframeLoader
     10        and SubframeLoader is made an inner class of FrameLoader. Because this simplifies createFrame (and
     11        makes createFrame behave strictly like its name) url and referrer do not have to be passed.
     12
     13        * html/HTMLObjectElement.cpp:
     14        (WebCore::HTMLObjectElement::parametersForPlugin):
     15        * loader/EmptyClients.cpp:
     16        (WebCore::EmptyFrameLoaderClient::createFrame):
     17        * loader/EmptyFrameLoaderClient.h:
     18        * loader/FrameLoader.h:
     19        * loader/FrameLoaderClient.h:
     20        * loader/SubframeLoader.cpp:
     21        (WebCore::FrameLoader::SubframeLoader::SubframeLoader):
     22        (WebCore::FrameLoader::SubframeLoader::clear):
     23        (WebCore::FrameLoader::SubframeLoader::requestFrame):
     24        (WebCore::FrameLoader::SubframeLoader::resourceWillUsePlugin):
     25        (WebCore::FrameLoader::SubframeLoader::pluginIsLoadable):
     26        (WebCore::FrameLoader::SubframeLoader::requestPlugin):
     27        (WebCore::FrameLoader::SubframeLoader::requestObject):
     28        (WebCore::FrameLoader::SubframeLoader::createJavaAppletWidget):
     29        (WebCore::FrameLoader::SubframeLoader::loadOrRedirectSubframe):
     30        (WebCore::FrameLoader::SubframeLoader::loadSubframe):
     31        (WebCore::FrameLoader::SubframeLoader::shouldUsePlugin):
     32        (WebCore::FrameLoader::SubframeLoader::loadPlugin):
     33        (WebCore::FrameLoader::SubframeLoader::completeURL const):
     34        (WebCore::FrameLoader::SubframeLoader::shouldConvertInvalidURLsToBlank const):
     35        (WebCore::SubframeLoader::SubframeLoader): Deleted.
     36        (WebCore::SubframeLoader::clear): Deleted.
     37        (WebCore::SubframeLoader::requestFrame): Deleted.
     38        (WebCore::SubframeLoader::resourceWillUsePlugin): Deleted.
     39        (WebCore::SubframeLoader::pluginIsLoadable): Deleted.
     40        (WebCore::SubframeLoader::requestPlugin): Deleted.
     41        (WebCore::SubframeLoader::requestObject): Deleted.
     42        (WebCore::SubframeLoader::createJavaAppletWidget): Deleted.
     43        (WebCore::SubframeLoader::loadOrRedirectSubframe): Deleted.
     44        (WebCore::SubframeLoader::loadSubframe): Deleted.
     45        (WebCore::SubframeLoader::shouldUsePlugin): Deleted.
     46        (WebCore::SubframeLoader::loadPlugin): Deleted.
     47        (WebCore::SubframeLoader::completeURL const): Deleted.
     48        (WebCore::SubframeLoader::shouldConvertInvalidURLsToBlank const): Deleted.
     49        * loader/SubframeLoader.h:
     50        (WebCore::SubframeLoader::containsPlugins const): Deleted.
     51
    1522020-04-27  Alberto Garcia  <berto@igalia.com>
    253

  • trunk/Source/WebCore/html/HTMLObjectElement.cpp

    r259393 r260751  
    207207
    208208    if (url.isEmpty() && !urlParameter.isEmpty()) {
    209         SubframeLoader& loader = document().frame()->loader().subframeLoader();
     209        auto& loader = document().frame()->loader().subframeLoader();
    210210        if (loader.resourceWillUsePlugin(urlParameter, serviceType))
    211211            url = urlParameter;

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

    r259861 r260751  
    522522}
    523523
    524 RefPtr<Frame> EmptyFrameLoaderClient::createFrame(const URL&, const String&, HTMLFrameOwnerElement&, const String&)
     524RefPtr<Frame> EmptyFrameLoaderClient::createFrame(const String&, HTMLFrameOwnerElement&)
    525525{
    526526    return nullptr;

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

    r258628 r260751  
    176176    void didRunInsecureContent(SecurityOrigin&, const URL&) final { }
    177177    void didDetectXSS(const URL&, bool) final { }
    178     RefPtr<Frame> createFrame(const URL&, const String&, HTMLFrameOwnerElement&, const String&) final;
     178    RefPtr<Frame> createFrame(const String&, HTMLFrameOwnerElement&) final;
    179179    RefPtr<Widget> createPlugin(const IntSize&, HTMLPlugInElement&, const URL&, const Vector<String>&, const Vector<String>&, const String&, bool) final;
    180180    RefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement&, const URL&, const Vector<String>&, const Vector<String>&) final;

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

    r260423 r260751  
    8585class SerializedScriptValue;
    8686class SharedBuffer;
    87 class SubframeLoader;
    8887class SubstituteData;
    8988
    … …  
    116115    HistoryController& history() const { return *m_history; }
    117116    ResourceLoadNotifier& notifier() const { return m_notifier; }
     117
     118    class SubframeLoader;
    118119    SubframeLoader& subframeLoader() const { return *m_subframeLoader; }
    119120    MixedContentChecker& mixedContentChecker() const { return m_mixedContentChecker; }
    … …  
    122123
    123124    // FIXME: These are all functions which start loads. We have too many.
    124     WEBCORE_EXPORT void loadURLIntoChildFrame(const URL&, const String& referer, Frame*);
    125125    WEBCORE_EXPORT void loadFrameRequest(FrameLoadRequest&&, Event*, RefPtr<FormState>&&, Optional<AdClickAttribution>&& = WTF::nullopt); // Called by submitForm, calls loadPostRequest and loadURL.
    126126
    … …  
    426426    bool shouldTreatCurrentLoadAsContinuingLoad() const { return m_currentLoadContinuingState != LoadContinuingState::NotContinuing; }
    427427
     428    void loadURLIntoChildFrame(const URL&, const String& referer, Frame*);
     429
    428430    Frame& m_frame;
    429431    UniqueRef<FrameLoaderClient> m_client;

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

    r258628 r260751  
    287287    virtual void convertMainResourceLoadToDownload(DocumentLoader*, const ResourceRequest&, const ResourceResponse&) = 0;
    288288
    289     virtual RefPtr<Frame> createFrame(const URL&, const String& name, HTMLFrameOwnerElement&, const String& referrer) = 0;
     289    virtual RefPtr<Frame> createFrame(const String& name, HTMLFrameOwnerElement&) = 0;
    290290    virtual RefPtr<Widget> createPlugin(const IntSize&, HTMLPlugInElement&, const URL&, const Vector<String>&, const Vector<String>&, const String&, bool loadManually) = 0;
    291291    virtual void redirectDataToPlugin(Widget&) = 0;

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

    r260709 r260751  
    6363using namespace HTMLNames;
    6464
    65 SubframeLoader::SubframeLoader(Frame& frame)
    66     : m_containsPlugins(false)
    67     , m_frame(frame)
    68 {
    69 }
    70 
    71 void SubframeLoader::clear()
     65FrameLoader::SubframeLoader::SubframeLoader(Frame& frame)
     66    : m_frame(frame)
     67{
     68}
     69
     70void FrameLoader::SubframeLoader::clear()
    7271{
    7372    m_containsPlugins = false;
    7473}
    7574
    76 bool SubframeLoader::requestFrame(HTMLFrameOwnerElement& ownerElement, const String& urlString, const AtomString& frameName, LockHistory lockHistory, LockBackForwardList lockBackForwardList)
     75bool FrameLoader::SubframeLoader::requestFrame(HTMLFrameOwnerElement& ownerElement, const String& urlString, const AtomString& frameName, LockHistory lockHistory, LockBackForwardList lockBackForwardList)
    7776{
    7877    // Support for <frame src="javascript:string">
    … …  
    113112}
    114113   
    115 bool SubframeLoader::resourceWillUsePlugin(const String& url, const String& mimeType)
     114bool FrameLoader::SubframeLoader::resourceWillUsePlugin(const String& url, const String& mimeType)
    116115{
    117116    URL completedURL;
    … …  
    123122}
    124123
    125 bool SubframeLoader::pluginIsLoadable(const URL& url, const String& mimeType)
     124bool FrameLoader::SubframeLoader::pluginIsLoadable(const URL& url, const String& mimeType)
    126125{
    127126    auto* document = m_frame.document();
    … …  
    150149}
    151150
    152 bool SubframeLoader::requestPlugin(HTMLPlugInImageElement& ownerElement, const URL& url, const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues, bool useFallback)
     151bool FrameLoader::SubframeLoader::requestPlugin(HTMLPlugInImageElement& ownerElement, const URL& url, const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues, bool useFallback)
    153152{
    154153    // Application plug-ins are plug-ins implemented by the user agent, for example Qt plug-ins,
    … …  
    219218}
    220219
    221 bool SubframeLoader::requestObject(HTMLPlugInImageElement& ownerElement, const String& url, const AtomString& frameName, const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues)
     220bool FrameLoader::SubframeLoader::requestObject(HTMLPlugInImageElement& ownerElement, const String& url, const AtomString& frameName, const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues)
    222221{
    223222    if (url.isEmpty() && mimeType.isEmpty())
    … …  
    247246}
    248247
    249 RefPtr<Widget> SubframeLoader::createJavaAppletWidget(const IntSize& size, HTMLAppletElement& element, const Vector<String>& paramNames, const Vector<String>& paramValues)
     248RefPtr<Widget> FrameLoader::SubframeLoader::createJavaAppletWidget(const IntSize& size, HTMLAppletElement& element, const Vector<String>& paramNames, const Vector<String>& paramValues)
    250249{
    251250    String baseURLString;
    … …  
    297296}
    298297
    299 Frame* SubframeLoader::loadOrRedirectSubframe(HTMLFrameOwnerElement& ownerElement, const URL& requestURL, const AtomString& frameName, LockHistory lockHistory, LockBackForwardList lockBackForwardList)
     298Frame* FrameLoader::SubframeLoader::loadOrRedirectSubframe(HTMLFrameOwnerElement& ownerElement, const URL& requestURL, const AtomString& frameName, LockHistory lockHistory, LockBackForwardList lockBackForwardList)
    300299{
    301300    auto& initiatingDocument = ownerElement.document();
    … …  
    317316}
    318317
    319 RefPtr<Frame> SubframeLoader::loadSubframe(HTMLFrameOwnerElement& ownerElement, const URL& url, const String& name, const String& referrer)
     318RefPtr<Frame> FrameLoader::SubframeLoader::loadSubframe(HTMLFrameOwnerElement& ownerElement, const URL& url, const String& name, const String& referrer)
    320319{
    321320    Ref<Frame> protect(m_frame);
    … …  
    333332        return nullptr;
    334333
     334    // Prevent initial empty document load from triggering load events.
     335    document->incrementLoadEventDelayCount();
     336
     337    auto frame = m_frame.loader().client().createFrame(name, ownerElement);
     338    if (!frame)  {
     339        m_frame.loader().checkCallImplicitClose();
     340        return nullptr;
     341    }
    335342    ReferrerPolicy policy = ownerElement.referrerPolicy();
    336343    if (policy == ReferrerPolicy::EmptyString)
    … …  
    338345    String referrerToUse = SecurityPolicy::generateReferrerHeader(policy, url, referrer);
    339346
    340     // Prevent initial empty document load from triggering load events.
    341     document->incrementLoadEventDelayCount();
    342 
    343     auto frame = m_frame.loader().client().createFrame(url, name, ownerElement, referrerToUse);
     347    m_frame.loader().loadURLIntoChildFrame(url, referrerToUse, frame.get());
    344348
    345349    document->decrementLoadEventDelayCount();
    346350
    347     if (!frame)  {
     351    // The frame's onload handler may have removed it from the document.
     352    if (!frame || !frame->tree().parent()) {
    348353        m_frame.loader().checkCallImplicitClose();
    349354        return nullptr;
    … …  
    383388}
    384389
    385 bool SubframeLoader::shouldUsePlugin(const URL& url, const String& mimeType, bool hasFallback, bool& useFallback)
     390bool FrameLoader::SubframeLoader::shouldUsePlugin(const URL& url, const String& mimeType, bool hasFallback, bool& useFallback)
    386391{
    387392    if (m_frame.loader().client().shouldAlwaysUsePluginDocument(mimeType)) {
    … …  
    398403}
    399404
    400 bool SubframeLoader::loadPlugin(HTMLPlugInImageElement& pluginElement, const URL& url, const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues, bool useFallback)
     405bool FrameLoader::SubframeLoader::loadPlugin(HTMLPlugInImageElement& pluginElement, const URL& url, const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues, bool useFallback)
    401406{
    402407    if (useFallback)
    … …  
    441446}
    442447
    443 URL SubframeLoader::completeURL(const String& url) const
     448URL FrameLoader::SubframeLoader::completeURL(const String& url) const
    444449{
    445450    ASSERT(m_frame.document());
    … …  
    447452}
    448453
    449 bool SubframeLoader::shouldConvertInvalidURLsToBlank() const
     454bool FrameLoader::SubframeLoader::shouldConvertInvalidURLsToBlank() const
    450455{
    451456    return m_frame.settings().shouldConvertInvalidURLsToBlank();

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

    r260239 r260751  
    3131#pragma once
    3232
    33 #include "FrameLoaderTypes.h"
     33#include "FrameLoader.h"
    3434#include <wtf/Forward.h>
    3535#include <wtf/Noncopyable.h>
    … …  
    4949
    5050// This is a slight misnomer. It handles the higher level logic of loading both subframes and plugins.
    51 class SubframeLoader {
     51class FrameLoader::SubframeLoader {
    5252    WTF_MAKE_NONCOPYABLE(SubframeLoader); WTF_MAKE_FAST_ALLOCATED;
    5353public:
    … …  
    7979    bool shouldConvertInvalidURLsToBlank() const;
    8080
    81     bool m_containsPlugins;
     81    bool m_containsPlugins { false };
    8282    Frame& m_frame;
    8383};

  • trunk/Source/WebKit/ChangeLog

    r260744 r260751  
     12020-04-27  Rob Buis  <rbuis@igalia.com>
     2
     3        Make loadURLIntoChildFrame private and non-exported
     4        https://bugs.webkit.org/show_bug.cgi?id=211051
     5
     6        Reviewed by Darin Adler.
     7
     8        Adapt createFrame to strictly create a subframe and
     9        not load anything.
     10
     11        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
     12        (WebKit::WebFrameLoaderClient::createFrame):
     13        * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
     14
    1152020-04-27  Ross Kirsling  <ross.kirsling@sony.com>
    216

  • trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

    r260709 r260751  
    15721572}
    15731573
    1574 RefPtr<Frame> WebFrameLoaderClient::createFrame(const URL& url, const String& name, HTMLFrameOwnerElement& ownerElement,
    1575     const String& referrer)
     1574RefPtr<Frame> WebFrameLoaderClient::createFrame(const String& name, HTMLFrameOwnerElement& ownerElement)
    15761575{
    15771576    auto* webPage = m_frame->page();
    … …  
    15841583    // The creation of the frame may have run arbitrary JavaScript that removed it from the page already.
    15851584    if (!coreSubframe->page())
    1586         return nullptr;
    1587 
    1588     m_frame->coreFrame()->loader().loadURLIntoChildFrame(url, referrer, coreSubframe);
    1589 
    1590     // The frame's onload handler may have removed it from the document.
    1591     if (!subframe->coreFrame())
    1592         return nullptr;
    1593     ASSERT(subframe->coreFrame() == coreSubframe);
    1594     if (!coreSubframe->tree().parent())
    15951585        return nullptr;
    15961586

  • trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.h

    r258628 r260751  
    215215    void convertMainResourceLoadToDownload(WebCore::DocumentLoader*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&) final;
    216216
    217     RefPtr<WebCore::Frame> createFrame(const URL&, const String& name, WebCore::HTMLFrameOwnerElement&, const String& referrer) final;
     217    RefPtr<WebCore::Frame> createFrame(const String& name, WebCore::HTMLFrameOwnerElement&) final;
    218218
    219219    RefPtr<WebCore::Widget> createPlugin(const WebCore::IntSize&, WebCore::HTMLPlugInElement&, const URL&, const Vector<String>&, const Vector<String>&, const String&, bool loadManually) final;

  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r260744 r260751  
     12020-04-27  Rob Buis  <rbuis@igalia.com>
     2
     3        Make loadURLIntoChildFrame private and non-exported
     4        https://bugs.webkit.org/show_bug.cgi?id=211051
     5
     6        Reviewed by Darin Adler.
     7
     8        Adapt createFrame to strictly create a subframe and
     9        not load anything.
     10
     11        * WebCoreSupport/WebFrameLoaderClient.h:
     12        * WebCoreSupport/WebFrameLoaderClient.mm:
     13        (WebFrameLoaderClient::createFrame):
     14
    1152020-04-27  Ross Kirsling  <ross.kirsling@sony.com>
    216

  • trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.h

    r258628 r260751  
    206206    void setTitle(const WebCore::StringWithDirection&, const URL&) final;
    207207
    208     RefPtr<WebCore::Frame> createFrame(const URL&, const WTF::String& name, WebCore::HTMLFrameOwnerElement&,
    209         const WTF::String& referrer) final;
     208    RefPtr<WebCore::Frame> createFrame(const WTF::String& name, WebCore::HTMLFrameOwnerElement&) final;
    210209    RefPtr<WebCore::Widget> createPlugin(const WebCore::IntSize&, WebCore::HTMLPlugInElement&, const URL&,
    211210    const Vector<WTF::String>&, const Vector<WTF::String>&, const WTF::String&, bool) final;

  • trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm

    r260709 r260751  
    16191619}
    16201620
    1621 RefPtr<WebCore::Frame> WebFrameLoaderClient::createFrame(const URL& url, const String& name, WebCore::HTMLFrameOwnerElement& ownerElement,
    1622     const String& referrer)
     1621RefPtr<WebCore::Frame> WebFrameLoaderClient::createFrame(const String& name, WebCore::HTMLFrameOwnerElement& ownerElement)
    16231622{
    16241623    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    … …  
    16401639        return nullptr;
    16411640 
    1642     core(m_webFrame.get())->loader().loadURLIntoChildFrame(url, referrer, result.get());
    1643 
    1644     // The frame's onload handler may have removed it from the document.
    1645     if (!result->tree().parent())
    1646         return nullptr;
    1647 
    16481641    return result;
    16491642

  • trunk/Source/WebKitLegacy/win/ChangeLog

    r260744 r260751  
     12020-04-27  Rob Buis  <rbuis@igalia.com>
     2
     3        Make loadURLIntoChildFrame private and non-exported
     4        https://bugs.webkit.org/show_bug.cgi?id=211051
     5
     6        Reviewed by Darin Adler.
     7
     8        Adapt createFrame to strictly create a subframe and
     9        not load anything.
     10
     11        * WebCoreSupport/WebFrameLoaderClient.cpp:
     12        (WebFrameLoaderClient::createFrame):
     13        * WebCoreSupport/WebFrameLoaderClient.h:
     14
    1152020-04-27  Ross Kirsling  <ross.kirsling@sony.com>
    216

  • trunk/Source/WebKitLegacy/win/WebCoreSupport/WebFrameLoaderClient.cpp

    r260707 r260751  
    986986}
    987987
    988 RefPtr<Frame> WebFrameLoaderClient::createFrame(const URL& url, const String& name, HTMLFrameOwnerElement& ownerElement,
    989     const String& referrer)
     988RefPtr<Frame> WebFrameLoaderClient::createFrame(const String& name, HTMLFrameOwnerElement& ownerElement)
    990989{
    991990    Frame* coreFrame = core(m_webFrame);
    … …  
    999998    coreFrame->tree().appendChild(*childFrame);
    1000999    childFrame->init();
    1001 
    1002     coreFrame->loader().loadURLIntoChildFrame(url, referrer, childFrame.get());
    1003 
    1004     // The frame's onload handler may have removed it from the document.
    1005     if (!childFrame->tree().parent())
    1006         return nullptr;
    10071000
    10081001    return childFrame;

  • trunk/Source/WebKitLegacy/win/WebCoreSupport/WebFrameLoaderClient.h

    r258628 r260751  
    178178    bool canCachePage() const override;
    179179
    180     RefPtr<WebCore::Frame> createFrame(const URL&, const WTF::String& name, WebCore::HTMLFrameOwnerElement&,
    181         const WTF::String& referrer) override;
     180    RefPtr<WebCore::Frame> createFrame(const WTF::String& name, WebCore::HTMLFrameOwnerElement&) override;
    182181    RefPtr<WebCore::Widget> createPlugin(const WebCore::IntSize&, WebCore::HTMLPlugInElement&, const URL&, const Vector<WTF::String>&, const Vector<WTF::String>&, const WTF::String&, bool loadManually) override;
    183182    void redirectDataToPlugin(WebCore::Widget&) override;
Note: See TracChangeset for help on using the changeset viewer.