Title: [166602] trunk/Source/WebKit2
- Revision
- 166602
- Author
- ander...@apple.com
- Date
- 2014-04-01 12:53:04 -0700 (Tue, 01 Apr 2014)
Log Message
Remove limits from WKBackForwardList getters
https://bugs.webkit.org/show_bug.cgi?id=131052
Reviewed by Beth Dakin.
* UIProcess/API/Cocoa/WKBackForwardList.h:
* UIProcess/API/Cocoa/WKBackForwardList.mm:
(-[WKBackForwardList backList]):
(-[WKBackForwardList forwardList]):
(-[WKBackForwardList backListCount]): Deleted.
(-[WKBackForwardList forwardListCount]): Deleted.
(-[WKBackForwardList backListWithLimit:]): Deleted.
(-[WKBackForwardList forwardListWithLimit:]): Deleted.
* UIProcess/WebBackForwardList.cpp:
(WebKit::WebBackForwardList::backList):
(WebKit::WebBackForwardList::forwardList):
* UIProcess/WebBackForwardList.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (166601 => 166602)
--- trunk/Source/WebKit2/ChangeLog 2014-04-01 19:38:13 UTC (rev 166601)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-01 19:53:04 UTC (rev 166602)
@@ -1,5 +1,25 @@
2014-04-01 Anders Carlsson <ander...@apple.com>
+ Remove limits from WKBackForwardList getters
+ https://bugs.webkit.org/show_bug.cgi?id=131052
+
+ Reviewed by Beth Dakin.
+
+ * UIProcess/API/Cocoa/WKBackForwardList.h:
+ * UIProcess/API/Cocoa/WKBackForwardList.mm:
+ (-[WKBackForwardList backList]):
+ (-[WKBackForwardList forwardList]):
+ (-[WKBackForwardList backListCount]): Deleted.
+ (-[WKBackForwardList forwardListCount]): Deleted.
+ (-[WKBackForwardList backListWithLimit:]): Deleted.
+ (-[WKBackForwardList forwardListWithLimit:]): Deleted.
+ * UIProcess/WebBackForwardList.cpp:
+ (WebKit::WebBackForwardList::backList):
+ (WebKit::WebBackForwardList::forwardList):
+ * UIProcess/WebBackForwardList.h:
+
+2014-04-01 Anders Carlsson <ander...@apple.com>
+
Stub out the web process -> UI process message SPI
https://bugs.webkit.org/show_bug.cgi?id=131048
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.h (166601 => 166602)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.h 2014-04-01 19:38:13 UTC (rev 166601)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.h 2014-04-01 19:53:04 UTC (rev 166602)
@@ -52,18 +52,15 @@
WK_API_CLASS
@interface WKBackForwardList : NSObject
-@property (readonly) WKBackForwardListItem *currentItem;
-@property (readonly) WKBackForwardListItem *backItem;
-@property (readonly) WKBackForwardListItem *forwardItem;
+@property (nonatomic, readonly) WKBackForwardListItem *currentItem;
+@property (nonatomic, readonly) WKBackForwardListItem *backItem;
+@property (nonatomic, readonly) WKBackForwardListItem *forwardItem;
- (WKBackForwardListItem *)itemAtIndex:(NSInteger)index;
-@property (readonly) NSUInteger backListCount;
-@property (readonly) NSUInteger forwardListCount;
+@property (nonatomic, readonly) NSArray *backList;
+@property (nonatomic, readonly) NSArray *forwardList;
-- (NSArray *)backListWithLimit:(NSUInteger)limit;
-- (NSArray *)forwardListWithLimit:(NSUInteger)limit;
-
@end
#endif // WK_API_ENABLED
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.mm (166601 => 166602)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.mm 2014-04-01 19:38:13 UTC (rev 166601)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.mm 2014-04-01 19:53:04 UTC (rev 166602)
@@ -76,28 +76,18 @@
return toWKBackForwardListItem(_list->itemAtIndex(index));
}
-- (NSUInteger)backListCount
+- (NSArray *)backList
{
- return _list->backListCount();
-}
-
-- (NSUInteger)forwardListCount
-{
- return _list->forwardListCount();
-}
-
-- (NSArray *)backListWithLimit:(NSUInteger)limit
-{
- RefPtr<API::Array> list = _list->backListAsAPIArrayWithLimit(limit);
+ RefPtr<API::Array> list = _list->backList();
if (!list)
return nil;
return [wrapper(*list.release().leakRef()) autorelease];
}
-- (NSArray *)forwardListWithLimit:(NSUInteger)limit
+- (NSArray *)forwardList
{
- RefPtr<API::Array> list = _list->forwardListAsAPIArrayWithLimit(limit);
+ RefPtr<API::Array> list = _list->forwardList();
if (!list)
return nil;
Modified: trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp (166601 => 166602)
--- trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp 2014-04-01 19:38:13 UTC (rev 166601)
+++ trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp 2014-04-01 19:53:04 UTC (rev 166602)
@@ -200,6 +200,16 @@
return m_page && m_hasCurrentIndex ? m_entries.size() - (m_currentIndex + 1) : 0;
}
+PassRefPtr<API::Array> WebBackForwardList::backList() const
+{
+ return backListAsAPIArrayWithLimit(backListCount());
+}
+
+PassRefPtr<API::Array> WebBackForwardList::forwardList() const
+{
+ return forwardListAsAPIArrayWithLimit(forwardListCount());
+}
+
PassRefPtr<API::Array> WebBackForwardList::backListAsAPIArrayWithLimit(unsigned limit) const
{
ASSERT(!m_hasCurrentIndex || m_currentIndex < m_entries.size());
Modified: trunk/Source/WebKit2/UIProcess/WebBackForwardList.h (166601 => 166602)
--- trunk/Source/WebKit2/UIProcess/WebBackForwardList.h 2014-04-01 19:38:13 UTC (rev 166601)
+++ trunk/Source/WebKit2/UIProcess/WebBackForwardList.h 2014-04-01 19:53:04 UTC (rev 166602)
@@ -69,6 +69,9 @@
int backListCount() const;
int forwardListCount() const;
+ PassRefPtr<API::Array> backList() const;
+ PassRefPtr<API::Array> forwardList() const;
+
PassRefPtr<API::Array> backListAsAPIArrayWithLimit(unsigned limit) const;
PassRefPtr<API::Array> forwardListAsAPIArrayWithLimit(unsigned limit) const;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
