Commit 3866e312 authored by darin's avatar darin
Browse files

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
parent 3a55cfde
2002-11-14 Darin Adler <darin@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@apple.com>
 
- fixed 3100895 -- REGRESSION: Crash (was assertion) on http://www.w3.org/Style/CSS/
......
2002-11-14 Darin Adler <darin@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@apple.com>
 
- fixed 3100895 -- REGRESSION: Crash (was assertion) on http://www.w3.org/Style/CSS/
......
2002-11-14 Darin Adler <darin@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@apple.com>
 
- fixed 3100895 -- REGRESSION: Crash (was assertion) on http://www.w3.org/Style/CSS/
......
......@@ -72,6 +72,7 @@
F58C8A07025BD3BC018635CA,
F531DDEC02F0C34D018635CA,
);
hasScannedForEncodings = 1;
isa = PBXProject;
knownRegions = (
English,
......
......@@ -116,6 +116,7 @@ enum FrameBorderStyle {
- (void)reapplyStyles;
- (void)forceLayout;
- (BOOL)needsLayout;
- (void)adjustFrames:(NSRect)rect;
- (void)drawRect:(NSRect)rect;
......
......@@ -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
2002-11-14 Darin Adler <darin@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@apple.com>
 
Fixed client redirects, some more. The upshot is that they do not
......
2002-11-14 Darin Adler <darin@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@apple.com>
 
Fixed client redirects, some more. The upshot is that they do not
......
......@@ -483,6 +483,9 @@ - (void)drawRect:(NSRect)rect
[self _restoreSubviews];
}
if ([[self _bridge] needsLayout]) {
_private->needsLayout = YES;
}
BOOL didReapplyStylesOrLayout = _private->needsToApplyStyles || _private->needsLayout;
[self layout];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment