Changeset 249240 in webkit

Timestamp:

Aug 28, 2019, 10:57:14 PM (7 years ago)

Author:

Kocsen Chung

Message:

Cherry-pick r249224. rdar://problem/54819205

Null check webFrame when creating a print preview to prevent a crash.
​https://bugs.webkit.org/show_bug.cgi?id=201237
<rdar://problem/51618863>

Reviewed by Tim Horton.

Source/WebKit:

Move and expend a null check to keep from crashing when making a print preview.

• UIProcess/mac/WKPrintingView.mm: (-[WKPrintingView _drawPreview:]): (-[WKPrintingView drawRect:]):

Tools:

Test to verify that if we don't have the WebPageProxy, we will not crash when making a print preview.

• TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm: (TEST):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@249224 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-608-branch

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/mac/WKPrintingView.mm (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm (modified) (1 diff)

branches/safari-608-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2019-08-28  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Cherry-pick r249224. rdar://problem/54819205
+
+    Null check webFrame when creating a print preview to prevent a crash.
+    https://bugs.webkit.org/show_bug.cgi?id=201237
+    <rdar://problem/51618863>
+    
+    Reviewed by Tim Horton.
+    
+    Source/WebKit:
+    
+    Move and expend a null check to keep from crashing when making a print preview.
+    
+    * UIProcess/mac/WKPrintingView.mm:
+    (-[WKPrintingView _drawPreview:]):
+    (-[WKPrintingView drawRect:]):
+    
+    Tools:
+    
+    Test to verify that if we don't have the WebPageProxy, we will not crash when making a print preview.
+    
+    * TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm:
+    (TEST):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@249224 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-08-28  Megan Gardner  <megan_gardner@apple.com>
+
+            Null check webFrame when creating a print preview to prevent a crash.
+            https://bugs.webkit.org/show_bug.cgi?id=201237
+            <rdar://problem/51618863>
+
+            Reviewed by Tim Horton.
+
+            Move and expend a null check to keep from crashing when making a print preview.
+
+            * UIProcess/mac/WKPrintingView.mm:
+            (-[WKPrintingView _drawPreview:]):
+            (-[WKPrintingView drawRect:]):
+
 2019-08-27  Alan Coon  <alancoon@apple.com>
 

branches/safari-608-branch/Source/WebKit/UIProcess/mac/WKPrintingView.mm

@@ -505 +505 @@
 {
     ASSERT(RunLoop::isMain());
+    
+    if (!_webFrame || !_webFrame->page())
+        return;
 
     WebCore::IntRect scaledPrintingRect(nsRect);
@@ -520 +523 @@
             } else {
                 // Preview isn't available yet, request it asynchronously.
-                if (!_webFrame->page())
-                    return;
-
                 // Return to printing mode if we're already back to screen (e.g. due to window resizing).
                 _webFrame->page()->beginPrinting(_webFrame.get(), WebKit::PrintInfo([_printOperation printInfo]));

branches/safari-608-branch/Tools/ChangeLog

@@ +1 @@
+2019-08-28  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Cherry-pick r249224. rdar://problem/54819205
+
+    Null check webFrame when creating a print preview to prevent a crash.
+    https://bugs.webkit.org/show_bug.cgi?id=201237
+    <rdar://problem/51618863>
+    
+    Reviewed by Tim Horton.
+    
+    Source/WebKit:
+    
+    Move and expend a null check to keep from crashing when making a print preview.
+    
+    * UIProcess/mac/WKPrintingView.mm:
+    (-[WKPrintingView _drawPreview:]):
+    (-[WKPrintingView drawRect:]):
+    
+    Tools:
+    
+    Test to verify that if we don't have the WebPageProxy, we will not crash when making a print preview.
+    
+    * TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm:
+    (TEST):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@249224 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-08-28  Megan Gardner  <megan_gardner@apple.com>
+
+            Null check webFrame when creating a print preview to prevent a crash.
+            https://bugs.webkit.org/show_bug.cgi?id=201237
+            <rdar://problem/51618863>
+
+            Reviewed by Tim Horton.
+
+            Test to verify that if we don't have the WebPageProxy, we will not crash when making a print preview.
+
+            * TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm:
+            (TEST):
+
 2019-08-18  Babak Shafiei  <bshafiei@apple.com>
 

branches/safari-608-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm

@@ -428 +428 @@
 }
 
+TEST(WebKit, PrintPreview)
+{
+    auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
+    auto delegate = adoptNS([[PrintDelegate alloc] init]);
+    [webView setUIDelegate:delegate.get()];
+    [webView loadHTMLString:@"<head><title>test_title</title></head><body onload='print()'>hello world!</body>" baseURL:[NSURL URLWithString:@"http://example.com/"]];
+    TestWebKitAPI::Util::run(&done);
+
+    NSPrintOperation *operation = [webView _printOperationWithPrintInfo:[NSPrintInfo sharedPrintInfo]];
+    NSPrintOperation.currentOperation = operation;
+    auto previewView = [operation view];
+    [webView _close];
+    [previewView drawRect:CGRectMake(0, 0, 10, 10)];
+}
+
 @interface NotificationDelegate : NSObject <WKUIDelegatePrivate> {
     bool _allowNotifications;