Title: [163554] trunk/Source/WebKit2
- Revision
- 163554
- Author
- [email protected]
- Date
- 2014-02-06 12:05:28 -0800 (Thu, 06 Feb 2014)
Log Message
Add backForwardList property to WKWebView
https://bugs.webkit.org/show_bug.cgi?id=128320
Reviewed by Tim Horton.
* UIProcess/API/Cocoa/WKWebView.h:
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView backForwardList]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (163553 => 163554)
--- trunk/Source/WebKit2/ChangeLog 2014-02-06 20:00:20 UTC (rev 163553)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-06 20:05:28 UTC (rev 163554)
@@ -1,5 +1,16 @@
2014-02-06 Anders Carlsson <[email protected]>
+ Add backForwardList property to WKWebView
+ https://bugs.webkit.org/show_bug.cgi?id=128320
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/API/Cocoa/WKWebView.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView backForwardList]):
+
+2014-02-06 Anders Carlsson <[email protected]>
+
The source frame request is not the same thing as the original request
https://bugs.webkit.org/show_bug.cgi?id=128317
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h (163553 => 163554)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2014-02-06 20:00:20 UTC (rev 163553)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2014-02-06 20:05:28 UTC (rev 163554)
@@ -34,6 +34,7 @@
#import <AppKit/AppKit.h>
#endif
+@class WKBackForwardList;
@class WKNavigation;
@class WKWebViewConfiguration;
@@ -57,6 +58,9 @@
@property (nonatomic, weak) id <WKNavigationDelegate> navigationDelegate;
+/*! @abstract The view’s back-forward list. */
+@property (nonatomic, readonly) WKBackForwardList *backForwardList;
+
/*! @abstract Returns a view initialized with the specified frame and configuration.
@param frame The frame for the new view.
@param configuration The configuration for the new view.
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (163553 => 163554)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-02-06 20:00:20 UTC (rev 163553)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-02-06 20:05:28 UTC (rev 163554)
@@ -29,6 +29,7 @@
#if WK_API_ENABLED
#import "NavigationState.h"
+#import "WKBackForwardListInternal.h"
#import "WKNavigationDelegate.h"
#import "WKNavigationInternal.h"
#import "WKProcessClass.h"
@@ -115,6 +116,11 @@
return [[_configuration copy] autorelease];
}
+- (WKBackForwardList *)backForwardList
+{
+ return wrapper(_page->backForwardList());
+}
+
- (id <WKNavigationDelegate>)navigationDelegate
{
return [_navigationState->navigationDelegate().leakRef() autorelease];
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (163553 => 163554)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-02-06 20:00:20 UTC (rev 163553)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-02-06 20:05:28 UTC (rev 163554)
@@ -587,10 +587,10 @@
37948408150C4B9700E52CE9 /* WKRenderLayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37948406150C4B9600E52CE9 /* WKRenderLayer.cpp */; };
37948409150C4B9700E52CE9 /* WKRenderLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 37948407150C4B9600E52CE9 /* WKRenderLayer.h */; settings = {ATTRIBUTES = (Private, ); }; };
37C4C08618149C5B003688B9 /* WKBackForwardListItem.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37C4C08418149C5B003688B9 /* WKBackForwardListItem.mm */; };
- 37C4C08718149C5B003688B9 /* WKBackForwardListItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 37C4C08518149C5B003688B9 /* WKBackForwardListItem.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 37C4C08718149C5B003688B9 /* WKBackForwardListItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 37C4C08518149C5B003688B9 /* WKBackForwardListItem.h */; settings = {ATTRIBUTES = (Public, ); }; };
37C4C08918149F23003688B9 /* WKBackForwardListItemInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 37C4C08818149F23003688B9 /* WKBackForwardListItemInternal.h */; };
37C4C08C1814AC5C003688B9 /* WKBackForwardList.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37C4C08A1814AC5C003688B9 /* WKBackForwardList.mm */; };
- 37C4C08D1814AC5C003688B9 /* WKBackForwardList.h in Headers */ = {isa = PBXBuildFile; fileRef = 37C4C08B1814AC5C003688B9 /* WKBackForwardList.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 37C4C08D1814AC5C003688B9 /* WKBackForwardList.h in Headers */ = {isa = PBXBuildFile; fileRef = 37C4C08B1814AC5C003688B9 /* WKBackForwardList.h */; settings = {ATTRIBUTES = (Public, ); }; };
37C4C0931814B3AF003688B9 /* WKNSArray.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37C4C0911814B3AF003688B9 /* WKNSArray.mm */; };
37C4C0941814B3AF003688B9 /* WKNSArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 37C4C0921814B3AF003688B9 /* WKNSArray.h */; };
37C4C0951814B9E6003688B9 /* WKBackForwardListInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 37C4C08E1814AF3A003688B9 /* WKBackForwardListInternal.h */; };
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes