Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Frequent crash under -[WKPDFView web_setMinimumSize:]_block_invoke
https://bugs.webkit.org/show_bug.cgi?id=152266 <rdar://problem/22092676> Reviewed by Simon Fraser. Source/WebKit2: * UIProcess/ios/WKPDFView.mm: (-[WKPDFView web_setMinimumSize:]): We weren't retaining the UIScrollView, but depending on it surviving into this block's invocation. We don't need to do this asynchronously anymore because the referenced bug is fixed, so make it happen synchronously. This also fixes the crash because there's no opportunity for the scroll view to be released. Tools: * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: * TestWebKitAPI/Tests/WebKit2Cocoa/WKPDFViewResizeCrash.mm: Added. Add a test that crashed before this change, and doesn't crash after. Canonical link: https://commits.webkit.org/170381@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@194060 268f45cc-cd09-0410-ab3c-d52691b4dbfc
- Loading branch information
Showing
with
110 additions
and 9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -0,0 +1,73 @@ | ||
| /* | ||
| * Copyright (C) 2015 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. | ||
| */ | ||
|
|
||
| #include "config.h" | ||
|
|
||
| #import <WebKit/WKNavigationDelegate.h> | ||
| #import <WebKit/WKWebView.h> | ||
| #import <wtf/RetainPtr.h> | ||
| #import "PlatformUtilities.h" | ||
| #import "Test.h" | ||
|
|
||
| #if WK_API_ENABLED | ||
|
|
||
| static bool finishedLoading; | ||
| static bool finishedDispatch; | ||
|
|
||
| @interface WKPDFViewResizeNavigationDelegate : NSObject <WKNavigationDelegate> | ||
| @end | ||
|
|
||
| @implementation WKPDFViewResizeNavigationDelegate | ||
|
|
||
| - (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation | ||
| { | ||
| finishedLoading = true; | ||
| } | ||
|
|
||
| @end | ||
|
|
||
| TEST(WebKit2, WKPDFViewResizeCrash) | ||
| { | ||
| RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]); | ||
|
|
||
| RetainPtr<WKPDFViewResizeNavigationDelegate> delegate = adoptNS([[WKPDFViewResizeNavigationDelegate alloc] init]); | ||
| [webView setNavigationDelegate:delegate.get()]; | ||
|
|
||
| NSURLRequest *request = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"test" withExtension:@"pdf" subdirectory:@"TestWebKitAPI.resources"]]; | ||
| [webView loadRequest:request]; | ||
|
|
||
| TestWebKitAPI::Util::run(&finishedLoading); | ||
|
|
||
| [webView setFrame:NSMakeRect(0, 0, 100, 100)]; | ||
| webView = nil; | ||
|
|
||
| dispatch_async(dispatch_get_main_queue(), ^{ | ||
| finishedDispatch = true; | ||
| }); | ||
|
|
||
| TestWebKitAPI::Util::run(&finishedDispatch); | ||
| } | ||
|
|
||
| #endif |