Changeset 160969 in webkit
- Timestamp:
- Dec 21, 2013 4:57:06 PM (10 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 20 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r160965 r160969 1 2013-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 1 59 2013-12-21 Carlos Garcia Campos <cgarcia@igalia.com> 2 60 -
trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h
r160853 r160969 29 29 #include "APINumber.h" 30 30 #include "APIString.h" 31 #include "APIURL.h" 31 32 #include "APIURLRequest.h" 32 33 #include "APIURLResponse.h" … … 48 49 #include "WebFindOptions.h" 49 50 #include "WebSecurityOrigin.h" 50 #include "WebURL.h"51 51 #include <WebCore/ContextMenuItem.h> 52 52 #include <WebCore/FloatRect.h> … … 110 110 WK_ADD_API_MAPPING(WKTypeRef, API::Object) 111 111 WK_ADD_API_MAPPING(WKUInt64Ref, API::UInt64) 112 WK_ADD_API_MAPPING(WKURLRef, WebURL)112 WK_ADD_API_MAPPING(WKURLRef, API::URL) 113 113 WK_ADD_API_MAPPING(WKURLRequestRef, API::URLRequest) 114 114 WK_ADD_API_MAPPING(WKURLResponseRef, API::URLResponse) … … 170 170 } 171 171 172 inline ProxyingRefPtr< WebURL> toURLRef(StringImpl* string)172 inline ProxyingRefPtr<API::URL> toURLRef(StringImpl* string) 173 173 { 174 174 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))); 177 177 } 178 178 … … 181 181 if (!string) 182 182 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()); 185 185 } 186 186 -
trunk/Source/WebKit2/Shared/API/c/WKURL.cpp
r131437 r160969 33 33 WKTypeID WKURLGetTypeID() 34 34 { 35 return toAPI( WebURL::APIType);35 return toAPI(API::URL::APIType); 36 36 } 37 37 38 38 WKURLRef WKURLCreateWithUTF8CString(const char* string) 39 39 { 40 return toAPI( WebURL::create(String::fromUTF8(string)).leakRef());40 return toAPI(API::URL::create(String::fromUTF8(string)).leakRef()); 41 41 } 42 42 43 43 WKURLRef WKURLCreateWithBaseURL(WKURLRef baseURL, const char* relative) 44 44 { 45 return toAPI( WebURL::create(toImpl(baseURL), String::fromUTF8(relative)).leakRef());45 return toAPI(API::URL::create(toImpl(baseURL), String::fromUTF8(relative)).leakRef()); 46 46 } 47 47 -
trunk/Source/WebKit2/Shared/API/c/cf/WKURLCF.mm
r159016 r160969 56 56 // Since WKNSURL is an internal class with no subclasses, we can do a simple equality check. 57 57 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)); 59 59 } 60 60 #endif -
trunk/Source/WebKit2/Shared/APIURL.h
r160938 r160969 28 28 29 29 #include "APIObject.h" 30 #include "WebCoreArgumentCoders.h" 30 31 #include <WebCore/URL.h> 31 32 #include <wtf/OwnPtr.h> … … 34 35 #include <wtf/text/WTFString.h> 35 36 36 namespace WebKit{37 namespace API { 37 38 38 // WebURL - A URL type suitable for vending to an API. 39 40 class WebURL : public API::ObjectImpl<API::Object::Type::URL> { 39 class URL : public ObjectImpl<Object::Type::URL> { 41 40 public: 42 static PassRefPtr< WebURL> create(constString& string)41 static PassRefPtr<URL> create(const WTF::String& string) 43 42 { 44 return adoptRef(new WebURL(string));43 return adoptRef(new URL(string)); 45 44 } 46 45 47 static PassRefPtr< WebURL> create(const WebURL* baseURL, constString& relativeURL)46 static PassRefPtr<URL> create(const URL* baseURL, const WTF::String& relativeURL) 48 47 { 49 using WebCore::URL;50 51 48 ASSERT(baseURL); 52 49 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(); 55 52 56 return adoptRef(new WebURL(std::move(absoluteURL), absoluteURLString));53 return adoptRef(new URL(std::move(absoluteURL), absoluteURLString)); 57 54 } 58 55 … … 60 57 bool isEmpty() const { return m_string.isEmpty(); } 61 58 62 const String& string() const { return m_string; }59 const WTF::String& string() const { return m_string; } 63 60 64 String host() const61 WTF::String host() const 65 62 { 66 63 parseURLIfNecessary(); 67 return m_parsedURL->isValid() ? m_parsedURL->host() : String();64 return m_parsedURL->isValid() ? m_parsedURL->host() : WTF::String(); 68 65 } 69 66 70 String protocol() const67 WTF::String protocol() const 71 68 { 72 69 parseURLIfNecessary(); 73 return m_parsedURL->isValid() ? m_parsedURL->protocol() : String();70 return m_parsedURL->isValid() ? m_parsedURL->protocol() : WTF::String(); 74 71 } 75 72 76 String path() const73 WTF::String path() const 77 74 { 78 75 parseURLIfNecessary(); 79 return m_parsedURL->isValid() ? m_parsedURL->path() : String();76 return m_parsedURL->isValid() ? m_parsedURL->path() : WTF::String(); 80 77 } 81 78 82 String lastPathComponent() const79 WTF::String lastPathComponent() const 83 80 { 84 81 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; 86 98 } 87 99 88 100 private: 89 WebURL(constString& string)101 URL(const WTF::String& string) 90 102 : m_string(string) 91 103 { 92 104 } 93 105 94 WebURL(std::unique_ptr<WebCore::URL> parsedURL, constString& string)106 URL(std::unique_ptr<WebCore::URL> parsedURL, const WTF::String& string) 95 107 : m_string(string) 96 108 , m_parsedURL(std::move(parsedURL)) … … 105 117 } 106 118 107 String m_string;119 WTF::String m_string; 108 120 mutable std::unique_ptr<WebCore::URL> m_parsedURL; 109 121 }; … … 111 123 } // namespace WebKit 112 124 113 #endif // WebURL_h125 #endif // URL_h -
trunk/Source/WebKit2/Shared/Cocoa/WKNSURL.h
r158753 r160969 28 28 #if WK_API_ENABLED 29 29 30 #import "APIURL.h" 30 31 #import "WKObject.h" 31 #import "WebURL.h"32 32 33 33 namespace WebKit { 34 inline NSURL *wrapper(WebURL& url) { ASSERT([url.wrapper() isKindOfClass:[NSURL class]]); return (NSURL *)url.wrapper(); } 34 35 inline NSURL *wrapper(API::URL& url) 36 { 37 ASSERT([url.wrapper() isKindOfClass:[NSURL class]]); 38 return (NSURL *)url.wrapper(); 39 } 40 35 41 } 36 42 -
trunk/Source/WebKit2/Shared/Cocoa/WKNSURL.mm
r158324 r160969 29 29 #if WK_API_ENABLED 30 30 31 #import "APIURL.h" 31 32 #import "WKAPICast.h" 32 33 #import "WKURLCF.h" 33 #import "WebURL.h"34 35 using namespace WebKit;36 34 37 35 @implementation WKNSURL … … 39 37 - (NSObject *)_web_createTarget 40 38 { 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)))); 42 40 } 43 41 -
trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.cpp
r160608 r160969 31 31 #include "APINumber.h" 32 32 #include "APIString.h" 33 #include "APIURL.h" 33 34 #include "PluginInfoStore.h" 34 35 #include "PluginModuleInfo.h" 35 36 #include "WKAPICast.h" 36 #include "WebURL.h"37 37 #include <wtf/text/WTFString.h> 38 38 … … 137 137 138 138 if (!frameURLString.isEmpty()) 139 map.set(pluginInformationFrameURLKey(), WebURL::create(frameURLString));139 map.set(pluginInformationFrameURLKey(), API::URL::create(frameURLString)); 140 140 if (!mimeType.isEmpty()) 141 141 map.set(pluginInformationMIMETypeKey(), API::String::create(mimeType)); 142 142 if (!pageURLString.isEmpty()) 143 map.set(pluginInformationPageURLKey(), WebURL::create(pageURLString));143 map.set(pluginInformationPageURLKey(), API::URL::create(pageURLString)); 144 144 if (!pluginspageAttributeURLString.isEmpty()) 145 map.set(pluginInformationPluginspageAttributeURLKey(), WebURL::create(pluginspageAttributeURLString));145 map.set(pluginInformationPluginspageAttributeURLKey(), API::URL::create(pluginspageAttributeURLString)); 146 146 if (!pluginURLString.isEmpty()) 147 map.set(pluginInformationPluginURLKey(), WebURL::create(pluginURLString));147 map.set(pluginInformationPluginURLKey(), API::URL::create(pluginURLString)); 148 148 map.set(plugInInformationReplacementObscuredKey(), API::Boolean::create(replacementObscured)); 149 149 … … 156 156 157 157 if (!frameURLString.isEmpty()) 158 map.set(pluginInformationFrameURLKey(), WebURL::create(frameURLString));158 map.set(pluginInformationFrameURLKey(), API::URL::create(frameURLString)); 159 159 if (!mimeType.isEmpty()) 160 160 map.set(pluginInformationMIMETypeKey(), API::String::create(mimeType)); 161 161 if (!pageURLString.isEmpty()) 162 map.set(pluginInformationPageURLKey(), WebURL::create(pageURLString));162 map.set(pluginInformationPageURLKey(), API::URL::create(pageURLString)); 163 163 164 164 return ImmutableDictionary::create(std::move(map)); -
trunk/Source/WebKit2/Shared/UserData.cpp
r160776 r160969 33 33 #include "APINumber.h" 34 34 #include "APIString.h" 35 #include "APIURL.h" 35 36 #include "APIURLRequest.h" 37 #include "APIURLResponse.h" 36 38 #include "ArgumentCoders.h" 37 39 #include "ArgumentEncoder.h" 38 40 #include "MutableDictionary.h" 39 41 #include "WebSerializedScriptValue.h" 40 #include "WebURL.h"41 42 42 43 namespace WebKit { … … 166 167 167 168 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); 170 170 break; 171 171 } … … 173 173 case API::Object::Type::URLRequest: 174 174 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); 175 179 break; 176 180 … … 294 298 } 295 299 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; 303 304 304 305 case API::Object::Type::URLRequest: … … 307 308 break; 308 309 310 case API::Object::Type::URLResponse: 311 if (!API::URLResponse::decode(decoder, result)) 312 return false; 313 break; 314 309 315 case API::Object::Type::UInt64: 310 316 if (!API::UInt64::decode(decoder, result)) -
trunk/Source/WebKit2/Shared/UserMessageCoders.h
r160853 r160969 32 32 #include "APINumber.h" 33 33 #include "APIString.h" 34 #include "APIURL.h" 34 35 #include "APIURLRequest.h" 35 36 #include "APIURLResponse.h" … … 46 47 #include "WebRenderObject.h" 47 48 #include "WebSerializedScriptValue.h" 48 #include "WebURL.h"49 49 #include "WebUserContentURLPattern.h" 50 50 … … 64 64 // - WebRenderObject -> WebRenderObject 65 65 // - API::UInt64 -> API::UInt64 66 // - WebURL -> WebURL66 // - API::URL -> API::URL 67 67 // - API::URLRequest -> API::URLRequest 68 68 // - API::URLResponse -> API::URLResponse … … 173 173 } 174 174 case API::Object::Type::URL: { 175 WebURL* urlObject = static_cast<WebURL*>(m_root);175 API::URL* urlObject = static_cast<API::URL*>(m_root); 176 176 encoder << urlObject->string(); 177 177 return true; … … 253 253 // - WebImage -> WebImage 254 254 // - API::UInt64 -> API::UInt64 255 // - WebURL -> WebURL255 // - API::URL -> API::URL 256 256 // - API::URLRequest -> API::URLRequest 257 257 // - API::URLResponse -> API::URLResponse … … 458 458 if (!decoder.decode(string)) 459 459 return false; 460 coder.m_root = WebURL::create(string);460 coder.m_root = API::URL::create(string); 461 461 break; 462 462 } -
trunk/Source/WebKit2/Shared/WebArchiveResource.h
r160653 r160969 36 36 namespace API { 37 37 class Data; 38 class URL; 38 39 } 39 40 … … 43 44 44 45 namespace WebKit { 45 46 class WebURL;47 46 48 47 class WebArchiveResource : public API::ObjectImpl<API::Object::Type::WebArchiveResource> { -
trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp
r160487 r160969 216 216 } 217 217 218 void WebFrameProxy::getResourceData( WebURL* resourceURL, PassRefPtr<DataCallback> callback)218 void WebFrameProxy::getResourceData(API::URL* resourceURL, PassRefPtr<DataCallback> callback) 219 219 { 220 220 if (!m_page) { -
trunk/Source/WebKit2/UIProcess/WebFrameProxy.h
r160487 r160969 98 98 void getWebArchive(PassRefPtr<DataCallback>); 99 99 void getMainResourceData(PassRefPtr<DataCallback>); 100 void getResourceData( WebURL*, PassRefPtr<DataCallback>);100 void getResourceData(API::URL*, PassRefPtr<DataCallback>); 101 101 102 102 void didStartProvisionalLoad(const String& url); -
trunk/Source/WebKit2/UIProcess/WebIconDatabase.cpp
r160464 r160969 258 258 void WebIconDatabase::didChangeIconForPageURL(const String& pageURL) 259 259 { 260 m_iconDatabaseClient.didChangeIconForPageURL(this, WebURL::create(pageURL).get());260 m_iconDatabaseClient.didChangeIconForPageURL(this, API::URL::create(pageURL).get()); 261 261 } 262 262 … … 296 296 void WebIconDatabase::notifyIconDataReadyForPageURL(const String& pageURL) 297 297 { 298 m_iconDatabaseClient.iconDataReadyForPageURL(this, WebURL::create(pageURL).get());298 m_iconDatabaseClient.iconDataReadyForPageURL(this, API::URL::create(pageURL).get()); 299 299 didChangeIconForPageURL(pageURL); 300 300 } -
trunk/Source/WebKit2/UIProcess/WebIconDatabaseClient.cpp
r159988 r160969 32 32 namespace WebKit { 33 33 34 void WebIconDatabaseClient::didChangeIconForPageURL(WebIconDatabase* iconDatabase, WebURL* url)34 void WebIconDatabaseClient::didChangeIconForPageURL(WebIconDatabase* iconDatabase, API::URL* url) 35 35 { 36 36 if (!m_client.didChangeIconForPageURL) … … 48 48 } 49 49 50 void WebIconDatabaseClient::iconDataReadyForPageURL(WebIconDatabase* iconDatabase, WebURL* url)50 void WebIconDatabaseClient::iconDataReadyForPageURL(WebIconDatabase* iconDatabase, API::URL* url) 51 51 { 52 52 if (!m_client.iconDataReadyForPageURL) -
trunk/Source/WebKit2/UIProcess/WebIconDatabaseClient.h
r159994 r160969 31 31 32 32 namespace API { 33 class URL; 33 34 template<> struct ClientTraits<WKIconDatabaseClientBase> { 34 35 typedef std::tuple<WKIconDatabaseClientV0, WKIconDatabaseClientV1> Versions; … … 39 40 40 41 class WebIconDatabase; 41 class WebURL;42 42 43 43 class WebIconDatabaseClient : public API::Client<WKIconDatabaseClientBase> { 44 44 public: 45 void didChangeIconForPageURL(WebIconDatabase*, WebURL*);45 void didChangeIconForPageURL(WebIconDatabase*, API::URL*); 46 46 void didRemoveAllIcons(WebIconDatabase*); 47 void iconDataReadyForPageURL(WebIconDatabase*, WebURL*);47 void iconDataReadyForPageURL(WebIconDatabase*, API::URL*); 48 48 }; 49 49 -
trunk/Source/WebKit2/UIProcess/WebOpenPanelResultListenerProxy.cpp
r159234 r160969 56 56 57 57 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()); 61 61 filePaths.uncheckedAppend(url.fileSystemPath()); 62 62 } -
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
r160790 r160969 1984 1984 } 1985 1985 1986 void WebPageProxy::getResourceDataFromFrame(WebFrameProxy* frame, WebURL* resourceURL, PassRefPtr<DataCallback> prpCallback)1986 void WebPageProxy::getResourceDataFromFrame(WebFrameProxy* frame, API::URL* resourceURL, PassRefPtr<DataCallback> prpCallback) 1987 1987 { 1988 1988 RefPtr<DataCallback> callback = prpCallback; -
trunk/Source/WebKit2/UIProcess/WebPageProxy.h
r160737 r160969 638 638 #endif 639 639 void getMainResourceDataOfFrame(WebFrameProxy*, PassRefPtr<DataCallback>); 640 void getResourceDataFromFrame(WebFrameProxy*, WebURL*, PassRefPtr<DataCallback>);640 void getResourceDataFromFrame(WebFrameProxy*, API::URL*, PassRefPtr<DataCallback>); 641 641 void getRenderTreeExternalRepresentation(PassRefPtr<StringCallback>); 642 642 void getSelectionOrContentsAsString(PassRefPtr<StringCallback>); -
trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
r160853 r160969 1174 1174 BCD598AC112B7FDF00EC8C23 /* WebPreferencesStore.h in Headers */ = {isa = PBXBuildFile; fileRef = BCD598AA112B7FDF00EC8C23 /* WebPreferencesStore.h */; }; 1175 1175 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 */; }; 1177 1177 BCDDB317124EBD130048D13C /* WKBase.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDDB316124EBD130048D13C /* WKBase.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1178 1178 BCDDB32B124EC2AB0048D13C /* WKSharedAPICast.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDDB32A124EC2AB0048D13C /* WKSharedAPICast.h */; }; … … 1968 1968 2D819B9A186275B3001F03D1 /* ViewGestureGeometryCollector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewGestureGeometryCollector.h; sourceTree = "<group>"; }; 1969 1969 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>"; }; 1972 1972 2D870D0D1622B7F9000A3F20 /* PDFPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PDFPlugin.h; path = PDF/PDFPlugin.h; sourceTree = "<group>"; }; 1973 1973 2D870D0E1622B7F9000A3F20 /* PDFPlugin.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PDFPlugin.mm; path = PDF/PDFPlugin.mm; sourceTree = "<group>"; }; … … 2819 2819 BCD598AA112B7FDF00EC8C23 /* WebPreferencesStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPreferencesStore.h; sourceTree = "<group>"; }; 2820 2820 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>"; }; 2822 2822 BCDDB316124EBD130048D13C /* WKBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBase.h; sourceTree = "<group>"; }; 2823 2823 BCDDB32A124EC2AB0048D13C /* WKSharedAPICast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKSharedAPICast.h; sourceTree = "<group>"; }; … … 3512 3512 1AC1336B18565C7A00F3EC05 /* APIPageHandle.h */, 3513 3513 BCF04C8E11FF9F6E00F86A58 /* APIString.h */, 3514 BCDB86C01200FB97007254BE /* APIURL.h */, 3514 3515 BCE2315C122C30CA00D5C35A /* APIURLRequest.cpp */, 3515 3516 BCE2315B122C30CA00D5C35A /* APIURLRequest.h */, … … 3644 3645 A72D5D7F1236CBA800A88B15 /* WebSerializedScriptValue.h */, 3645 3646 C0337DD7127A51B6008FF4F4 /* WebTouchEvent.cpp */, 3646 BCDB86C01200FB97007254BE /* WebURL.h */,3647 3647 F6113E24126CE1820057D0A7 /* WebUserContentURLPattern.h */, 3648 3648 C0337DD0127A2980008FF4F4 /* WebWheelEvent.cpp */, … … 6184 6184 1AB474E8184D44D00051B622 /* WKBundlePageDiagnosticLoggingClient.h in Headers */, 6185 6185 1AC7537C183A9FDB0072CB15 /* PageLoadState.h in Headers */, 6186 BCDB86C11200FB97007254BE /* WebURL.h in Headers */,6186 BCDB86C11200FB97007254BE /* APIURL.h in Headers */, 6187 6187 51C96119183D294700D2002E /* WebIDBServerConnectionMessages.h in Headers */, 6188 6188 BCE2315D122C30CA00D5C35A /* APIURLRequest.h in Headers */, -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
r160737 r160969 30 30 #include "APIArray.h" 31 31 #include "APIString.h" 32 #include "APIURL.h" 32 33 #include "APIURLRequest.h" 33 34 #include "InjectedBundleBackForwardList.h" … … 47 48 #include "WebRenderLayer.h" 48 49 #include "WebRenderObject.h" 49 #include "WebURL.h"50 50 #include <WebCore/AXObjectCache.h> 51 51 #include <WebCore/AccessibilityObject.h>
Note: See TracChangeset
for help on using the changeset viewer.