Changeset 160853 in webkit


Ignore:
Timestamp:
Dec 19, 2013 1:32:15 PM (10 years ago)
Author:
weinig@apple.com
Message:

[WK2] Rename WebURLResponse to API::URLResponse
​https://bugs.webkit.org/show_bug.cgi?id=125910

Reviewed by Andreas Kling.

  • Shared/API/c/WKSharedAPICast.h:

(WebKit::toAPI):

  • Shared/API/c/WKURLResponse.cpp:

(WKURLResponseGetTypeID):

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

(WKURLResponseCreateWithNSURLResponse):

  • Shared/APIURLRequest.cpp:
  • Shared/APIURLResponse.cpp: Copied from Source/WebKit2/Shared/WebURLResponse.cpp.

(API::URLResponse::URLResponse):
(API::URLResponse::encode):
(API::URLResponse::decode):

  • Shared/APIURLResponse.h: Copied from Source/WebKit2/Shared/WebURLResponse.h.

(API::URLResponse::create):

  • Shared/UserMessageCoders.h:

(WebKit::UserMessageEncoder::baseEncode):
(WebKit::UserMessageDecoder::baseDecode):

  • Shared/WebURLResponse.cpp: Removed.
  • Shared/WebURLResponse.h: Removed.
  • UIProcess/WebDownloadClient.cpp:

(WebKit::WebDownloadClient::didReceiveResponse):

  • UIProcess/WebPolicyClient.cpp:

(WebKit::WebPolicyClient::decidePolicyForResponse):

  • WebKit2.xcodeproj/project.pbxproj:
  • WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.cpp:

(WebKit::InjectedBundlePagePolicyClient::decidePolicyForResponse):

