Changeset 160449 in webkit


Ignore:
Timestamp:
Dec 11, 2013 11:18:08 AM (10 years ago)
Author:
andersca@apple.com
Message:

Remove platform specific gunk from WebURLRequest and WebURLResponse
https://bugs.webkit.org/show_bug.cgi?id=125589

Reviewed by Andreas Kling.

  • Shared/API/c/WKURLRequest.cpp:

(WKURLRequestCopyURL):

  • Shared/API/c/mac/WKURLRequestNS.mm:

(WKURLRequestCopyNSURLRequest):

  • Shared/API/c/mac/WKURLResponseNS.mm:

(WKURLResponseCopyNSURLResponse):

  • Shared/WebURLRequest.cpp:
  • Shared/WebURLRequest.h:
  • Shared/WebURLResponse.h:
  • Shared/mac/WebURLRequestMac.mm: Removed.
  • Shared/mac/WebURLResponseMac.mm: Removed.
  • UIProcess/WebInspectorProxy.cpp:

(WebKit::isMainInspectorPage):

  • WebKit2.xcodeproj/project.pbxproj:
Location:
trunk/Source/WebKit2
Files:
2 deleted
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r160445 r160449  
     12013-12-11  Anders Carlsson  <andersca@apple.com>
     2
     3        Remove platform specific gunk from WebURLRequest and WebURLResponse
     4        https://bugs.webkit.org/show_bug.cgi?id=125589
     5
     6        Reviewed by Andreas Kling.
     7
     8        * Shared/API/c/WKURLRequest.cpp:
     9        (WKURLRequestCopyURL):
     10        * Shared/API/c/mac/WKURLRequestNS.mm:
     11        (WKURLRequestCopyNSURLRequest):
     12        * Shared/API/c/mac/WKURLResponseNS.mm:
     13        (WKURLResponseCopyNSURLResponse):
     14        * Shared/WebURLRequest.cpp:
     15        * Shared/WebURLRequest.h:
     16        * Shared/WebURLResponse.h:
     17        * Shared/mac/WebURLRequestMac.mm: Removed.
     18        * Shared/mac/WebURLResponseMac.mm: Removed.
     19        * UIProcess/WebInspectorProxy.cpp:
     20        (WebKit::isMainInspectorPage):
     21        * WebKit2.xcodeproj/project.pbxproj:
     22
    1232013-12-11  José Dapena Paz  <jdapena@igalia.com> and Zan Dobersek  <zdobersek@igalia.com>
    224
  • trunk/Source/WebKit2/Shared/API/c/WKURLRequest.cpp

    r156550 r160449  
    4646WKURLRef WKURLRequestCopyURL(WKURLRequestRef requestRef)
    4747{
    48     return toCopiedURLAPI(toImpl(requestRef)->url());
     48    return toCopiedURLAPI(toImpl(requestRef)->resourceRequest().url());
    4949}
    5050
  • trunk/Source/WebKit2/Shared/API/c/mac/WKURLRequestNS.mm

    r149255 r160449  
    3030#import "WebURLRequest.h"
    3131
     32using namespace WebCore;
    3233using namespace WebKit;
    3334
     
    4142NSURLRequest* WKURLRequestCopyNSURLRequest(WKURLRequestRef urlRequest)
    4243{
    43     return [toImpl(urlRequest)->platformRequest() copy];
     44    return [toImpl(urlRequest)->resourceRequest().nsURLRequest(DoNotUpdateHTTPBody) copy];
    4445}
  • trunk/Source/WebKit2/Shared/API/c/mac/WKURLResponseNS.mm

    r149255 r160449  
    4141NSURLResponse* WKURLResponseCopyNSURLResponse(WKURLResponseRef urlResponse)
    4242{
    43     return [toImpl(urlResponse)->platformResponse() copy];
     43    return [toImpl(urlResponse)->resourceResponse().nsURLResponse() copy];
    4444}
  • trunk/Source/WebKit2/Shared/WebURLRequest.cpp

    r156550 r160449  
    1616
    1717namespace WebKit {
    18 
    19 PassRefPtr<WebURLRequest> WebURLRequest::create(const URL& url)
    20 {
    21     return adoptRef(new WebURLRequest(ResourceRequest(url)));
    22 }
    2318
    2419WebURLRequest::WebURLRequest(const ResourceRequest& request)
  • trunk/Source/WebKit2/Shared/WebURLRequest.h

    r160384 r160449  
    3131#include <wtf/Forward.h>
    3232
    33 #if PLATFORM(MAC)
    34 typedef NSURLRequest* PlatformRequest;
    35 #else
    36 typedef void* PlatformRequest;
    37 #endif
    38 
    3933namespace WebKit {
    4034
    4135class WebURLRequest : public API::ObjectImpl<API::Object::Type::URLRequest> {
    4236public:
    43     static PassRefPtr<WebURLRequest> create(const WebCore::URL&);
    44 
    4537    static PassRefPtr<WebURLRequest> create(const WebCore::ResourceRequest& request)
    4638    {
     
    4840    }
    4941
    50     static PassRefPtr<WebURLRequest> create(PlatformRequest platformRequest)
    51     {
    52         return adoptRef(new WebURLRequest(platformRequest));
    53     }
    54 
    55     PlatformRequest platformRequest() const;
    5642    const WebCore::ResourceRequest& resourceRequest() const { return m_request; }
    57 
    58     const String& url() const { return m_request.url(); }
    5943
    6044    static double defaultTimeoutInterval(); // May return 0 when using platform default.
     
    6347private:
    6448    explicit WebURLRequest(const WebCore::ResourceRequest&);
    65     explicit WebURLRequest(PlatformRequest);
    6649
    6750    WebCore::ResourceRequest m_request;
  • trunk/Source/WebKit2/Shared/WebURLResponse.h

    r160384 r160449  
    3131#include <wtf/Forward.h>
    3232
    33 #if PLATFORM(MAC)
    34 typedef NSURLResponse* PlatformResponse;
    35 #else
    36 typedef void* PlatformResponse;
    37 #endif
    38 
    3933namespace WebKit {
    4034
     
    4640    }
    4741
    48     static PassRefPtr<WebURLResponse> create(PlatformResponse platformResponse)
    49     {
    50         return adoptRef(new WebURLResponse(platformResponse));
    51     }
    52 
    53     PlatformResponse platformResponse() const;
    5442    const WebCore::ResourceResponse& resourceResponse() const { return m_response; }
    5543
    5644private:
    5745    explicit WebURLResponse(const WebCore::ResourceResponse&);
    58     explicit WebURLResponse(PlatformResponse);
    5946
    6047    WebCore::ResourceResponse m_response;
  • trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp

    r160104 r160449  
    366366    // Use URL so we can compare just the paths.
    367367    URL inspectorURL(URL(), webInspectorProxy->inspectorPageURL());
    368     URL requestURL(URL(), toImpl(requestRef)->url());
     368    URL requestURL(URL(), toImpl(requestRef)->resourceRequest().url());
    369369
    370370    ASSERT(WebCore::SchemeRegistry::shouldTreatURLSchemeAsLocal(inspectorURL.protocol()));
  • trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r160391 r160449  
    10461046                BC90A1D2122DD55E00CC8C50 /* WebURLResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = BC90A1D0122DD55E00CC8C50 /* WebURLResponse.h */; };
    10471047                BC90A1D3122DD55E00CC8C50 /* WebURLResponse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC90A1D1122DD55E00CC8C50 /* WebURLResponse.cpp */; };
    1048                 BC90A1D7122DD66A00CC8C50 /* WebURLResponseMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC90A1D5122DD66A00CC8C50 /* WebURLResponseMac.mm */; };
    10491048                BC963D6B113DD19200574BE2 /* WebPage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC963D6A113DD19200574BE2 /* WebPage.cpp */; };
    10501049                BC963D6E113DD1A500574BE2 /* WebPageMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC963D6D113DD1A500574BE2 /* WebPageMac.mm */; };
     
    11521151                BCE2315D122C30CA00D5C35A /* WebURLRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = BCE2315B122C30CA00D5C35A /* WebURLRequest.h */; };
    11531152                BCE2315E122C30CA00D5C35A /* WebURLRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCE2315C122C30CA00D5C35A /* WebURLRequest.cpp */; };
    1154                 BCE231C2122C466E00D5C35A /* WebURLRequestMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCE231C0122C466E00D5C35A /* WebURLRequestMac.mm */; };
    11551153                BCE23263122C6CF300D5C35A /* WebCoreArgumentCodersMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCE23262122C6CF300D5C35A /* WebCoreArgumentCodersMac.mm */; };
    11561154                BCE469531214E6CB000B98EB /* WebFormClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCE4694F1214E6CB000B98EB /* WebFormClient.cpp */; };
     
    26492647                BC90A1D0122DD55E00CC8C50 /* WebURLResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebURLResponse.h; sourceTree = "<group>"; };
    26502648                BC90A1D1122DD55E00CC8C50 /* WebURLResponse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebURLResponse.cpp; sourceTree = "<group>"; };
    2651                 BC90A1D5122DD66A00CC8C50 /* WebURLResponseMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebURLResponseMac.mm; sourceTree = "<group>"; };
    26522649                BC963D6A113DD19200574BE2 /* WebPage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPage.cpp; sourceTree = "<group>"; };
    26532650                BC963D6D113DD1A500574BE2 /* WebPageMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPageMac.mm; sourceTree = "<group>"; };
     
    27582755                BCE2315B122C30CA00D5C35A /* WebURLRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebURLRequest.h; sourceTree = "<group>"; };
    27592756                BCE2315C122C30CA00D5C35A /* WebURLRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebURLRequest.cpp; sourceTree = "<group>"; };
    2760                 BCE231C0122C466E00D5C35A /* WebURLRequestMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebURLRequestMac.mm; sourceTree = "<group>"; };
    27612757                BCE23262122C6CF300D5C35A /* WebCoreArgumentCodersMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreArgumentCodersMac.mm; sourceTree = "<group>"; };
    27622758                BCE4694F1214E6CB000B98EB /* WebFormClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebFormClient.cpp; sourceTree = "<group>"; };
     
    47994795                                BC111B5C112F629800337BAB /* WebEventFactory.mm */,
    48004796                                905620E512BC2476000799B6 /* WebMemorySampler.mac.mm */,
    4801                                 BCE231C0122C466E00D5C35A /* WebURLRequestMac.mm */,
    4802                                 BC90A1D5122DD66A00CC8C50 /* WebURLResponseMac.mm */,
    48034797                        );
    48044798                        path = mac;
     
    73967390                                BCA0EF8012331E78007D3CFB /* WebUndoStep.cpp in Sources */,
    73977391                                BCE2315E122C30CA00D5C35A /* WebURLRequest.cpp in Sources */,
    7398                                 BCE231C2122C466E00D5C35A /* WebURLRequestMac.mm in Sources */,
    73997392                                BC90A1D3122DD55E00CC8C50 /* WebURLResponse.cpp in Sources */,
    7400                                 BC90A1D7122DD66A00CC8C50 /* WebURLResponseMac.mm in Sources */,
    74017393                                C0337DD1127A2980008FF4F4 /* WebWheelEvent.cpp in Sources */,
    74027394                                51FCB18517BBFE0300394CD8 /* AsynchronousNetworkLoaderClient.cpp in Sources */,
Note: See TracChangeset for help on using the changeset viewer.