Changeset 160969 in webkit


Ignore:
Timestamp:
Dec 21, 2013 4:57:06 PM (10 years ago)
Author:
weinig@apple.com
Message:

[WK2] Rename WebURL to API::URL
https://bugs.webkit.org/show_bug.cgi?id=126100

Reviewed by Anders Carlsson.

  • Shared/API/c/WKSharedAPICast.h:

(WebKit::toURLRef):
(WebKit::toCopiedURLAPI):

  • Shared/API/c/WKURL.cpp:

(WKURLGetTypeID):
(WKURLCreateWithUTF8CString):
(WKURLCreateWithBaseURL):

  • Shared/API/c/cf/WKURLCF.mm:

(WKURLCreateWithCFURL):

  • Shared/APIURL.h: Copied from Source/WebKit2/Shared/WebURL.h.

(API::URL::create):
(API::URL::string):
(API::URL::host):
(API::URL::protocol):
(API::URL::path):
(API::URL::lastPathComponent):
(API::URL::encode):
(API::URL::decode):
(API::URL::URL):

  • Shared/Cocoa/WKNSURL.h:

(WebKit::wrapper):

  • Shared/Cocoa/WKNSURL.mm:

(-[WKNSURL _web_createTarget]):

  • Shared/Plugins/Netscape/PluginInformation.cpp:

(WebKit::createPluginInformationDictionary):

  • Shared/UserData.cpp:

(WebKit::UserData::encode):
(WebKit::UserData::decode):

  • Shared/UserMessageCoders.h:

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

  • Shared/WebArchiveResource.h:
  • Shared/WebURL.h: Removed.
  • UIProcess/WebFrameProxy.cpp:

(WebKit::WebFrameProxy::getResourceData):

  • UIProcess/WebFrameProxy.h:
  • UIProcess/WebIconDatabase.cpp:

(WebKit::WebIconDatabase::didChangeIconForPageURL):
(WebKit::WebIconDatabase::notifyIconDataReadyForPageURL):

  • UIProcess/WebIconDatabaseClient.cpp:

(WebKit::WebIconDatabaseClient::didChangeIconForPageURL):
(WebKit::WebIconDatabaseClient::iconDataReadyForPageURL):

  • UIProcess/WebIconDatabaseClient.h:
  • UIProcess/WebOpenPanelResultListenerProxy.cpp:

(WebKit::WebOpenPanelResultListenerProxy::chooseFiles):

  • UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::getResourceDataFromFrame):

  • UIProcess/WebPageProxy.h:
  • WebKit2.xcodeproj/project.pbxproj:
  • WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
