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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 08c8577ea40b552f9ea567414d369e94eea889c1
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 12 04:02:33 2002 +0000

            Fixed 3125425.  Just call super if view isn't in view heirarchy,
            rather than asserting.  The assert was firing because NSText
            was trying to perform a background layout on an item view that
            was moved to the page cache.
    
            Reviewed by gramps.
    
            * WebView.subproj/WebHTMLView.m:
            (-[WebHTMLView visibleRect]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3010 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 793e475..07c905a 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,20 @@
 2002-12-11  Richard Williamson   <rjw at apple.com>
 
+        Fixed 3125425.  Just call super if view isn't in view heirarchy,
+        rather than asserting.  The assert was firing because NSText 
+        was trying to perform a background layout on an item view that
+        was moved to the page cache.
+        
+        Reviewed by gramps.
+
+        * WebCoreSupport.subproj/WebImageRenderer.m:
+        (-[WebImageRenderer incrementalLoadWithBytes:length:complete:]):
+        (-[WebImageRenderer drawClippedToValidInRect:fromRect:]):
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView visibleRect]):
+
+2002-12-11  Richard Williamson   <rjw at apple.com>
+
         Fixed 3124121, 3124716 (and other dupes).  Regressions related to b/f crash.
         
         Reviewed by hyatt.
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 2ee1ada..fa053d6 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -551,7 +551,9 @@
 // Turn off the additional clip while computing our visibleRect.
 - (NSRect)visibleRect
 {
-    ASSERT([[self superview] isKindOfClass:[WebClipView class]]);
+    if (!([[self superview] isKindOfClass:[WebClipView class]]))
+        return [super visibleRect];
+        
     WebClipView *clipView = (WebClipView *)[self superview];
 
     BOOL hasAdditionalClip = [clipView hasAdditionalClip];

-- 
WebKit Debian packaging