[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 79ae720da086f0f7b65636ff7d6a0e19fa280480
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun May 11 15:27:31 2003 +0000

            * WebView.subproj/WebHTMLView.m: (-[WebHTMLView layoutToPageWidth:]): Added a check for nil that I forgot.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4348 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 606fa8f..147c7de 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,7 @@
+2003-05-11  Darin Adler  <darin at apple.com>
+
+        * WebView.subproj/WebHTMLView.m: (-[WebHTMLView layoutToPageWidth:]): Added a check for nil that I forgot.
+
 2003-05-10  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index e304d34..5e30df9 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -331,7 +331,8 @@
     
     if (!_private->printing) {
 	NSSize newLayoutSize = [(NSClipView *)[self superview] documentVisibleRect].size;
-	NSTimeInterval currentEventTime = [[NSApp currentEvent] timestamp];
+	NSEvent *event = [NSApp currentEvent];
+        NSTimeInterval currentEventTime = event == nil ? 0 : [event timestamp];
         if (_private->firstLayoutEventTime == 0) {
             _private->firstLayoutEventTime = currentEventTime;
         } else if (_private->firstLayoutEventTime != currentEventTime && !NSEqualSizes(_private->lastLayoutSize, newLayoutSize)) {

-- 
WebKit Debian packaging