Location:
trunk/Source/WebKit2
Files:
20 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r160965 r160969  
     12013-12-20  Sam Weinig  <sam@webkit.org>
     2
     3        [WK2] Rename WebURL to API::URL
     4        https://bugs.webkit.org/show_bug.cgi?id=126100
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * Shared/API/c/WKSharedAPICast.h:
     9        (WebKit::toURLRef):
     10        (WebKit::toCopiedURLAPI):
     11        * Shared/API/c/WKURL.cpp:
     12        (WKURLGetTypeID):
     13        (WKURLCreateWithUTF8CString):
     14        (WKURLCreateWithBaseURL):
     15        * Shared/API/c/cf/WKURLCF.mm:
     16        (WKURLCreateWithCFURL):
     17        * Shared/APIURL.h: Copied from Source/WebKit2/Shared/WebURL.h.
     18        (API::URL::create):
     19        (API::URL::string):
     20        (API::URL::host):
     21        (API::URL::protocol):
     22        (API::URL::path):
     23        (API::URL::lastPathComponent):
     24        (API::URL::encode):
     25        (API::URL::decode):
     26        (API::URL::URL):
     27        * Shared/Cocoa/WKNSURL.h:
     28        (WebKit::wrapper):
     29        * Shared/Cocoa/WKNSURL.mm:
     30        (-[WKNSURL _web_createTarget]):
     31        * Shared/Plugins/Netscape/PluginInformation.cpp:
     32        (WebKit::createPluginInformationDictionary):
     33        * Shared/UserData.cpp:
     34        (WebKit::UserData::encode):
     35        (WebKit::UserData::decode):
     36        * Shared/UserMessageCoders.h:
     37        (WebKit::UserMessageEncoder::baseEncode):
     38        (WebKit::UserMessageDecoder::baseDecode):
     39        * Shared/WebArchiveResource.h:
     40        * Shared/WebURL.h: Removed.
     41        * UIProcess/WebFrameProxy.cpp:
     42        (WebKit::WebFrameProxy::getResourceData):
     43        * UIProcess/WebFrameProxy.h:
     44        * UIProcess/WebIconDatabase.cpp:
     45        (WebKit::WebIconDatabase::didChangeIconForPageURL):
     46        (WebKit::WebIconDatabase::notifyIconDataReadyForPageURL):
     47        * UIProcess/WebIconDatabaseClient.cpp:
     48        (WebKit::WebIconDatabaseClient::didChangeIconForPageURL):
     49        (WebKit::WebIconDatabaseClient::iconDataReadyForPageURL):
     50        * UIProcess/WebIconDatabaseClient.h:
     51        * UIProcess/WebOpenPanelResultListenerProxy.cpp:
     52        (WebKit::WebOpenPanelResultListenerProxy::chooseFiles):
     53        * UIProcess/WebPageProxy.cpp:
     54        (WebKit::WebPageProxy::getResourceDataFromFrame):
     55        * UIProcess/WebPageProxy.h:
     56        * WebKit2.xcodeproj/project.pbxproj:
     57        * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
     58
    1592013-12-21  Carlos Garcia Campos  <cgarcia@igalia.com>
    260
  • trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h

    r160853 r160969  
    2929#include "APINumber.h"
    3030#include "APIString.h"
     31#include "APIURL.h"
    3132#include "APIURLRequest.h"
    3233#include "APIURLResponse.h"
     
    4849#include "WebFindOptions.h"
    4950#include "WebSecurityOrigin.h"
    50 #include "WebURL.h"
    5151#include <WebCore/ContextMenuItem.h>
    5252#include <WebCore/FloatRect.h>
     
    110110WK_ADD_API_MAPPING(WKTypeRef, API::Object)
    111111WK_ADD_API_MAPPING(WKUInt64Ref, API::UInt64)
    112 WK_ADD_API_MAPPING(WKURLRef, WebURL)
     112WK_ADD_API_MAPPING(WKURLRef, API::URL)
    113113WK_ADD_API_MAPPING(WKURLRequestRef, API::URLRequest)
    114114WK_ADD_API_MAPPING(WKURLResponseRef, API::URLResponse)
     
    170170}
    171171
    172 inline ProxyingRefPtr<WebURL> toURLRef(StringImpl* string)
     172inline ProxyingRefPtr<API::URL> toURLRef(StringImpl* string)
    173173{
    174174    if (!string)
    175         return ProxyingRefPtr<WebURL>(0);
    176     return ProxyingRefPtr<WebURL>(WebURL::create(String(string)));
     175        return ProxyingRefPtr<API::URL>(0);
     176    return ProxyingRefPtr<API::URL>(API::URL::create(String(string)));
    177177}
    178178
     
    181181    if (!string)
    182182        return 0;
    183     RefPtr<WebURL> webURL = WebURL::create(string);
    184     return toAPI(webURL.release().leakRef());
     183    RefPtr<API::URL> url = API::URL::create(string);
     184    return toAPI(url.release().leakRef());
    185185}
    186186
  • trunk/Source/WebKit2/Shared/API/c/WKURL.cpp

    r131437 r160969  
    3333WKTypeID WKURLGetTypeID()
    3434{
    35     return toAPI(WebURL::APIType);
     35    return toAPI(API::URL::APIType);
    3636}
    3737
    3838WKURLRef WKURLCreateWithUTF8CString(const char* string)
    3939{
    40     return toAPI(WebURL::create(String::fromUTF8(string)).leakRef());
     40    return toAPI(API::URL::create(String::fromUTF8(string)).leakRef());
    4141}
    4242
    4343WKURLRef WKURLCreateWithBaseURL(WKURLRef baseURL, const char* relative)
    4444{
    45     return toAPI(WebURL::create(toImpl(baseURL), String::fromUTF8(relative)).leakRef());
     45    return toAPI(API::URL::create(toImpl(baseURL), String::fromUTF8(relative)).leakRef());
    4646}
    4747
  • trunk/Source/WebKit2/Shared/API/c/cf/WKURLCF.mm

    r159016 r160969  
    5656    // Since WKNSURL is an internal class with no subclasses, we can do a simple equality check.
    5757    if (object_getClass((NSURL *)cfURL) == wkNSURLClass()) {
    58         return toAPI(static_cast<WebURL*>(&[(WKNSURL *)cfURL retain]._apiObject));
     58        return toAPI(static_cast<API::URL*>(&[(WKNSURL *)cfURL retain]._apiObject));
    5959    }
    6060#endif
  • trunk/Source/WebKit2/Shared/APIURL.h

    r160938 r160969  
    2828
    2929#include "APIObject.h"
     30#include "WebCoreArgumentCoders.h"
    3031#include <WebCore/URL.h>
    3132#include <wtf/OwnPtr.h>
     
    3435#include <wtf/text/WTFString.h>
    3536
    36 namespace WebKit {
     37namespace API {
    3738
    38 // WebURL - A URL type suitable for vending to an API.
    39 
    40 class WebURL : public API::ObjectImpl<API::Object::Type::URL> {
     39class URL : public ObjectImpl<Object::Type::URL> {
    4140public:
    42     static PassRefPtr<WebURL> create(const String& string)
     41    static PassRefPtr<URL> create(const WTF::String& string)
    4342    {
    44         return adoptRef(new WebURL(string));
     43        return adoptRef(new URL(string));
    4544    }
    4645
    47     static PassRefPtr<WebURL> create(const WebURL* baseURL, const String& relativeURL)
     46    static PassRefPtr<URL> create(const URL* baseURL, const WTF::String& relativeURL)
    4847    {
    49         using WebCore::URL;
    50 
    5148        ASSERT(baseURL);
    5249        baseURL->parseURLIfNecessary();
    53         auto absoluteURL = std::make_unique<URL>(*baseURL->m_parsedURL.get(), relativeURL);
    54         const String& absoluteURLString = absoluteURL->string();
     50        auto absoluteURL = std::make_unique<WebCore::URL>(*baseURL->m_parsedURL.get(), relativeURL);
     51        const WTF::String& absoluteURLString = absoluteURL->string();
    5552
    56         return adoptRef(new WebURL(std::move(absoluteURL), absoluteURLString));
     53        return adoptRef(new URL(std::move(absoluteURL), absoluteURLString));
    5754    }
    5855
     
    6057    bool isEmpty() const { return m_string.isEmpty(); }
    6158
    62     const String& string() const { return m_string; }
     59    const WTF::String& string() const { return m_string; }
    6360
    64     String host() const
     61    WTF::String host() const
    6562    {
    6663        parseURLIfNecessary();
    67         return m_parsedURL->isValid() ? m_parsedURL->host() : String();
     64        return m_parsedURL->isValid() ? m_parsedURL->host() : WTF::String();
    6865    }
    6966
    70     String protocol() const
     67    WTF::String protocol() const
    7168    {
    7269        parseURLIfNecessary();
    73         return m_parsedURL->isValid() ? m_parsedURL->protocol() : String();
     70        return m_parsedURL->isValid() ? m_parsedURL->protocol() : WTF::String();
    7471    }
    7572
    76     String path() const
     73    WTF::String path() const
    7774    {
    7875        parseURLIfNecessary();
    79         return m_parsedURL->isValid() ? m_parsedURL->path() : String();
     76        return m_parsedURL->isValid() ? m_parsedURL->path() : WTF::String();
    8077    }
    8178
    82     String lastPathComponent() const
     79    WTF::String lastPathComponent() const
    8380    {
    8481        parseURLIfNecessary();
    85         return m_parsedURL->isValid() ? m_parsedURL->lastPathComponent() : String();
     82        return m_parsedURL->isValid() ? m_parsedURL->lastPathComponent() : WTF::String();
     83    }
     84
     85    void encode(IPC::ArgumentEncoder& encoder) const
     86    {
     87        encoder << m_string;
     88    }
     89
     90    static bool decode(IPC::ArgumentDecoder& decoder, RefPtr<Object>& result)
     91    {
     92        WTF::String string;
     93        if (!decoder.decode(string))
     94            return false;
     95       
     96        result = create(string);
     97        return true;
    8698    }
    8799
    88100private:
    89     WebURL(const String& string)
     101    URL(const WTF::String& string)
    90102        : m_string(string)
    91103    {
    92104    }
    93105
    94     WebURL(std::unique_ptr<WebCore::URL> parsedURL, const String& string)
     106    URL(std::unique_ptr<WebCore::URL> parsedURL, const WTF::String& string)
    95107        : m_string(string)
    96108        , m_parsedURL(std::move(parsedURL))
     
    105117    }
    106118
    107     String m_string;
     119    WTF::String m_string;
    108120    mutable std::unique_ptr<WebCore::URL> m_parsedURL;
    109121};
     
    111123} // namespace WebKit
    112124
    113 #endif // WebURL_h
     125#endif // URL_h
  • trunk/Source/WebKit2/Shared/Cocoa/WKNSURL.h

    r158753 r160969  
    2828#if WK_API_ENABLED
    2929
     30#import "APIURL.h"
    3031#import "WKObject.h"
    31 #import "WebURL.h"
    3232
    3333namespace WebKit {
    34 inline NSURL *wrapper(WebURL& url) { ASSERT([url.wrapper() isKindOfClass:[NSURL class]]); return (NSURL *)url.wrapper(); }
     34
     35inline NSURL *wrapper(API::URL& url)
     36{
     37    ASSERT([url.wrapper() isKindOfClass:[NSURL class]]);
     38    return (NSURL *)url.wrapper();
     39}
     40
    3541}
    3642
  • trunk/Source/WebKit2/Shared/Cocoa/WKNSURL.mm

    r158324 r160969  
    2929#if WK_API_ENABLED
    3030
     31#import "APIURL.h"
    3132#import "WKAPICast.h"
    3233#import "WKURLCF.h"
    33 #import "WebURL.h"
    34 
    35 using namespace WebKit;
    3634
    3735@implementation WKNSURL
     
    3937- (NSObject *)_web_createTarget
    4038{
    41     return (NSURL *)CFMakeCollectable(WKURLCopyCFURL(kCFAllocatorDefault, toAPI(reinterpret_cast<WebURL*>(&self._apiObject))));
     39    return (NSURL *)CFMakeCollectable(WKURLCopyCFURL(kCFAllocatorDefault, WebKit::toAPI(reinterpret_cast<API::URL*>(&self._apiObject))));
    4240}
    4341
  • trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.cpp

    r160608 r160969  
    3131#include "APINumber.h"
    3232#include "APIString.h"
     33#include "APIURL.h"
    3334#include "PluginInfoStore.h"
    3435#include "PluginModuleInfo.h"
    3536#include "WKAPICast.h"
    36 #include "WebURL.h"
    3737#include <wtf/text/WTFString.h>
    3838
     
    137137
    138138    if (!frameURLString.isEmpty())
    139         map.set(pluginInformationFrameURLKey(), WebURL::create(frameURLString));
     139        map.set(pluginInformationFrameURLKey(), API::URL::create(frameURLString));
    140140    if (!mimeType.isEmpty())
    141141        map.set(pluginInformationMIMETypeKey(), API::String::create(mimeType));
    142142    if (!pageURLString.isEmpty())
    143         map.set(pluginInformationPageURLKey(), WebURL::create(pageURLString));
     143        map.set(pluginInformationPageURLKey(), API::URL::create(pageURLString));
    144144    if (!pluginspageAttributeURLString.isEmpty())
    145         map.set(pluginInformationPluginspageAttributeURLKey(), WebURL::create(pluginspageAttributeURLString));
     145        map.set(pluginInformationPluginspageAttributeURLKey(), API::URL::create(pluginspageAttributeURLString));
    146146    if (!pluginURLString.isEmpty())
    147         map.set(pluginInformationPluginURLKey(), WebURL::create(pluginURLString));
     147        map.set(pluginInformationPluginURLKey(), API::URL::create(pluginURLString));
    148148    map.set(plugInInformationReplacementObscuredKey(), API::Boolean::create(replacementObscured));
    149149
     
    156156
    157157    if (!frameURLString.isEmpty())
    158         map.set(pluginInformationFrameURLKey(), WebURL::create(frameURLString));
     158        map.set(pluginInformationFrameURLKey(), API::URL::create(frameURLString));
    159159    if (!mimeType.isEmpty())
    160160        map.set(pluginInformationMIMETypeKey(), API::String::create(mimeType));
    161161    if (!pageURLString.isEmpty())
    162         map.set(pluginInformationPageURLKey(), WebURL::create(pageURLString));
     162        map.set(pluginInformationPageURLKey(), API::URL::create(pageURLString));
    163163
    164164    return ImmutableDictionary::create(std::move(map));
  • trunk/Source/WebKit2/Shared/UserData.cpp

    r160776 r160969  
    3333#include "APINumber.h"
    3434#include "APIString.h"
     35#include "APIURL.h"
    3536#include "APIURLRequest.h"
     37#include "APIURLResponse.h"
    3638#include "ArgumentCoders.h"
    3739#include "ArgumentEncoder.h"
    3840#include "MutableDictionary.h"
    3941#include "WebSerializedScriptValue.h"
    40 #include "WebURL.h"
    4142
    4243namespace WebKit {
     
    166167
    167168    case API::Object::Type::URL: {
    168         auto& url = static_cast<const WebURL&>(object);
    169         encoder << url.string();
     169        static_cast<const API::URL&>(object).encode(encoder);
    170170        break;
    171171    }
     
    173173    case API::Object::Type::URLRequest:
    174174        static_cast<const API::URLRequest&>(object).encode(encoder);
     175        break;
     176
     177    case API::Object::Type::URLResponse:
     178        static_cast<const API::URLResponse&>(object).encode(encoder);
    175179        break;
    176180
     
    294298    }
    295299
    296     case API::Object::Type::URL: {
    297         String string;
    298         if (!decoder.decode(string))
    299             return false;
    300         result = WebURL::create(string);
    301         break;
    302     }
     300    case API::Object::Type::URL:
     301        if (!API::URL::decode(decoder, result))
     302            return false;
     303        break;
    303304
    304305    case API::Object::Type::URLRequest:
     
    307308        break;
    308309
     310    case API::Object::Type::URLResponse:
     311        if (!API::URLResponse::decode(decoder, result))
     312            return false;
     313        break;
     314
    309315    case API::Object::Type::UInt64:
    310316        if (!API::UInt64::decode(decoder, result))
  • trunk/Source/WebKit2/Shared/UserMessageCoders.h

    r160853 r160969  
    3232#include "APINumber.h"
    3333#include "APIString.h"
     34#include "APIURL.h"
    3435#include "APIURLRequest.h"
    3536#include "APIURLResponse.h"
     
    4647#include "WebRenderObject.h"
    4748#include "WebSerializedScriptValue.h"
    48 #include "WebURL.h"
    4949#include "WebUserContentURLPattern.h"
    5050
     
    6464//   - WebRenderObject -> WebRenderObject
    6565//   - API::UInt64 -> API::UInt64
    66 //   - WebURL -> WebURL
     66//   - API::URL -> API::URL
    6767//   - API::URLRequest -> API::URLRequest
    6868//   - API::URLResponse -> API::URLResponse
     
    173173        }
    174174        case API::Object::Type::URL: {
    175             WebURL* urlObject = static_cast<WebURL*>(m_root);
     175            API::URL* urlObject = static_cast<API::URL*>(m_root);
    176176            encoder << urlObject->string();
    177177            return true;
     
    253253//   - WebImage -> WebImage
    254254//   - API::UInt64 -> API::UInt64
    255 //   - WebURL -> WebURL
     255//   - API::URL -> API::URL
    256256//   - API::URLRequest -> API::URLRequest
    257257//   - API::URLResponse -> API::URLResponse
     
    458458            if (!decoder.decode(string))
    459459                return false;
    460             coder.m_root = WebURL::create(string);
     460            coder.m_root = API::URL::create(string);
    461461            break;
    462462        }
  • trunk/Source/WebKit2/Shared/WebArchiveResource.h

    r160653 r160969  
    3636namespace API {
    3737class Data;
     38class URL;
    3839}
    3940
     
    4344
    4445namespace WebKit {
    45 
    46 class WebURL;
    4746
    4847class WebArchiveResource : public API::ObjectImpl<API::Object::Type::WebArchiveResource> {
  • trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp

    r160487 r160969  
    216216}
    217217
    218 void WebFrameProxy::getResourceData(WebURL* resourceURL, PassRefPtr<DataCallback> callback)
     218void WebFrameProxy::getResourceData(API::URL* resourceURL, PassRefPtr<DataCallback> callback)
    219219{
    220220    if (!m_page) {
  • trunk/Source/WebKit2/UIProcess/WebFrameProxy.h

    r160487 r160969  
    9898    void getWebArchive(PassRefPtr<DataCallback>);
    9999    void getMainResourceData(PassRefPtr<DataCallback>);
    100     void getResourceData(WebURL*, PassRefPtr<DataCallback>);
     100    void getResourceData(API::URL*, PassRefPtr<DataCallback>);
    101101
    102102    void didStartProvisionalLoad(const String& url);
  • trunk/Source/WebKit2/UIProcess/WebIconDatabase.cpp

    r160464 r160969  
    258258void WebIconDatabase::didChangeIconForPageURL(const String& pageURL)
    259259{
    260     m_iconDatabaseClient.didChangeIconForPageURL(this, WebURL::create(pageURL).get());
     260    m_iconDatabaseClient.didChangeIconForPageURL(this, API::URL::create(pageURL).get());
    261261}
    262262
     
    296296void WebIconDatabase::notifyIconDataReadyForPageURL(const String& pageURL)
    297297{
    298     m_iconDatabaseClient.iconDataReadyForPageURL(this, WebURL::create(pageURL).get());
     298    m_iconDatabaseClient.iconDataReadyForPageURL(this, API::URL::create(pageURL).get());
    299299    didChangeIconForPageURL(pageURL);
    300300}
  • trunk/Source/WebKit2/UIProcess/WebIconDatabaseClient.cpp

    r159988 r160969  
    3232namespace WebKit {
    3333
    34 void WebIconDatabaseClient::didChangeIconForPageURL(WebIconDatabase* iconDatabase, WebURL* url)
     34void WebIconDatabaseClient::didChangeIconForPageURL(WebIconDatabase* iconDatabase, API::URL* url)
    3535{
    3636    if (!m_client.didChangeIconForPageURL)
     
    4848}
    4949
    50 void WebIconDatabaseClient::iconDataReadyForPageURL(WebIconDatabase* iconDatabase, WebURL* url)
     50void WebIconDatabaseClient::iconDataReadyForPageURL(WebIconDatabase* iconDatabase, API::URL* url)
    5151{
    5252    if (!m_client.iconDataReadyForPageURL)
  • trunk/Source/WebKit2/UIProcess/WebIconDatabaseClient.h

    r159994 r160969  
    3131
    3232namespace API {
     33class URL;
    3334template<> struct ClientTraits<WKIconDatabaseClientBase> {
    3435    typedef std::tuple<WKIconDatabaseClientV0, WKIconDatabaseClientV1> Versions;
     
    3940
    4041class WebIconDatabase;
    41 class WebURL;
    4242
    4343class WebIconDatabaseClient : public API::Client<WKIconDatabaseClientBase> {
    4444public:
    45     void didChangeIconForPageURL(WebIconDatabase*, WebURL*);
     45    void didChangeIconForPageURL(WebIconDatabase*, API::URL*);
    4646    void didRemoveAllIcons(WebIconDatabase*);
    47     void iconDataReadyForPageURL(WebIconDatabase*, WebURL*);
     47    void iconDataReadyForPageURL(WebIconDatabase*, API::URL*);
    4848};
    4949
  • trunk/Source/WebKit2/UIProcess/WebOpenPanelResultListenerProxy.cpp

    r159234 r160969  
    5656
    5757    for (size_t i = 0; i < size; ++i) {
    58         WebURL* webURL = fileURLsArray->at<WebURL>(i);
    59         if (webURL) {
    60             URL url(URL(), webURL->string());
     58        API::URL* apiURL = fileURLsArray->at<API::URL>(i);
     59        if (apiURL) {
     60            URL url(URL(), apiURL->string());
    6161            filePaths.uncheckedAppend(url.fileSystemPath());
    6262        }
  • trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r160790 r160969  
    19841984}
    19851985
    1986 void WebPageProxy::getResourceDataFromFrame(WebFrameProxy* frame, WebURL* resourceURL, PassRefPtr<DataCallback> prpCallback)
     1986void WebPageProxy::getResourceDataFromFrame(WebFrameProxy* frame, API::URL* resourceURL, PassRefPtr<DataCallback> prpCallback)
    19871987{
    19881988    RefPtr<DataCallback> callback = prpCallback;
  • trunk/Source/WebKit2/UIProcess/WebPageProxy.h

    r160737 r160969  
    638638#endif
    639639    void getMainResourceDataOfFrame(WebFrameProxy*, PassRefPtr<DataCallback>);
    640     void getResourceDataFromFrame(WebFrameProxy*, WebURL*, PassRefPtr<DataCallback>);
     640    void getResourceDataFromFrame(WebFrameProxy*, API::URL*, PassRefPtr<DataCallback>);
    641641    void getRenderTreeExternalRepresentation(PassRefPtr<StringCallback>);
    642642    void getSelectionOrContentsAsString(PassRefPtr<StringCallback>);
  • trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r160853 r160969  
    11741174                BCD598AC112B7FDF00EC8C23 /* WebPreferencesStore.h in Headers */ = {isa = PBXBuildFile; fileRef = BCD598AA112B7FDF00EC8C23 /* WebPreferencesStore.h */; };
    11751175                BCD598AD112B7FDF00EC8C23 /* WebPreferencesStore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCD598AB112B7FDF00EC8C23 /* WebPreferencesStore.cpp */; };
    1176                 BCDB86C11200FB97007254BE /* WebURL.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDB86C01200FB97007254BE /* WebURL.h */; };
     1176                BCDB86C11200FB97007254BE /* APIURL.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDB86C01200FB97007254BE /* APIURL.h */; };
    11771177                BCDDB317124EBD130048D13C /* WKBase.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDDB316124EBD130048D13C /* WKBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
    11781178                BCDDB32B124EC2AB0048D13C /* WKSharedAPICast.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDDB32A124EC2AB0048D13C /* WKSharedAPICast.h */; };
     
    19681968                2D819B9A186275B3001F03D1 /* ViewGestureGeometryCollector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewGestureGeometryCollector.h; sourceTree = "<group>"; };
    19691969                2D819B9B186275B3001F03D1 /* ViewGestureGeometryCollector.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ViewGestureGeometryCollector.messages.in; sourceTree = "<group>"; };
    1970                 2D819B9F1862800E001F03D1 /* ViewGestureGeometryCollectorMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ViewGestureGeometryCollectorMessageReceiver.cpp; path = ViewGestureGeometryCollectorMessageReceiver.cpp; sourceTree = "<group>"; };
    1971                 2D819BA01862800E001F03D1 /* ViewGestureGeometryCollectorMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ViewGestureGeometryCollectorMessages.h; path = ViewGestureGeometryCollectorMessages.h; sourceTree = "<group>"; };
     1970                2D819B9F1862800E001F03D1 /* ViewGestureGeometryCollectorMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ViewGestureGeometryCollectorMessageReceiver.cpp; sourceTree = "<group>"; };
     1971                2D819BA01862800E001F03D1 /* ViewGestureGeometryCollectorMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewGestureGeometryCollectorMessages.h; sourceTree = "<group>"; };
    19721972                2D870D0D1622B7F9000A3F20 /* PDFPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PDFPlugin.h; path = PDF/PDFPlugin.h; sourceTree = "<group>"; };
    19731973                2D870D0E1622B7F9000A3F20 /* PDFPlugin.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PDFPlugin.mm; path = PDF/PDFPlugin.mm; sourceTree = "<group>"; };
     
    28192819                BCD598AA112B7FDF00EC8C23 /* WebPreferencesStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPreferencesStore.h; sourceTree = "<group>"; };
    28202820                BCD598AB112B7FDF00EC8C23 /* WebPreferencesStore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPreferencesStore.cpp; sourceTree = "<group>"; };
    2821                 BCDB86C01200FB97007254BE /* WebURL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebURL.h; sourceTree = "<group>"; };
     2821                BCDB86C01200FB97007254BE /* APIURL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIURL.h; sourceTree = "<group>"; };
    28222822                BCDDB316124EBD130048D13C /* WKBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBase.h; sourceTree = "<group>"; };
    28232823                BCDDB32A124EC2AB0048D13C /* WKSharedAPICast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKSharedAPICast.h; sourceTree = "<group>"; };
     
    35123512                                1AC1336B18565C7A00F3EC05 /* APIPageHandle.h */,
    35133513                                BCF04C8E11FF9F6E00F86A58 /* APIString.h */,
     3514                                BCDB86C01200FB97007254BE /* APIURL.h */,
    35143515                                BCE2315C122C30CA00D5C35A /* APIURLRequest.cpp */,
    35153516                                BCE2315B122C30CA00D5C35A /* APIURLRequest.h */,
     
    36443645                                A72D5D7F1236CBA800A88B15 /* WebSerializedScriptValue.h */,
    36453646                                C0337DD7127A51B6008FF4F4 /* WebTouchEvent.cpp */,
    3646                                 BCDB86C01200FB97007254BE /* WebURL.h */,
    36473647                                F6113E24126CE1820057D0A7 /* WebUserContentURLPattern.h */,
    36483648                                C0337DD0127A2980008FF4F4 /* WebWheelEvent.cpp */,
     
    61846184                                1AB474E8184D44D00051B622 /* WKBundlePageDiagnosticLoggingClient.h in Headers */,
    61856185                                1AC7537C183A9FDB0072CB15 /* PageLoadState.h in Headers */,
    6186                                 BCDB86C11200FB97007254BE /* WebURL.h in Headers */,
     6186                                BCDB86C11200FB97007254BE /* APIURL.h in Headers */,
    61876187                                51C96119183D294700D2002E /* WebIDBServerConnectionMessages.h in Headers */,
    61886188                                BCE2315D122C30CA00D5C35A /* APIURLRequest.h in Headers */,
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp

    r160737 r160969  
    3030#include "APIArray.h"
    3131#include "APIString.h"
     32#include "APIURL.h"
    3233#include "APIURLRequest.h"
    3334#include "InjectedBundleBackForwardList.h"
     
    4748#include "WebRenderLayer.h"
    4849#include "WebRenderObject.h"
    49 #include "WebURL.h"
    5050#include <WebCore/AXObjectCache.h>
    5151#include <WebCore/AccessibilityObject.h>
Note: See TracChangeset for help on using the changeset viewer.