diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-11 13:45:28 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-11 13:45:28 +0200 |
commit | d6a599dbc9d824a462b2b206316e102bf8136446 (patch) | |
tree | ecb257a5e55b2239d74b90fdad62fccd661cf286 /Source/WebKit2/Shared/API | |
parent | 3ccc3a85f09a83557b391aae380d3bf5f81a2911 (diff) | |
download | qtwebkit-d6a599dbc9d824a462b2b206316e102bf8136446.tar.gz |
Imported WebKit commit 8ff1f22783a32de82fee915abd55bd1b298f2644 (http://svn.webkit.org/repository/webkit/trunk@122325)
New snapshot that should work with the latest Qt build system changes
Diffstat (limited to 'Source/WebKit2/Shared/API')
-rw-r--r-- | Source/WebKit2/Shared/API/c/WKBase.h | 5 | ||||
-rw-r--r-- | Source/WebKit2/Shared/API/c/WKRenderLayer.cpp | 17 | ||||
-rw-r--r-- | Source/WebKit2/Shared/API/c/WKRenderLayer.h | 4 | ||||
-rw-r--r-- | Source/WebKit2/Shared/API/c/WKRenderObject.cpp | 23 | ||||
-rw-r--r-- | Source/WebKit2/Shared/API/c/WKRenderObject.h | 5 |
5 files changed, 48 insertions, 6 deletions
diff --git a/Source/WebKit2/Shared/API/c/WKBase.h b/Source/WebKit2/Shared/API/c/WKBase.h index 8b7e81fbc..3f707bace 100644 --- a/Source/WebKit2/Shared/API/c/WKBase.h +++ b/Source/WebKit2/Shared/API/c/WKBase.h @@ -86,6 +86,8 @@ typedef const struct OpaqueWKAuthenticationChallenge* WKAuthenticationChallengeR typedef const struct OpaqueWKAuthenticationDecisionListener* WKAuthenticationDecisionListenerRef; typedef const struct OpaqueWKBackForwardList* WKBackForwardListRef; typedef const struct OpaqueWKBackForwardListItem* WKBackForwardListItemRef; +typedef const struct OpaqueWKBatteryManager* WKBatteryManagerRef; +typedef const struct OpaqueWKBatteryStatus* WKBatteryStatusRef; typedef const struct OpaqueWKResourceCacheManager* WKResourceCacheManagerRef; typedef const struct OpaqueWKContext* WKContextRef; typedef const struct OpaqueWKCookieManager* WKCookieManagerRef; @@ -107,6 +109,8 @@ typedef const struct OpaqueWKIntentServiceInfo* WKIntentServiceInfoRef; typedef const struct OpaqueWKKeyValueStorageManager* WKKeyValueStorageManagerRef; typedef const struct OpaqueWKMediaCacheManager* WKMediaCacheManagerRef; typedef const struct OpaqueWKNavigationData* WKNavigationDataRef; +typedef const struct OpaqueWKNetworkInfoManager* WKNetworkInfoManagerRef; +typedef const struct OpaqueWKNetworkInfo* WKNetworkInfoRef; typedef const struct OpaqueWKNotification* WKNotificationRef; typedef const struct OpaqueWKNotificationManager* WKNotificationManagerRef; typedef const struct OpaqueWKNotificationPermissionRequest* WKNotificationPermissionRequestRef; @@ -119,6 +123,7 @@ typedef const struct OpaqueWKPluginSiteDataManager* WKPluginSiteDataManagerRef; typedef const struct OpaqueWKPreferences* WKPreferencesRef; typedef const struct OpaqueWKProtectionSpace* WKProtectionSpaceRef; typedef const struct OpaqueWKTextChecker* WKTextCheckerRef; +typedef const struct OpaqueWKVibration* WKVibrationRef; /* WebKit2 Bundle types */ diff --git a/Source/WebKit2/Shared/API/c/WKRenderLayer.cpp b/Source/WebKit2/Shared/API/c/WKRenderLayer.cpp index 7c2765100..82cf959be 100644 --- a/Source/WebKit2/Shared/API/c/WKRenderLayer.cpp +++ b/Source/WebKit2/Shared/API/c/WKRenderLayer.cpp @@ -37,16 +37,21 @@ WKTypeID WKRenderLayerGetTypeID() return toAPI(WebRenderLayer::APIType); } +WKRenderObjectRef WKRenderLayerGetRenderer(WKRenderLayerRef renderLayerRef) +{ + return toAPI(toImpl(renderLayerRef)->renderer()); +} + WKStringRef WKRenderLayerCopyRendererName(WKRenderLayerRef renderLayerRef) { - return toCopiedAPI(toImpl(renderLayerRef)->renderObjectName()); + return toCopiedAPI(toImpl(renderLayerRef)->renderer()->name()); } WKStringRef WKRenderLayerCopyElementTagName(WKRenderLayerRef renderLayerRef) { WebRenderLayer* renderLayer = toImpl(renderLayerRef); - if (!renderLayer->elementTagName().isNull()) - return toCopiedAPI(toImpl(renderLayerRef)->elementTagName()); + if (!renderLayer->renderer()->elementTagName().isNull()) + return toCopiedAPI(renderLayer->renderer()->elementTagName()); return 0; } @@ -54,15 +59,15 @@ WKStringRef WKRenderLayerCopyElementTagName(WKRenderLayerRef renderLayerRef) WKStringRef WKRenderLayerCopyElementID(WKRenderLayerRef renderLayerRef) { WebRenderLayer* renderLayer = toImpl(renderLayerRef); - if (!renderLayer->elementID().isNull()) - return toCopiedAPI(toImpl(renderLayerRef)->elementID()); + if (!renderLayer->renderer()->elementID().isNull()) + return toCopiedAPI(renderLayer->renderer()->elementID()); return 0; } WKArrayRef WKRenderLayerGetElementClassNames(WKRenderLayerRef renderLayerRef) { - return toAPI(toImpl(renderLayerRef)->elementClassNames()); + return toAPI(toImpl(renderLayerRef)->renderer()->elementClassNames()); } WKRect WKRenderLayerGetAbsoluteBounds(WKRenderLayerRef renderLayerRef) diff --git a/Source/WebKit2/Shared/API/c/WKRenderLayer.h b/Source/WebKit2/Shared/API/c/WKRenderLayer.h index 6683d87b4..72f28e0b9 100644 --- a/Source/WebKit2/Shared/API/c/WKRenderLayer.h +++ b/Source/WebKit2/Shared/API/c/WKRenderLayer.h @@ -36,8 +36,12 @@ extern "C" { WK_EXPORT WKTypeID WKRenderLayerGetTypeID(); +WK_EXPORT WKRenderObjectRef WKRenderLayerGetRenderer(WKRenderLayerRef renderLayer); + +// FIXME: Remove this function once Safari does not require it. WK_EXPORT WKStringRef WKRenderLayerCopyRendererName(WKRenderLayerRef renderLayer); +// FIXME: Remove these three functions once Safari does not require them. WK_EXPORT WKStringRef WKRenderLayerCopyElementTagName(WKRenderLayerRef renderLayer); WK_EXPORT WKStringRef WKRenderLayerCopyElementID(WKRenderLayerRef renderLayer); WK_EXPORT WKArrayRef WKRenderLayerGetElementClassNames(WKRenderLayerRef renderLayer); diff --git a/Source/WebKit2/Shared/API/c/WKRenderObject.cpp b/Source/WebKit2/Shared/API/c/WKRenderObject.cpp index 1c7274985..2bc9728cf 100644 --- a/Source/WebKit2/Shared/API/c/WKRenderObject.cpp +++ b/Source/WebKit2/Shared/API/c/WKRenderObject.cpp @@ -42,6 +42,29 @@ WKStringRef WKRenderObjectCopyName(WKRenderObjectRef renderObjectRef) return toCopiedAPI(toImpl(renderObjectRef)->name()); } +WKStringRef WKRenderObjectCopyElementTagName(WKRenderObjectRef renderObjectRef) +{ + WebRenderObject* renderObject = toImpl(renderObjectRef); + if (!renderObject->elementTagName().isNull()) + return toCopiedAPI(renderObject->elementTagName()); + + return 0; +} + +WKStringRef WKRenderObjectCopyElementID(WKRenderObjectRef renderObjectRef) +{ + WebRenderObject* renderObject = toImpl(renderObjectRef); + if (!renderObject->elementID().isNull()) + return toCopiedAPI(renderObject->elementID()); + + return 0; +} + +WKArrayRef WKRenderObjectGetElementClassNames(WKRenderObjectRef renderObjectRef) +{ + return toAPI(toImpl(renderObjectRef)->elementClassNames()); +} + WKPoint WKRenderObjectGetAbsolutePosition(WKRenderObjectRef renderObjectRef) { IntPoint absolutePosition = toImpl(renderObjectRef)->absolutePosition(); diff --git a/Source/WebKit2/Shared/API/c/WKRenderObject.h b/Source/WebKit2/Shared/API/c/WKRenderObject.h index 51d1e22db..965cf2a96 100644 --- a/Source/WebKit2/Shared/API/c/WKRenderObject.h +++ b/Source/WebKit2/Shared/API/c/WKRenderObject.h @@ -36,6 +36,11 @@ extern "C" { WK_EXPORT WKTypeID WKRenderObjectGetTypeID(); WK_EXPORT WKStringRef WKRenderObjectCopyName(WKRenderObjectRef renderObject); + +WK_EXPORT WKStringRef WKRenderObjectCopyElementTagName(WKRenderObjectRef renderObject); +WK_EXPORT WKStringRef WKRenderObjectCopyElementID(WKRenderObjectRef renderObject); +WK_EXPORT WKArrayRef WKRenderObjectGetElementClassNames(WKRenderObjectRef renderObject); + WK_EXPORT WKPoint WKRenderObjectGetAbsolutePosition(WKRenderObjectRef renderObject); WK_EXPORT WKRect WKRenderObjectGetFrameRect(WKRenderObjectRef renderObject); WK_EXPORT WKArrayRef WKRenderObjectGetChildren(WKRenderObjectRef renderObject); |