Changeset 160449 in webkit
- Timestamp:
- Dec 11, 2013 11:18:08 AM (10 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 2 deleted
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r160445 r160449 1 2013-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 1 23 2013-12-11 José Dapena Paz <jdapena@igalia.com> and Zan Dobersek <zdobersek@igalia.com> 2 24 -
trunk/Source/WebKit2/Shared/API/c/WKURLRequest.cpp
r156550 r160449 46 46 WKURLRef WKURLRequestCopyURL(WKURLRequestRef requestRef) 47 47 { 48 return toCopiedURLAPI(toImpl(requestRef)-> url());48 return toCopiedURLAPI(toImpl(requestRef)->resourceRequest().url()); 49 49 } 50 50 -
trunk/Source/WebKit2/Shared/API/c/mac/WKURLRequestNS.mm
r149255 r160449 30 30 #import "WebURLRequest.h" 31 31 32 using namespace WebCore; 32 33 using namespace WebKit; 33 34 … … 41 42 NSURLRequest* WKURLRequestCopyNSURLRequest(WKURLRequestRef urlRequest) 42 43 { 43 return [toImpl(urlRequest)-> platformRequest() copy];44 return [toImpl(urlRequest)->resourceRequest().nsURLRequest(DoNotUpdateHTTPBody) copy]; 44 45 } -
trunk/Source/WebKit2/Shared/API/c/mac/WKURLResponseNS.mm
r149255 r160449 41 41 NSURLResponse* WKURLResponseCopyNSURLResponse(WKURLResponseRef urlResponse) 42 42 { 43 return [toImpl(urlResponse)-> platformResponse() copy];43 return [toImpl(urlResponse)->resourceResponse().nsURLResponse() copy]; 44 44 } -
trunk/Source/WebKit2/Shared/WebURLRequest.cpp
r156550 r160449 16 16 17 17 namespace WebKit { 18 19 PassRefPtr<WebURLRequest> WebURLRequest::create(const URL& url)20 {21 return adoptRef(new WebURLRequest(ResourceRequest(url)));22 }23 18 24 19 WebURLRequest::WebURLRequest(const ResourceRequest& request) -
trunk/Source/WebKit2/Shared/WebURLRequest.h
r160384 r160449 31 31 #include <wtf/Forward.h> 32 32 33 #if PLATFORM(MAC)34 typedef NSURLRequest* PlatformRequest;35 #else36 typedef void* PlatformRequest;37 #endif38 39 33 namespace WebKit { 40 34 41 35 class WebURLRequest : public API::ObjectImpl<API::Object::Type::URLRequest> { 42 36 public: 43 static PassRefPtr<WebURLRequest> create(const WebCore::URL&);44 45 37 static PassRefPtr<WebURLRequest> create(const WebCore::ResourceRequest& request) 46 38 { … … 48 40 } 49 41 50 static PassRefPtr<WebURLRequest> create(PlatformRequest platformRequest)51 {52 return adoptRef(new WebURLRequest(platformRequest));53 }54 55 PlatformRequest platformRequest() const;56 42 const WebCore::ResourceRequest& resourceRequest() const { return m_request; } 57 58 const String& url() const { return m_request.url(); }59 43 60 44 static double defaultTimeoutInterval(); // May return 0 when using platform default. … … 63 47 private: 64 48 explicit WebURLRequest(const WebCore::ResourceRequest&); 65 explicit WebURLRequest(PlatformRequest);66 49 67 50 WebCore::ResourceRequest m_request; -
trunk/Source/WebKit2/Shared/WebURLResponse.h
r160384 r160449 31 31 #include <wtf/Forward.h> 32 32 33 #if PLATFORM(MAC)34 typedef NSURLResponse* PlatformResponse;35 #else36 typedef void* PlatformResponse;37 #endif38 39 33 namespace WebKit { 40 34 … … 46 40 } 47 41 48 static PassRefPtr<WebURLResponse> create(PlatformResponse platformResponse)49 {50 return adoptRef(new WebURLResponse(platformResponse));51 }52 53 PlatformResponse platformResponse() const;54 42 const WebCore::ResourceResponse& resourceResponse() const { return m_response; } 55 43 56 44 private: 57 45 explicit WebURLResponse(const WebCore::ResourceResponse&); 58 explicit WebURLResponse(PlatformResponse);59 46 60 47 WebCore::ResourceResponse m_response; -
trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp
r160104 r160449 366 366 // Use URL so we can compare just the paths. 367 367 URL inspectorURL(URL(), webInspectorProxy->inspectorPageURL()); 368 URL requestURL(URL(), toImpl(requestRef)-> url());368 URL requestURL(URL(), toImpl(requestRef)->resourceRequest().url()); 369 369 370 370 ASSERT(WebCore::SchemeRegistry::shouldTreatURLSchemeAsLocal(inspectorURL.protocol())); -
trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
r160391 r160449 1046 1046 BC90A1D2122DD55E00CC8C50 /* WebURLResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = BC90A1D0122DD55E00CC8C50 /* WebURLResponse.h */; }; 1047 1047 BC90A1D3122DD55E00CC8C50 /* WebURLResponse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC90A1D1122DD55E00CC8C50 /* WebURLResponse.cpp */; }; 1048 BC90A1D7122DD66A00CC8C50 /* WebURLResponseMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC90A1D5122DD66A00CC8C50 /* WebURLResponseMac.mm */; };1049 1048 BC963D6B113DD19200574BE2 /* WebPage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC963D6A113DD19200574BE2 /* WebPage.cpp */; }; 1050 1049 BC963D6E113DD1A500574BE2 /* WebPageMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC963D6D113DD1A500574BE2 /* WebPageMac.mm */; }; … … 1152 1151 BCE2315D122C30CA00D5C35A /* WebURLRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = BCE2315B122C30CA00D5C35A /* WebURLRequest.h */; }; 1153 1152 BCE2315E122C30CA00D5C35A /* WebURLRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCE2315C122C30CA00D5C35A /* WebURLRequest.cpp */; }; 1154 BCE231C2122C466E00D5C35A /* WebURLRequestMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCE231C0122C466E00D5C35A /* WebURLRequestMac.mm */; };1155 1153 BCE23263122C6CF300D5C35A /* WebCoreArgumentCodersMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCE23262122C6CF300D5C35A /* WebCoreArgumentCodersMac.mm */; }; 1156 1154 BCE469531214E6CB000B98EB /* WebFormClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCE4694F1214E6CB000B98EB /* WebFormClient.cpp */; }; … … 2649 2647 BC90A1D0122DD55E00CC8C50 /* WebURLResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebURLResponse.h; sourceTree = "<group>"; }; 2650 2648 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>"; };2652 2649 BC963D6A113DD19200574BE2 /* WebPage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPage.cpp; sourceTree = "<group>"; }; 2653 2650 BC963D6D113DD1A500574BE2 /* WebPageMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPageMac.mm; sourceTree = "<group>"; }; … … 2758 2755 BCE2315B122C30CA00D5C35A /* WebURLRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebURLRequest.h; sourceTree = "<group>"; }; 2759 2756 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>"; };2761 2757 BCE23262122C6CF300D5C35A /* WebCoreArgumentCodersMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreArgumentCodersMac.mm; sourceTree = "<group>"; }; 2762 2758 BCE4694F1214E6CB000B98EB /* WebFormClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebFormClient.cpp; sourceTree = "<group>"; }; … … 4799 4795 BC111B5C112F629800337BAB /* WebEventFactory.mm */, 4800 4796 905620E512BC2476000799B6 /* WebMemorySampler.mac.mm */, 4801 BCE231C0122C466E00D5C35A /* WebURLRequestMac.mm */,4802 BC90A1D5122DD66A00CC8C50 /* WebURLResponseMac.mm */,4803 4797 ); 4804 4798 path = mac; … … 7396 7390 BCA0EF8012331E78007D3CFB /* WebUndoStep.cpp in Sources */, 7397 7391 BCE2315E122C30CA00D5C35A /* WebURLRequest.cpp in Sources */, 7398 BCE231C2122C466E00D5C35A /* WebURLRequestMac.mm in Sources */,7399 7392 BC90A1D3122DD55E00CC8C50 /* WebURLResponse.cpp in Sources */, 7400 BC90A1D7122DD66A00CC8C50 /* WebURLResponseMac.mm in Sources */,7401 7393 C0337DD1127A2980008FF4F4 /* WebWheelEvent.cpp in Sources */, 7402 7394 51FCB18517BBFE0300394CD8 /* AsynchronousNetworkLoaderClient.cpp in Sources */,
Note: See TracChangeset
for help on using the changeset viewer.