[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 3866e312a937d2c8652125a828a478deacd277a9
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 14 08:37:34 2002 +0000

    WebCore:
    
    	- fixed 3100235 -- nil-deference in khtml::RenderTable at money.cnn.com
    
            * kwq/WebCoreBridge.h: Add needsLayout.
            * kwq/WebCoreBridge.mm: (-[WebCoreBridge needsLayout]): Return true if the render
    	tree root says "layouted" is false. It would be more elegant to use more of this
    	WebCore layout logic and have less of our own on the WebKit side.
    
            * WebCore.pbproj/project.pbxproj: Oh, that Project Builder.
    
    WebKit:
    
    	- fixed 3100235 -- nil-deference in khtml::RenderTable at money.cnn.com
    
            * WebView.subproj/WebHTMLView.m: (-[WebHTMLView drawRect:]):
    	If the WebCore side needs layout, then do layout before trying to draw.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2669 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index d75865f..6106d73 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-11-14  Darin Adler  <darin at apple.com>
+
+	- fixed 3100235 -- nil-deference in khtml::RenderTable at money.cnn.com
+
+        * kwq/WebCoreBridge.h: Add needsLayout.
+        * kwq/WebCoreBridge.mm: (-[WebCoreBridge needsLayout]): Return true if the render
+	tree root says "layouted" is false. It would be more elegant to use more of this
+	WebCore layout logic and have less of our own on the WebKit side.
+
+        * WebCore.pbproj/project.pbxproj: Oh, that Project Builder.
+
 2002-11-13  Darin Adler  <darin at apple.com>
 
 	- fixed 3100895 -- REGRESSION: Crash (was assertion) on http://www.w3.org/Style/CSS/
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index d75865f..6106d73 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2002-11-14  Darin Adler  <darin at apple.com>
+
+	- fixed 3100235 -- nil-deference in khtml::RenderTable at money.cnn.com
+
+        * kwq/WebCoreBridge.h: Add needsLayout.
+        * kwq/WebCoreBridge.mm: (-[WebCoreBridge needsLayout]): Return true if the render
+	tree root says "layouted" is false. It would be more elegant to use more of this
+	WebCore layout logic and have less of our own on the WebKit side.
+
+        * WebCore.pbproj/project.pbxproj: Oh, that Project Builder.
+
 2002-11-13  Darin Adler  <darin at apple.com>
 
 	- fixed 3100895 -- REGRESSION: Crash (was assertion) on http://www.w3.org/Style/CSS/
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d75865f..6106d73 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2002-11-14  Darin Adler  <darin at apple.com>
+
+	- fixed 3100235 -- nil-deference in khtml::RenderTable at money.cnn.com
+
+        * kwq/WebCoreBridge.h: Add needsLayout.
+        * kwq/WebCoreBridge.mm: (-[WebCoreBridge needsLayout]): Return true if the render
+	tree root says "layouted" is false. It would be more elegant to use more of this
+	WebCore layout logic and have less of our own on the WebKit side.
+
+        * WebCore.pbproj/project.pbxproj: Oh, that Project Builder.
+
 2002-11-13  Darin Adler  <darin at apple.com>
 
 	- fixed 3100895 -- REGRESSION: Crash (was assertion) on http://www.w3.org/Style/CSS/
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index e5fe98f..83de1b3 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -72,6 +72,7 @@
 				F58C8A07025BD3BC018635CA,
 				F531DDEC02F0C34D018635CA,
 			);
+			hasScannedForEncodings = 1;
 			isa = PBXProject;
 			knownRegions = (
 				English,
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index da5672c..858f8ba 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -116,6 +116,7 @@ enum FrameBorderStyle {
 
 - (void)reapplyStyles;
 - (void)forceLayout;
+- (BOOL)needsLayout;
 - (void)adjustFrames:(NSRect)rect;
 - (void)drawRect:(NSRect)rect;
 
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index 9c55cf0..85ebafe 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -805,4 +805,10 @@ static NSAttributedString *attributedString(DOM::NodeImpl *_startNode, int start
     return [WebCoreBridge stringWithData:data textEncoding:textEncoding];
 }
 
+- (BOOL)needsLayout
+{
+    RenderObject *renderer = _part->kwq->renderer();
+    return renderer ? !renderer->layouted() : false;
+}
+
 @end
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 04dce07..59aeb0f 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-11-14  Darin Adler  <darin at apple.com>
+
+	- fixed 3100235 -- nil-deference in khtml::RenderTable at money.cnn.com
+
+        * WebView.subproj/WebHTMLView.m: (-[WebHTMLView drawRect:]):
+	If the WebCore side needs layout, then do layout before trying to draw.
+
 2002-11-13  Trey Matteson  <trey at apple.com>
 
 	Fixed client redirects, some more.  The upshot is that they do not
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 04dce07..59aeb0f 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-11-14  Darin Adler  <darin at apple.com>
+
+	- fixed 3100235 -- nil-deference in khtml::RenderTable at money.cnn.com
+
+        * WebView.subproj/WebHTMLView.m: (-[WebHTMLView drawRect:]):
+	If the WebCore side needs layout, then do layout before trying to draw.
+
 2002-11-13  Trey Matteson  <trey at apple.com>
 
 	Fixed client redirects, some more.  The upshot is that they do not
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 006a839..eb197d7 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -483,6 +483,9 @@
         [self _restoreSubviews];
     }
     
+    if ([[self _bridge] needsLayout]) {
+        _private->needsLayout = YES;
+    }
     BOOL didReapplyStylesOrLayout = _private->needsToApplyStyles || _private->needsLayout;
 
     [self layout];

-- 
WebKit Debian packaging