Reviewed by Ken.

        - fixed <rdar://problem/3855127> Error while printing w/o sheet, then window is left in a bad state,
        if there's no default printer set

        * WebView.subproj/WebHTMLView.m:
        (-[WebHTMLView beginDocument]):
        Our implementation of knowsPageRange puts the WebHTMLView into a special "printing mode". We must
        exit the "printing mode" to return to normal behavior. This is normally done in endDocument.
        However, it turns out that if there's an exception in [super beginDocument], then endDocument
        will not be called (lame-o AppKit API). So, we handle that case by catching the exception and
        exiting the "printing mode" in beginDocument when it occurs.

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

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index b6878e82ff18f66eafdb9011ac1fefbda720ed57..c694aba46fecccdf0e86666f179bf07a1ea96507 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2004-12-10  John Sullivan  <sullivan@apple.com>
+
+        Reviewed by Ken.
+        
+        - fixed <rdar://problem/3855127> Error while printing w/o sheet, then window is left in a bad state, 
+        if there's no default printer set
+
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView beginDocument]):
+        Our implementation of knowsPageRange puts the WebHTMLView into a special "printing mode". We must
+        exit the "printing mode" to return to normal behavior. This is normally done in endDocument.
+        However, it turns out that if there's an exception in [super beginDocument], then endDocument
+        will not be called (lame-o AppKit API). So, we handle that case by catching the exception and
+        exiting the "printing mode" in beginDocument when it occurs.
+
 2004-12-09  Richard Williamson   <rjw@apple.com>
 
        Fixed <rdar://problem/3905789> Burn Disc image vibrates rapidly

diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index fccc33ab2fd9d9d6b5fa1bbb87190131c9afd235..eba8ce490a66cf1fdfb33f0c9c29894bf9a2cc4d 100644 (file)
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -2715,6 +2715,18 @@ static WebHTMLView *lastHitView = nil;
     [[self _webView] _drawHeaderAndFooter];
 }
 
+- (void)beginDocument
+{
+    NS_DURING
+        [super beginDocument];
+    NS_HANDLER
+        // Exception during [super beginDocument] means that endDocument will not get called,
+        // so we need to clean up our "print mode" here.
+        [self _setPrinting:NO minimumPageWidth:0.0 maximumPageWidth:0.0 adjustViewSize:YES];
+        [[self window] setAutodisplay:YES];
+    NS_ENDHANDLER
+}
+
 - (void)endDocument
 {
     [super endDocument];