Changeset 92083 in webkit


Ignore:
Timestamp:
Jul 31, 2011 9:30:46 AM (13 years ago)
Author:
commit-queue@webkit.org
Message:

[Chromium] Remove the parameterless WebFrame::createAssociatedURLLoader
overload, and change the overload that takes WebURLLoaderOptions to
use a default value. This is equivalent to the original parameterless
overload.
https://bugs.webkit.org/show_bug.cgi?id=65280

Patch by Bill Budge <bbudge@chromium.org> on 2011-07-31
Reviewed by Darin Fisher.

  • public/WebFrame.h:
  • src/AssociatedURLLoader.cpp:
  • src/AssociatedURLLoader.h:
  • src/WebFrameImpl.cpp:
  • src/WebFrameImpl.h:
Location:
trunk/Source/WebKit/chromium
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/chromium/ChangeLog

    r92075 r92083  
     12011-07-31  Bill Budge  <bbudge@chromium.org>
     2
     3        [Chromium] Remove the parameterless WebFrame::createAssociatedURLLoader
     4        overload, and change the overload that takes WebURLLoaderOptions to
     5        use a default value. This is equivalent to the original parameterless
     6        overload.
     7        https://bugs.webkit.org/show_bug.cgi?id=65280
     8
     9        Reviewed by Darin Fisher.
     10
     11        * public/WebFrame.h:
     12        * src/AssociatedURLLoader.cpp:
     13        * src/AssociatedURLLoader.h:
     14        * src/WebFrameImpl.cpp:
     15        * src/WebFrameImpl.h:
     16
    1172011-07-30  Sheriff Bot  <webkit.review.bot@gmail.com>
    218
  • trunk/Source/WebKit/chromium/public/WebFrame.h

    r89939 r92083  
    3737#include "WebNode.h"
    3838#include "WebURL.h"
     39#include "WebURLLoaderOptions.h"
    3940// FIXME : Remove this file when transient done.
    4041#include "WebVector.h"
     
    344345    virtual void dispatchWillSendRequest(WebURLRequest&) = 0;
    345346
    346     // FIXME: Remove this overload when clients have been changed to pass options.
    347     virtual WebURLLoader* createAssociatedURLLoader() = 0;
    348 
    349347    // Returns a WebURLLoader that is associated with this frame.  The loader
    350348    // will, for example, be cancelled when WebFrame::stopLoading is called.
    351349    // FIXME: stopLoading does not yet cancel an associated loader!!
    352     virtual WebURLLoader* createAssociatedURLLoader(const WebURLLoaderOptions&) = 0;
     350    virtual WebURLLoader* createAssociatedURLLoader(const WebURLLoaderOptions& = WebURLLoaderOptions()) = 0;
    353351
    354352    // Called from within WebFrameClient::didReceiveDocumentData to commit
  • trunk/Source/WebKit/chromium/src/AssociatedURLLoader.cpp

    r91789 r92083  
    194194}
    195195
    196 AssociatedURLLoader::AssociatedURLLoader(PassRefPtr<WebFrameImpl> frameImpl)
    197     : m_frameImpl(frameImpl)
    198     , m_client(0)
    199 {
    200     ASSERT(m_frameImpl);
    201 
    202     m_options.sniffContent = false;
    203     m_options.allowCredentials = true;
    204     m_options.forcePreflight = false;
    205     m_options.crossOriginRequestPolicy = WebURLLoaderOptions::CrossOriginRequestPolicyAllow; // FIXME We should deny by default, but this would break some tests.
    206 }
    207 
    208196AssociatedURLLoader::AssociatedURLLoader(PassRefPtr<WebFrameImpl> frameImpl, const WebURLLoaderOptions& options)
    209197    : m_frameImpl(frameImpl)
  • trunk/Source/WebKit/chromium/src/AssociatedURLLoader.h

    r83613 r92083  
    4848    WTF_MAKE_NONCOPYABLE(AssociatedURLLoader);
    4949public:
    50     AssociatedURLLoader(PassRefPtr<WebFrameImpl>);
    5150    AssociatedURLLoader(PassRefPtr<WebFrameImpl>, const WebURLLoaderOptions&);
    5251    ~AssociatedURLLoader();
  • trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp

    r92032 r92083  
    10161016}
    10171017
    1018 // FIXME: Remove this overload when clients have been changed to pass options.
    1019 WebURLLoader* WebFrameImpl::createAssociatedURLLoader()
    1020 {
    1021     return new AssociatedURLLoader(this);
    1022 }
    1023 
    10241018WebURLLoader* WebFrameImpl::createAssociatedURLLoader(const WebURLLoaderOptions& options)
    10251019{
  • trunk/Source/WebKit/chromium/src/WebFrameImpl.h

    r89939 r92083  
    135135    virtual void setReferrerForRequest(WebURLRequest&, const WebURL& referrer);
    136136    virtual void dispatchWillSendRequest(WebURLRequest&);
    137     // FIXME: Remove this overload when clients have been changed to pass options.
    138     virtual WebURLLoader* createAssociatedURLLoader();
    139137    virtual WebURLLoader* createAssociatedURLLoader(const WebURLLoaderOptions&);
    140138    virtual void commitDocumentData(const char* data, size_t length);
Note: See TracChangeset for help on using the changeset viewer.