Diff
Modified: branches/safari-602-branch/Source/WebKit2/ChangeLog (203512 => 203513)
--- branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-07-21 18:08:38 UTC (rev 203512)
+++ branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-07-21 18:17:09 UTC (rev 203513)
@@ -1,3 +1,20 @@
+2016-07-21 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r203508. rdar://problem/27392691
+
+ 2016-07-21 Yongjun Zhang <yongjun_zh...@apple.com>
+
+ WebBackForwardList's currentIndex could get out of bounds when filtering items.
+ https://bugs.webkit.org/show_bug.cgi?id=159986
+
+ When generating a new BackForwardListState object, if we filter out multiple items in the list, the currentIndex could get
+ out of bounds.
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/WebBackForwardList.cpp:
+ (WebKit::WebBackForwardList::backForwardListState): Make currentIndex point to the last item if it is out of bounds.
+
2016-07-18 Babak Shafiei <bshaf...@apple.com>
Merge patch for rdar://problem/27360961.
Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/WebBackForwardList.cpp (203512 => 203513)
--- branches/safari-602-branch/Source/WebKit2/UIProcess/WebBackForwardList.cpp 2016-07-21 18:08:38 UTC (rev 203512)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/WebBackForwardList.cpp 2016-07-21 18:17:09 UTC (rev 203513)
@@ -416,6 +416,8 @@
if (backForwardListState.items.isEmpty())
backForwardListState.currentIndex = Nullopt;
+ else if (backForwardListState.items.size() <= backForwardListState.currentIndex.value())
+ backForwardListState.currentIndex = backForwardListState.items.size() - 1;
return backForwardListState;
}
Modified: branches/safari-602-branch/Tools/ChangeLog (203512 => 203513)
--- branches/safari-602-branch/Tools/ChangeLog 2016-07-21 18:08:38 UTC (rev 203512)
+++ branches/safari-602-branch/Tools/ChangeLog 2016-07-21 18:17:09 UTC (rev 203513)
@@ -1,3 +1,22 @@
+2016-07-21 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r203508. rdar://problem/27392691
+
+ 2016-07-21 Yongjun Zhang <yongjun_zh...@apple.com>
+
+ WebBackForwardList's currentIndex could get out of bounds when filtering items.
+ https://bugs.webkit.org/show_bug.cgi?id=159986
+
+ Add a test to verify filtering out 2 items from a 3-item list will set the currentIndex
+ to 0.
+
+ Reviewed by Dan Bernstein.
+
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+ * TestWebKitAPI/Tests/WebKit2/WKBackForwardList.mm: Added.
+ (-[WKBackForwardListTestNavigationDelegate webView:didFinishNavigation:]):
+ (TEST):
+
2016-07-20 Babak Shafiei <bshaf...@apple.com>
Merge follow-up patch for rdar://problem/27360961.
Modified: branches/safari-602-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (203512 => 203513)
--- branches/safari-602-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2016-07-21 18:08:38 UTC (rev 203512)
+++ branches/safari-602-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2016-07-21 18:17:09 UTC (rev 203513)
@@ -38,6 +38,7 @@
1C2B81831C891F0900A5529F /* CancelFontSubresourcePlugIn.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1C2B81811C891EFA00A5529F /* CancelFontSubresourcePlugIn.mm */; };
1C2B81861C89259D00A5529F /* webfont.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 1C2B81841C8924A200A5529F /* webfont.html */; };
1C2B81871C8925A000A5529F /* Ahem.ttf in Copy Resources */ = {isa = PBXBuildFile; fileRef = 1C2B81851C89252300A5529F /* Ahem.ttf */; };
+ 1F83571B1D3FFB2300E3967B /* WKBackForwardList.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1F83571A1D3FFB0E00E3967B /* WKBackForwardList.mm */; };
26DF5A6315A2A27E003689C2 /* CancelLoadFromResourceLoadDelegate.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 26DF5A6115A2A22B003689C2 /* CancelLoadFromResourceLoadDelegate.html */; };
26F52EAD1828827B0023D412 /* geolocationGetCurrentPosition.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 26F52EAC1828820E0023D412 /* geolocationGetCurrentPosition.html */; };
26F52EAF18288C230023D412 /* geolocationGetCurrentPositionWithHighAccuracy.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 26F52EAE18288C040023D412 /* geolocationGetCurrentPositionWithHighAccuracy.html */; };
@@ -641,6 +642,7 @@
1C2B81851C89252300A5529F /* Ahem.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Ahem.ttf; sourceTree = "<group>"; };
1CB9BC371A67482300FE5678 /* WeakPtr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WeakPtr.cpp; sourceTree = "<group>"; };
1CF0D3781BBF2F3D00B4EF54 /* WKRetainPtr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKRetainPtr.cpp; sourceTree = "<group>"; };
+ 1F83571A1D3FFB0E00E3967B /* WKBackForwardList.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKBackForwardList.mm; path = Tests/WebKit2/WKBackForwardList.mm; sourceTree = SOURCE_ROOT; };
260BA5781B1D2E7B004FA07C /* DFACombiner.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DFACombiner.cpp; sourceTree = "<group>"; };
260BA57A1B1D2EE2004FA07C /* DFAHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DFAHelpers.h; sourceTree = "<group>"; };
261516D515B0E60500A2C201 /* SetAndUpdateCacheModel.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SetAndUpdateCacheModel.mm; sourceTree = "<group>"; };
@@ -1230,6 +1232,7 @@
0F3B94A51A77266C00DE3272 /* WKWebViewEvaluateJavaScript.mm */,
9984FACA1CFFAEEE008D198C /* WKWebViewTextInput.mm */,
51714EB61CF8C7A4004723C4 /* WebProcessKillIDBCleanup.mm */,
+ 1F83571A1D3FFB0E00E3967B /* WKBackForwardList.mm */,
);
name = "WebKit2 Cocoa";
path = WebKit2Cocoa;
@@ -2189,6 +2192,7 @@
7CCE7F2C1A411B1000447C4C /* PreventImageLoadWithAutoResizing.mm in Sources */,
7CCE7F0C1A411AE600447C4C /* PrivateBrowsingPushStateNoHistoryCallback.cpp in Sources */,
7CCE7EC81A411A7E00447C4C /* PublicSuffix.mm in Sources */,
+ 1F83571B1D3FFB2300E3967B /* WKBackForwardList.mm in Sources */,
7C83E0511D0A641800FEBCF3 /* ParsedContentRange.cpp in Sources */,
46C519DA1D355AB200DAA51A /* LocalStorageNullEntries.mm in Sources */,
7C3965061CDD74F90094DBB8 /* Color.cpp in Sources */,
Added: branches/safari-602-branch/Tools/TestWebKitAPI/Tests/WebKit2/WKBackForwardList.mm (0 => 203513)
--- branches/safari-602-branch/Tools/TestWebKitAPI/Tests/WebKit2/WKBackForwardList.mm (rev 0)
+++ branches/safari-602-branch/Tools/TestWebKitAPI/Tests/WebKit2/WKBackForwardList.mm 2016-07-21 18:17:09 UTC (rev 203513)
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "PlatformUtilities.h"
+#import "Test.h"
+
+#import <WebKit/WKBackForwardListPrivate.h>
+#import <WebKit/WKNavigationDelegate.h>
+#import <WebKit/WKNavigationPrivate.h>
+#import <WebKit/WKWebViewPrivate.h>
+#import <WebKit/_WKSessionState.h>
+#import <wtf/RetainPtr.h>
+
+#if WK_API_ENABLED
+
+static bool isDone;
+
+@interface WKBackForwardListTestNavigationDelegate : NSObject <WKNavigationDelegate>
+@end
+
+@implementation WKBackForwardListTestNavigationDelegate
+
+- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation
+{
+ isDone = true;
+}
+
+@end
+
+static NSString *loadableURL1 = @"data:text/html,no%20error%20A";
+static NSString *loadableURL2 = @"data:text/html,no%20error%20B";
+static NSString *loadableURL3 = @"data:text/html,no%20error%20C";
+
+TEST(WKBackForwardList, RemoveCurrentItem)
+{
+ auto webView = adoptNS([[WKWebView alloc] init]);
+ auto controller = adoptNS([[WKBackForwardListTestNavigationDelegate alloc] init]);
+ [webView setNavigationDelegate:controller.get()];
+
+ [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:loadableURL1]]];
+ TestWebKitAPI::Util::run(&isDone);
+ isDone = false;
+
+ [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:loadableURL2]]];
+ TestWebKitAPI::Util::run(&isDone);
+ isDone = false;
+
+ [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:loadableURL3]]];
+ TestWebKitAPI::Util::run(&isDone);
+ isDone = false;
+
+ WKBackForwardList *list = [webView backForwardList];
+ EXPECT_EQ((NSUInteger)2, list.backList.count);
+ EXPECT_EQ((NSUInteger)0, list.forwardList.count);
+ EXPECT_STREQ([[list.currentItem URL] absoluteString].UTF8String, loadableURL3.UTF8String);
+
+ _WKSessionState *sessionState = [webView _sessionStateWithFilter:^BOOL(WKBackForwardListItem *item)
+ {
+ return [item.URL isEqual:[NSURL URLWithString:loadableURL2]];
+ }];
+
+ [webView _restoreSessionState:sessionState andNavigate:NO];
+
+ WKBackForwardList *newList = [webView backForwardList];
+
+ EXPECT_EQ((NSUInteger)0, newList.backList.count);
+ EXPECT_EQ((NSUInteger)0, newList.forwardList.count);
+ EXPECT_STREQ([[newList.currentItem URL] absoluteString].UTF8String, loadableURL2.UTF8String);
+}
+
+#endif
