Changeset 166602 in webkit

Timestamp:

Apr 1, 2014 12:53:04 PM (10 years ago)

Author:

andersca@apple.com

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:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKBackForwardList.h (modified) (1 diff)
• UIProcess/API/Cocoa/WKBackForwardList.mm (modified) (2 diffs)
• UIProcess/WebBackForwardList.cpp (modified) (1 diff)
• UIProcess/WebBackForwardList.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-04-01  Anders Carlsson  <andersca@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  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.h

@@ -53 +53 @@
 @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;
-
-- (NSArray *)backListWithLimit:(NSUInteger)limit;
-- (NSArray *)forwardListWithLimit:(NSUInteger)limit;
+@property (nonatomic, readonly) NSArray *backList;
+@property (nonatomic, readonly) NSArray *forwardList;
 
 @end

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.mm

@@ -77 +77 @@
 }
 
-- (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;
@@ -96 +86 @@
 }
 
-- (NSArray *)forwardListWithLimit:(NSUInteger)limit
+- (NSArray *)forwardList
 {
-    RefPtr<API::Array> list = _list->forwardListAsAPIArrayWithLimit(limit);
+    RefPtr<API::Array> list = _list->forwardList();
     if (!list)
         return nil;

trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp

@@ -201 +201 @@
 }
 
+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
 {

trunk/Source/WebKit2/UIProcess/WebBackForwardList.h

@@ -70 +70 @@
     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;