Title: [157951] trunk/Source/WebKit2
- Revision
- 157951
- Author
- m...@apple.com
- Date
- 2013-10-24 13:39:33 -0700 (Thu, 24 Oct 2013)
Log Message
[Cocoa] Add -[WKBrowsingContextController goToBackForwardItem:]
https://bugs.webkit.org/show_bug.cgi?id=123289
Reviewed by Sam Weinig.
* Shared/API/Cocoa/WKFoundation.h: Defined WK_API_CLASS.
* UIProcess/API/mac/WKBrowsingContextController.h: Declared -goToBackForwardListItem:.
* UIProcess/API/mac/WKBrowsingContextController.mm:
(-[WKBrowsingContextController goToBackForwardListItem:]): Added.
* UIProcess/Cocoa/WKBackForwardList.h: Deployed WK_API_CLASS to make the class exported.
* UIProcess/Cocoa/WKBackForwardListItem.h: Ditto.
* UIProcess/Cocoa/WKBackForwardListItem.mm:
(-[WKBackForwardListItem _item]): Added. Returns the underlying WebBackForwardListItem.
* UIProcess/Cocoa/WKBackForwardListItemInternal.h: Declared _item.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (157950 => 157951)
--- trunk/Source/WebKit2/ChangeLog 2013-10-24 20:31:11 UTC (rev 157950)
+++ trunk/Source/WebKit2/ChangeLog 2013-10-24 20:39:33 UTC (rev 157951)
@@ -1,3 +1,20 @@
+2013-10-24 Dan Bernstein <m...@apple.com>
+
+ [Cocoa] Add -[WKBrowsingContextController goToBackForwardItem:]
+ https://bugs.webkit.org/show_bug.cgi?id=123289
+
+ Reviewed by Sam Weinig.
+
+ * Shared/API/Cocoa/WKFoundation.h: Defined WK_API_CLASS.
+ * UIProcess/API/mac/WKBrowsingContextController.h: Declared -goToBackForwardListItem:.
+ * UIProcess/API/mac/WKBrowsingContextController.mm:
+ (-[WKBrowsingContextController goToBackForwardListItem:]): Added.
+ * UIProcess/Cocoa/WKBackForwardList.h: Deployed WK_API_CLASS to make the class exported.
+ * UIProcess/Cocoa/WKBackForwardListItem.h: Ditto.
+ * UIProcess/Cocoa/WKBackForwardListItem.mm:
+ (-[WKBackForwardListItem _item]): Added. Returns the underlying WebBackForwardListItem.
+ * UIProcess/Cocoa/WKBackForwardListItemInternal.h: Declared _item.
+
2013-10-23 ChangSeok Oh <changseok...@collabora.com>
Unreviewed build fix since r157823.
Modified: trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h (157950 => 157951)
--- trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h 2013-10-24 20:31:11 UTC (rev 157950)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h 2013-10-24 20:39:33 UTC (rev 157951)
@@ -25,8 +25,12 @@
#import <TargetConditionals.h>
+#if !defined(WK_API_ENABLED)
#if TARGET_OS_IPHONE
#define WK_API_ENABLED 1
+#define WK_API_CLASS NS_CLASS_AVAILABLE_IOS(7_0)
#else
#define WK_API_ENABLED (defined(__clang__) && defined(__APPLE__) && !defined(__i386__))
+#define WK_API_CLASS NS_CLASS_AVAILABLE_MAC(10_9)
#endif
+#endif
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.h (157950 => 157951)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.h 2013-10-24 20:31:11 UTC (rev 157950)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.h 2013-10-24 20:39:33 UTC (rev 157951)
@@ -29,6 +29,7 @@
@class WKBrowsingContextControllerData;
@class WKBackForwardList;
+@class WKBackForwardListItem;
@protocol WKBrowsingContextLoadDelegate;
WK_EXPORT
@@ -93,8 +94,10 @@
@property(readonly) BOOL canGoBack;
#if WK_API_ENABLED
+- (void)goToBackForwardListItem:(WKBackForwardListItem *)item;
+
@property(readonly) WKBackForwardList *backForwardList;
-#endif
+#endif // WK_API_ENABLED
#pragma mark Active Load Introspection
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm (157950 => 157951)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm 2013-10-24 20:31:11 UTC (rev 157950)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm 2013-10-24 20:39:33 UTC (rev 157951)
@@ -256,6 +256,11 @@
}
#if WK_API_ENABLED
+- (void)goToBackForwardListItem:(WKBackForwardListItem *)item
+{
+ toImpl(self._pageRef)->goToBackForwardItem(&item._item);
+}
+
- (WKBackForwardList *)backForwardList
{
WebBackForwardList* list = toImpl(self._pageRef)->backForwardList();
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WKBackForwardList.h (157950 => 157951)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WKBackForwardList.h 2013-10-24 20:31:11 UTC (rev 157950)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WKBackForwardList.h 2013-10-24 20:39:33 UTC (rev 157951)
@@ -32,6 +32,7 @@
#if WK_API_ENABLED
+WK_API_CLASS
@interface WKBackForwardList : NSObject
@property (readonly) WKBackForwardListItem *currentItem;
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WKBackForwardListItem.h (157950 => 157951)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WKBackForwardListItem.h 2013-10-24 20:31:11 UTC (rev 157950)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WKBackForwardListItem.h 2013-10-24 20:39:33 UTC (rev 157951)
@@ -31,6 +31,7 @@
#if WK_API_ENABLED
+WK_API_CLASS
@interface WKBackForwardListItem : NSObject
@property (readonly) NSURL *URL;
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WKBackForwardListItem.mm (157950 => 157951)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WKBackForwardListItem.mm 2013-10-24 20:31:11 UTC (rev 157950)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WKBackForwardListItem.mm 2013-10-24 20:39:33 UTC (rev 157951)
@@ -95,6 +95,11 @@
return self;
}
+- (WebKit::WebBackForwardListItem&)_item
+{
+ return *_item;
+}
+
@end
#endif // WK_API_ENABLED
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WKBackForwardListItemInternal.h (157950 => 157951)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WKBackForwardListItemInternal.h 2013-10-24 20:31:11 UTC (rev 157950)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WKBackForwardListItemInternal.h 2013-10-24 20:39:33 UTC (rev 157951)
@@ -35,6 +35,8 @@
- (id)_initWithItem:(WebKit::WebBackForwardListItem&)item;
+@property (readonly) WebKit::WebBackForwardListItem& _item;
+
@end
#endif // WK_API_ENABLED
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
