Title: [279505] trunk
- Revision
- 279505
- Author
- commit-qu...@webkit.org
- Date
- 2021-07-02 08:38:36 -0700 (Fri, 02 Jul 2021)
Log Message
Unreviewed, reverting r279494.
https://bugs.webkit.org/show_bug.cgi?id=227628
Broke api test
TestWebKitAPI.WKWebView.LoadSimulatedRequestUpdatesBackForwardList
Reverted changeset:
"loadSimulatedRequest: should do same delegate callbacks as
loadHTMLString and loadData"
https://bugs.webkit.org/show_bug.cgi?id=227599
https://commits.webkit.org/r279494
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (279504 => 279505)
--- trunk/Source/WebKit/ChangeLog 2021-07-02 15:28:05 UTC (rev 279504)
+++ trunk/Source/WebKit/ChangeLog 2021-07-02 15:38:36 UTC (rev 279505)
@@ -1,3 +1,18 @@
+2021-07-02 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, reverting r279494.
+ https://bugs.webkit.org/show_bug.cgi?id=227628
+
+ Broke api test
+ TestWebKitAPI.WKWebView.LoadSimulatedRequestUpdatesBackForwardList
+
+ Reverted changeset:
+
+ "loadSimulatedRequest: should do same delegate callbacks as
+ loadHTMLString and loadData"
+ https://bugs.webkit.org/show_bug.cgi?id=227599
+ https://commits.webkit.org/r279494
+
2021-07-02 Antoine Quint <grao...@webkit.org>
REGRESSION (r279477): WebKit_iosmac failed to build in : ModelElementControllerCocoa.mm:58:24: member reference type 'WebKit::WebPageProxy' is not a pointer; did you mean to use '.'?
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (279504 => 279505)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2021-07-02 15:28:05 UTC (rev 279504)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2021-07-02 15:38:36 UTC (rev 279505)
@@ -1793,8 +1793,7 @@
m_pendingNavigationID = loadParameters.navigationID;
m_pendingWebsitePolicies = WTFMove(loadParameters.websitePolicies);
- auto unreachableURL = loadParameters.unreachableURLString.isEmpty() ? URL() : URL(URL(), loadParameters.unreachableURLString);
- SubstituteData substituteData(WTFMove(sharedBuffer), unreachableURL, simulatedResponse, SubstituteData::SessionHistoryVisibility::Visible);
+ SubstituteData substituteData(WTFMove(sharedBuffer), loadParameters.request.url(), simulatedResponse, SubstituteData::SessionHistoryVisibility::Visible);
// Let the InjectedBundle know we are about to start the load, passing the user data from the UIProcess
// to all the client to set up any needed state.
Modified: trunk/Tools/ChangeLog (279504 => 279505)
--- trunk/Tools/ChangeLog 2021-07-02 15:28:05 UTC (rev 279504)
+++ trunk/Tools/ChangeLog 2021-07-02 15:38:36 UTC (rev 279505)
@@ -1,3 +1,18 @@
+2021-07-02 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, reverting r279494.
+ https://bugs.webkit.org/show_bug.cgi?id=227628
+
+ Broke api test
+ TestWebKitAPI.WKWebView.LoadSimulatedRequestUpdatesBackForwardList
+
+ Reverted changeset:
+
+ "loadSimulatedRequest: should do same delegate callbacks as
+ loadHTMLString and loadData"
+ https://bugs.webkit.org/show_bug.cgi?id=227599
+ https://commits.webkit.org/r279494
+
2021-07-02 Xabier Rodriguez Calvar <calva...@igalia.com>
[GTK] media/event-attributes.html fails if mixer is not at 100%
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewLoadAPIs.mm (279504 => 279505)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewLoadAPIs.mm 2021-07-02 15:28:05 UTC (rev 279504)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewLoadAPIs.mm 2021-07-02 15:38:36 UTC (rev 279505)
@@ -32,7 +32,6 @@
#import <WebKit/WKFoundation.h>
#import <WebKit/WKWebView.h>
#import <wtf/RetainPtr.h>
-#import <wtf/Vector.h>
#import <wtf/cocoa/NSURLExtras.h>
static NSString *exampleURLString = @"https://example.com/";
@@ -83,61 +82,6 @@
[delegate waitForDidFinishNavigation];
}
-TEST(WKWebView, LoadSimulatedRequestDelegateCallbacks)
-{
- enum class Callback : uint8_t {
- NavigationAction,
- NavigationResponse,
- StartProvisional,
- Commit,
- Finish
- };
-
- auto checkCallbacks = [] (const Vector<Callback> vector) {
- ASSERT_EQ(vector.size(), 4u);
- EXPECT_EQ(vector[0], Callback::NavigationAction);
- EXPECT_EQ(vector[1], Callback::StartProvisional);
- EXPECT_EQ(vector[2], Callback::Commit);
- EXPECT_EQ(vector[3], Callback::Finish);
- };
-
- __block Vector<Callback> callbacks;
- __block bool finished = false;
- auto delegate = adoptNS([TestNavigationDelegate new]);
- delegate.get().decidePolicyForNavigationAction = ^(WKNavigationAction *, void (^completionHandler)(WKNavigationActionPolicy)) {
- callbacks.append(Callback::NavigationAction);
- completionHandler(WKNavigationActionPolicyAllow);
- };
- delegate.get().decidePolicyForNavigationResponse = ^(WKNavigationResponse *, void (^completionHandler)(WKNavigationResponsePolicy)) {
- callbacks.append(Callback::NavigationResponse);
- completionHandler(WKNavigationResponsePolicyAllow);
- };
- delegate.get().didStartProvisionalNavigation = ^(WKWebView *, WKNavigation *) {
- callbacks.append(Callback::StartProvisional);
- };
- delegate.get().didCommitNavigation = ^(WKWebView *, WKNavigation *) {
- callbacks.append(Callback::Commit);
- };
- delegate.get().didFinishNavigation = ^(WKWebView *, WKNavigation *) {
- callbacks.append(Callback::Finish);
- finished = true;
- };
-
- auto webView = adoptNS([WKWebView new]);
- webView.get().navigationDelegate = delegate.get();
- NSURL *url = "" URLWithString:@"https://webkit.org/"];
- [webView loadHTMLString:@"hi!" baseURL:url];
- TestWebKitAPI::Util::run(&finished);
-
- checkCallbacks(callbacks);
- callbacks = { };
- finished = false;
-
- [webView loadSimulatedRequest:[NSURLRequest requestWithURL:url] response:adoptNS([[NSURLResponse alloc] initWithURL:url MIMEType:@"text/html" expectedContentLength:3 textEncodingName:nil]).get() responseData:[NSData dataWithBytes:"hi!" length:3]];
- TestWebKitAPI::Util::run(&finished);
- checkCallbacks(callbacks);
-}
-
TEST(WKWebView, LoadFileRequest)
{
auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
