Attachment 348242 Details for Bug 189037 – Patch

[patch] Patch

bug-189037-20180827171832.patch (text/plain), 6.37 KB, created by Sihui Liu on 2018-08-27 17:18:33 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Sihui Liu

Created: 2018-08-27 17:18:33 PDT

Size: 6.37 KB

patch

obsolete

>Subversion Revision: 235367
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index f68913b9b52aaa5fd666ba9c0a1904da986dc57f..d486db7ad0573affcd787c8f955f8877f0745363 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-08-27  Sihui Liu  <sihui_liu@apple.com>
>+
>+        Add error information to help debug test failure in WKNavigation.ProcessCrashDuringCallback
>+        https://bugs.webkit.org/show_bug.cgi?id=189037
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/API/Cocoa/WKWebView.mm:
>+        (-[WKWebView _getMainResourceDataWithCompletionHandler:]):
>+        (-[WKWebView _getWebArchiveDataWithCompletionHandler:]):
>+        (-[WKWebView _getContentsAsStringWithCompletionHandler:]):
>+
> 2018-08-26  Darin Adler  <darin@apple.com>
> 
>         [Cocoa] Adapt more WebKit code to be ARC-compatible
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>index 7b6ccbe2d0d5c17d4fe5206a636c56e52a69e65d..2b53fce1f1ed7a03aec0554e1515eaabb0b0a650 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>@@ -4578,8 +4578,8 @@ - (void)_getMainResourceDataWithCompletionHandler:(void (^)(NSData *, NSError *)
>         void (^completionHandlerBlock)(NSData *, NSError *) = (void (^)(NSData *, NSError *))handler.get();
>         if (error != WebKit::CallbackBase::Error::None) {
>             // FIXME: Pipe a proper error in from the WebPageProxy.
>-            RetainPtr<NSError> error = adoptNS([[NSError alloc] init]);
>-            completionHandlerBlock(nil, error.get());
>+            NSError* callbackError = [NSError errorWithDomain:WKErrorDomain code:static_cast<int>(error) userInfo:nil];
>+            completionHandlerBlock(nil, callbackError);
>         } else
>             completionHandlerBlock(wrapper(*data), nil);
>     });
>@@ -4593,8 +4593,8 @@ - (void)_getWebArchiveDataWithCompletionHandler:(void (^)(NSData *, NSError *))c
>         void (^completionHandlerBlock)(NSData *, NSError *) = (void (^)(NSData *, NSError *))handler.get();
>         if (error != WebKit::CallbackBase::Error::None) {
>             // FIXME: Pipe a proper error in from the WebPageProxy.
>-            RetainPtr<NSError> error = adoptNS([[NSError alloc] init]);
>-            completionHandlerBlock(nil, error.get());
>+            NSError* callbackError = [NSError errorWithDomain:WKErrorDomain code:static_cast<int>(error) userInfo:nil];
>+            completionHandlerBlock(nil, callbackError);
>         } else
>             completionHandlerBlock(wrapper(*data), nil);
>     });
>@@ -4607,8 +4607,8 @@ - (void)_getContentsAsStringWithCompletionHandler:(void (^)(NSString *, NSError
>     _page->getContentsAsString([handler](String string, WebKit::CallbackBase::Error error) {
>         if (error != WebKit::CallbackBase::Error::None) {
>             // FIXME: Pipe a proper error in from the WebPageProxy.
>-            RetainPtr<NSError> error = adoptNS([[NSError alloc] init]);
>-            handler(nil, error.get());
>+            NSError* callbackError = [NSError errorWithDomain:WKErrorDomain code:static_cast<int>(error) userInfo:nil];
>+            handler(nil, callbackError);
>         } else
>             handler(string, nil);
>     });
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index a5bd0a1f4338e76f909849b8a9162b2c6efab538..32a2eed9d788feee97d58bf1f2fb52b936a921ec 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-08-27  Sihui Liu  <sihui_liu@apple.com>
>+
>+        Add error information to help debug test failure in WKNavigation.ProcessCrashDuringCallback
>+        https://bugs.webkit.org/show_bug.cgi?id=189037
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * TestWebKitAPI/Tests/WebKitCocoa/WebContentProcessDidTerminate.mm:
>+        (TEST):
>+
> 2018-08-27  Alex Christensen  <achristensen@webkit.org>
> 
>         Translate 4 tests using WKPageLoaderClient to ObjC
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebContentProcessDidTerminate.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebContentProcessDidTerminate.mm
>index 4050ebd39bf8e41870da245164839e3590348fa4..5df58bf5c1a7d2d6c41a8d0f7f7a6f9a012cbbe3 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebContentProcessDidTerminate.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebContentProcessDidTerminate.mm
>@@ -229,38 +229,44 @@ TEST(WKNavigation, ProcessCrashDuringCallback)
> 
>     __block WKWebView *view = webView.get();
>     [webView _getContentsAsStringWithCompletionHandler:^(NSString *contents, NSError *error) {
>-        EXPECT_TRUE(!!error);
>+        if (!!error)
>+            EXPECT_EQ(error.code, WKErrorWebContentProcessTerminated);
>         ++callbackCount;
>         if (callbackCount == 6)
>             calledAllCallbacks = true;
>     }];
>     [webView _getContentsAsStringWithCompletionHandler:^(NSString *contents, NSError *error) {
>-        EXPECT_TRUE(!!error);
>+        if (!!error)
>+            EXPECT_EQ(error.code, WKErrorWebContentProcessTerminated);
>         ++callbackCount;
>         if (callbackCount == 6)
>             calledAllCallbacks = true;
>     }];
>     [webView _getContentsAsStringWithCompletionHandler:^(NSString *contents, NSError *error) {
>-        EXPECT_TRUE(!!error);
>+        if (!!error)
>+            EXPECT_EQ(error.code, WKErrorWebContentProcessTerminated);
>         [view _close]; // Calling _close will also invalidate all callbacks.
>         ++callbackCount;
>         if (callbackCount == 6)
>             calledAllCallbacks = true;
>     }];
>     [webView _getContentsAsStringWithCompletionHandler:^(NSString *contents, NSError *error) {
>-        EXPECT_TRUE(!!error);
>+        if (!!error)
>+            EXPECT_EQ(error.code, WKErrorWebContentProcessTerminated);
>         ++callbackCount;
>         if (callbackCount == 6)
>             calledAllCallbacks = true;
>     }];
>     [webView _getContentsAsStringWithCompletionHandler:^(NSString *contents, NSError *error) {
>-        EXPECT_TRUE(!!error);
>+        if (!!error)
>+            EXPECT_EQ(error.code, WKErrorWebContentProcessTerminated);
>         ++callbackCount;
>         if (callbackCount == 6)
>             calledAllCallbacks = true;
>     }];
>     [webView _getContentsAsStringWithCompletionHandler:^(NSString *contents, NSError *error) {
>-        EXPECT_TRUE(!!error);
>+        if (!!error)
>+            EXPECT_EQ(error.code, WKErrorWebContentProcessTerminated);
>         ++callbackCount;
>         if (callbackCount == 6)
>             calledAllCallbacks = true;

Actions: View | Formatted Diff | Diff

Attachments on bug 189037: 348242 | 348304 | 348320 | 348338