Location:
trunk/Source/WebKit2
Files:
10 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r160833 r160853  
     12013-12-17  Sam Weinig  <sam@webkit.org>
     2
     3        [WK2] Rename WebURLResponse to API::URLResponse
     4        https://bugs.webkit.org/show_bug.cgi?id=125910
     5
     6        Reviewed by Andreas Kling.
     7
     8        * Shared/API/c/WKSharedAPICast.h:
     9        (WebKit::toAPI):
     10        * Shared/API/c/WKURLResponse.cpp:
     11        (WKURLResponseGetTypeID):
     12        * Shared/API/c/mac/WKURLResponseNS.mm:
     13        (WKURLResponseCreateWithNSURLResponse):
     14        * Shared/APIURLRequest.cpp:
     15        * Shared/APIURLResponse.cpp: Copied from Source/WebKit2/Shared/WebURLResponse.cpp.
     16        (API::URLResponse::URLResponse):
     17        (API::URLResponse::encode):
     18        (API::URLResponse::decode):
     19        * Shared/APIURLResponse.h: Copied from Source/WebKit2/Shared/WebURLResponse.h.
     20        (API::URLResponse::create):
     21        * Shared/UserMessageCoders.h:
     22        (WebKit::UserMessageEncoder::baseEncode):
     23        (WebKit::UserMessageDecoder::baseDecode):
     24        * Shared/WebURLResponse.cpp: Removed.
     25        * Shared/WebURLResponse.h: Removed.
     26        * UIProcess/WebDownloadClient.cpp:
     27        (WebKit::WebDownloadClient::didReceiveResponse):
     28        * UIProcess/WebPolicyClient.cpp:
     29        (WebKit::WebPolicyClient::decidePolicyForResponse):
     30        * WebKit2.xcodeproj/project.pbxproj:
     31        * WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.cpp:
     32        (WebKit::InjectedBundlePagePolicyClient::decidePolicyForResponse):
     33
    1342013-12-19  Nick Diego Yamane  <nick.yamane@openbossa.org>
    235

  • trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h

    r160737 r160853  
    3030#include "APIString.h"
    3131#include "APIURLRequest.h"
     32#include "APIURLResponse.h"
    3233#include "ImageOptions.h"
    3334#include "SameDocumentNavigationType.h"
    … …  
    4849#include "WebSecurityOrigin.h"
    4950#include "WebURL.h"
    50 #include "WebURLResponse.h"
    5151#include <WebCore/ContextMenuItem.h>
    5252#include <WebCore/FloatRect.h>
    … …  
    8181class WebSecurityOrigin;
    8282class WebSerializedScriptValue;
    83 class WebURLResponse;
    8483class WebUserContentURLPattern;
    8584
    … …  
    113112WK_ADD_API_MAPPING(WKURLRef, WebURL)
    114113WK_ADD_API_MAPPING(WKURLRequestRef, API::URLRequest)
    115 WK_ADD_API_MAPPING(WKURLResponseRef, WebURLResponse)
     114WK_ADD_API_MAPPING(WKURLResponseRef, API::URLResponse)
    116115WK_ADD_API_MAPPING(WKUserContentURLPatternRef, WebUserContentURLPattern)
    117116
    … …  
    210209}
    211210
    212 inline ProxyingRefPtr<WebURLResponse> toAPI(const WebCore::ResourceResponse& response)
    213 {
    214     return ProxyingRefPtr<WebURLResponse>(WebURLResponse::create(response));
     211inline ProxyingRefPtr<API::URLResponse> toAPI(const WebCore::ResourceResponse& response)
     212{
     213    return ProxyingRefPtr<API::URLResponse>(API::URLResponse::create(response));
    215214}
    216215

  • trunk/Source/WebKit2/Shared/API/c/WKURLResponse.cpp

    r156550 r160853  
    2727#include "WKURLResponse.h"
    2828
     29#include "APIURLResponse.h"
    2930#include "WKAPICast.h"
    30 #include "WebURLResponse.h"
    3131#include <WebCore/URL.h>
    3232
    … …  
    3535WKTypeID WKURLResponseGetTypeID()
    3636{
    37     return toAPI(WebURLResponse::APIType);
     37    return toAPI(API::URLResponse::APIType);
    3838}
    3939

  • trunk/Source/WebKit2/Shared/API/c/mac/WKURLResponseNS.mm

    r160449 r160853  
    2727#import "WKURLResponseNS.h"
    2828
     29#import "APIURLResponse.h"
    2930#import "WKAPICast.h"
    30 #import "WebURLResponse.h"
    3131
    3232using namespace WebKit;
    … …  
    3535{
    3636    RetainPtr<NSURLResponse> copiedURLResponse = adoptNS([urlResponse copy]);
    37     RefPtr<WebURLResponse> response = WebURLResponse::create(copiedURLResponse.get());
     37    RefPtr<API::URLResponse> response = API::URLResponse::create(copiedURLResponse.get());
    3838    return toAPI(response.release().leakRef());
    3939}

  • trunk/Source/WebKit2/Shared/APIURLRequest.cpp

    r160737 r160853  
    2727#include "APIURLRequest.h"
    2828
    29 #include "ArgumentDecoder.h"
    30 #include "ArgumentEncoder.h"
    3129#include "WebContext.h"
     30#include "WebCoreArgumentCoders.h"
    3231
    3332using namespace WebCore;

  • trunk/Source/WebKit2/Shared/APIURLResponse.cpp

    r160748 r160853  
    2525
    2626#include "config.h"
    27 #include "WebURLResponse.h"
     27#include "APIURLResponse.h"
    2828
    29 namespace WebKit {
     29#include "WebCoreArgumentCoders.h"
    3030
    31 WebURLResponse::WebURLResponse(const WebCore::ResourceResponse& response)
     31using namespace WebCore;
     32
     33namespace API {
     34
     35URLResponse::URLResponse(const WebCore::ResourceResponse& response)
    3236    : m_response(response)
    3337{
    3438}
    3539
    36 } // namespace WebKit
     40void URLResponse::encode(IPC::ArgumentEncoder& encoder) const
     41{
     42    encoder << resourceResponse();
     43}
     44
     45bool URLResponse::decode(IPC::ArgumentDecoder& decoder, RefPtr<Object>& result)
     46{
     47    ResourceResponse response;
     48    if (!decoder.decode(response))
     49        return false;
     50   
     51    result = create(response);
     52    return true;
     53}
     54
     55} // namespace API

  • trunk/Source/WebKit2/Shared/APIURLResponse.h

    r160748 r160853  
    2424 */
    2525
    26 #ifndef WebURLResponse_h
    27 #define WebURLResponse_h
     26#ifndef APIURLResponse_h
     27#define APIURLResponse_h
    2828
    2929#include "APIObject.h"
    … …  
    3131#include <wtf/Forward.h>
    3232
    33 namespace WebKit {
     33namespace IPC {
     34class ArgumentDecoder;
     35class ArgumentEncoder;
     36}
    3437
    35 class WebURLResponse : public API::ObjectImpl<API::Object::Type::URLResponse> {
     38namespace API {
     39
     40class URLResponse : public ObjectImpl<Object::Type::URLResponse> {
    3641public:
    37     static PassRefPtr<WebURLResponse> create(const WebCore::ResourceResponse& response)
     42    static PassRefPtr<URLResponse> create(const WebCore::ResourceResponse& response)
    3843    {
    39         return adoptRef(new WebURLResponse(response));
     44        return adoptRef(new URLResponse(response));
    4045    }
    4146
    4247    const WebCore::ResourceResponse& resourceResponse() const { return m_response; }
    4348
     49    void encode(IPC::ArgumentEncoder&) const;
     50    static bool decode(IPC::ArgumentDecoder&, RefPtr<Object>&);
     51
    4452private:
    45     explicit WebURLResponse(const WebCore::ResourceResponse&);
     53    explicit URLResponse(const WebCore::ResourceResponse&);
    4654
    4755    WebCore::ResourceResponse m_response;
    4856};
    4957
    50 } // namespace WebKit
     58} // namespace API
    5159
    52 #endif // WebURLResponse_h
     60#endif // APIURLResponse_h

  • trunk/Source/WebKit2/Shared/UserMessageCoders.h

    r160737 r160853  
    3333#include "APIString.h"
    3434#include "APIURLRequest.h"
     35#include "APIURLResponse.h"
    3536#include "ArgumentDecoder.h"
    3637#include "ArgumentEncoder.h"
    … …  
    4647#include "WebSerializedScriptValue.h"
    4748#include "WebURL.h"
    48 #include "WebURLResponse.h"
    4949#include "WebUserContentURLPattern.h"
    5050
    … …  
    6666//   - WebURL -> WebURL
    6767//   - API::URLRequest -> API::URLRequest
    68 //   - WebURLResponse -> WebURLResponse
     68//   - API::URLResponse -> API::URLResponse
    6969//   - WebError -> WebError
    7070
    … …  
    183183        }
    184184        case API::Object::Type::URLResponse: {
    185             WebURLResponse* urlResponseObject = static_cast<WebURLResponse*>(m_root);
     185            API::URLResponse* urlResponseObject = static_cast<API::URLResponse*>(m_root);
    186186            encoder << urlResponseObject->resourceResponse();
    187187            return true;
    … …  
    255255//   - WebURL -> WebURL
    256256//   - API::URLRequest -> API::URLRequest
    257 //   - WebURLResponse -> WebURLResponse
     257//   - API::URLResponse -> API::URLResponse
    258258//   - WebError -> WebError
    259259
    … …  
    472472            if (!decoder.decode(response))
    473473                return false;
    474             coder.m_root = WebURLResponse::create(response);
     474            coder.m_root = API::URLResponse::create(response);
    475475            break;
    476476        }

  • trunk/Source/WebKit2/UIProcess/WebDownloadClient.cpp

    r159988 r160853  
    2727#include "WebDownloadClient.h"
    2828
     29#include "APIURLResponse.h"
    2930#include "WKAPICast.h"
    30 #include "WebURLResponse.h"
    3131#include "WKRetainPtr.h"
    3232
    … …  
    5656        return;
    5757
    58     m_client.didReceiveResponse(toAPI(webContext), toAPI(downloadProxy), toAPI(WebURLResponse::create(response).get()), m_client.base.clientInfo);
     58    m_client.didReceiveResponse(toAPI(webContext), toAPI(downloadProxy), toAPI(API::URLResponse::create(response).get()), m_client.base.clientInfo);
    5959}
    6060

  • trunk/Source/WebKit2/UIProcess/WebPolicyClient.cpp

    r160737 r160853  
    6969        return false;
    7070
    71     RefPtr<WebURLResponse> response = WebURLResponse::create(resourceResponse);
     71    RefPtr<API::URLResponse> response = API::URLResponse::create(resourceResponse);
    7272    RefPtr<API::URLRequest> request = API::URLRequest::create(resourceRequest);
    7373

  • trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r160818 r160853  
    10821082                BC8F2F2E16273ACC005FACB5 /* WKWebProcessPlugInBrowserContextControllerInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8F2F2D16273ACB005FACB5 /* WKWebProcessPlugInBrowserContextControllerInternal.h */; };
    10831083                BC9099801256A98200083756 /* WKStringPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = BC90997F1256A98200083756 /* WKStringPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    1084                 BC90A1D2122DD55E00CC8C50 /* WebURLResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = BC90A1D0122DD55E00CC8C50 /* WebURLResponse.h */; };
    1085                 BC90A1D3122DD55E00CC8C50 /* WebURLResponse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC90A1D1122DD55E00CC8C50 /* WebURLResponse.cpp */; };
     1084                BC90A1D2122DD55E00CC8C50 /* APIURLResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = BC90A1D0122DD55E00CC8C50 /* APIURLResponse.h */; };
     1085                BC90A1D3122DD55E00CC8C50 /* APIURLResponse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC90A1D1122DD55E00CC8C50 /* APIURLResponse.cpp */; };
    10861086                BC963D6B113DD19200574BE2 /* WebPage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC963D6A113DD19200574BE2 /* WebPage.cpp */; };
    10871087                BC963D6E113DD1A500574BE2 /* WebPageMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC963D6D113DD1A500574BE2 /* WebPageMac.mm */; };
    … …  
    27232723                BC8F2F2D16273ACB005FACB5 /* WKWebProcessPlugInBrowserContextControllerInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInBrowserContextControllerInternal.h; sourceTree = "<group>"; };
    27242724                BC90997F1256A98200083756 /* WKStringPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKStringPrivate.h; sourceTree = "<group>"; };
    2725                 BC90A1D0122DD55E00CC8C50 /* WebURLResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebURLResponse.h; sourceTree = "<group>"; };
    2726                 BC90A1D1122DD55E00CC8C50 /* WebURLResponse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebURLResponse.cpp; sourceTree = "<group>"; };
     2725                BC90A1D0122DD55E00CC8C50 /* APIURLResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIURLResponse.h; sourceTree = "<group>"; };
     2726                BC90A1D1122DD55E00CC8C50 /* APIURLResponse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIURLResponse.cpp; sourceTree = "<group>"; };
    27272727                BC963D6A113DD19200574BE2 /* WebPage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPage.cpp; sourceTree = "<group>"; };
    27282728                BC963D6D113DD1A500574BE2 /* WebPageMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPageMac.mm; sourceTree = "<group>"; };
    … …  
    35143514                                BCE2315C122C30CA00D5C35A /* APIURLRequest.cpp */,
    35153515                                BCE2315B122C30CA00D5C35A /* APIURLRequest.h */,
     3516                                BC90A1D1122DD55E00CC8C50 /* APIURLResponse.cpp */,
     3517                                BC90A1D0122DD55E00CC8C50 /* APIURLResponse.h */,
    35163518                                A7D792D51767CB6E00881CBE /* ActivityAssertion.cpp */,
    35173519                                A7D792D41767CB0900881CBE /* ActivityAssertion.h */,
    … …  
    36433645                                C0337DD7127A51B6008FF4F4 /* WebTouchEvent.cpp */,
    36443646                                BCDB86C01200FB97007254BE /* WebURL.h */,
    3645                                 BC90A1D1122DD55E00CC8C50 /* WebURLResponse.cpp */,
    3646                                 BC90A1D0122DD55E00CC8C50 /* WebURLResponse.h */,
    36473647                                F6113E24126CE1820057D0A7 /* WebUserContentURLPattern.h */,
    36483648                                C0337DD0127A2980008FF4F4 /* WebWheelEvent.cpp */,
    … …  
    61876187                                51C96119183D294700D2002E /* WebIDBServerConnectionMessages.h in Headers */,
    61886188                                BCE2315D122C30CA00D5C35A /* APIURLRequest.h in Headers */,
    6189                                 BC90A1D2122DD55E00CC8C50 /* WebURLResponse.h in Headers */,
     6189                                BC90A1D2122DD55E00CC8C50 /* APIURLResponse.h in Headers */,
    61906190                                F6113E25126CE1820057D0A7 /* WebUserContentURLPattern.h in Headers */,
    61916191                                29CD55AA128E294F00133C85 /* WKAccessibilityWebPageObject.h in Headers */,
    … …  
    75547554                                BCA0EF8012331E78007D3CFB /* WebUndoStep.cpp in Sources */,
    75557555                                BCE2315E122C30CA00D5C35A /* APIURLRequest.cpp in Sources */,
    7556                                 BC90A1D3122DD55E00CC8C50 /* WebURLResponse.cpp in Sources */,
     7556                                BC90A1D3122DD55E00CC8C50 /* APIURLResponse.cpp in Sources */,
    75577557                                C0337DD1127A2980008FF4F4 /* WebWheelEvent.cpp in Sources */,
    75587558                                51FCB18517BBFE0300394CD8 /* AsynchronousNetworkLoaderClient.cpp in Sources */,

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.cpp

    r160737 r160853  
    6666        return WKBundlePagePolicyActionPassThrough;
    6767
    68     RefPtr<WebURLResponse> response = WebURLResponse::create(resourceResponse);
     68    RefPtr<API::URLResponse> response = API::URLResponse::create(resourceResponse);
    6969    RefPtr<API::URLRequest> request = API::URLRequest::create(resourceRequest);
    7070
Note: See TracChangeset for help on using the changeset viewer.