Commit 44b89c45 authored by andersca's avatar andersca
Browse files

LayoutTests:

        Reviewed by Mitz.

        http://bugs.webkit.org/show_bug.cgi?id=13771
        Assertion failure ASSERT(m_layer) when running Hamachi fuzz tester
        
        * fast/frames/inline-object-inside-frameset-expected.txt: Added.
        * fast/frames/inline-object-inside-frameset.html: Added.

WebCore:

        Reviewed by Mitz.

        Test: fast/frames/inline-object-inside-frameset.html
        
        http://bugs.webkit.org/show_bug.cgi?id=13771
        Assertion failure ASSERT(m_layer) when running Hamachi fuzz tester

        Don't paint inline objects.
        
        * rendering/RenderFrameSet.cpp:
        (WebCore::RenderFrameSet::paint):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@21600 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent f0935893
2007-05-19 Anders Carlsson <andersca@apple.com>
Reviewed by Mitz.
http://bugs.webkit.org/show_bug.cgi?id=13771
Assertion failure ASSERT(m_layer) when running Hamachi fuzz tester
* fast/frames/inline-object-inside-frameset-expected.txt: Added.
* fast/frames/inline-object-inside-frameset.html: Added.
2007-05-18 Sam Weinig <sam@webkit.org>
 
Reviewed by Geoff.
layer at (0,0) size 793x634
RenderView at (0,0) size 785x585
layer at (0,0) size 793x634
RenderBlock {HTML} at (0,0) size 785x634
RenderBody {BODY} at (8,8) size 769x618
RenderBlock {DIV} at (0,0) size 769x18
RenderText {#text} at (0,0) size 692x18
text run at (0,0) width 692: "This tests that putting an inline element (such as a span) inside of an element doesn't cause an assertion failure."
RenderBlock {DIV} at (0,18) size 769x600
RenderFrameSet {FRAMESET} at (0,0) size 785x600
RenderInline {SPAN} at (0,0) size 0x0
<html><head>
<script>
function runTest() {
var dcont = document.getElementById("dcont");
var e = document.createElement('frameset');
var span = document.createElement('span');
e.appendChild(span);
dcont.appendChild(e);
if (window.layoutTestController)
layoutTestController.display();
}
</script>
</head><body onload="runTest()">
<div>This tests that putting an inline element (such as a span) inside of an element doesn't cause an assertion failure.</div>
<div id="dcont">
</div>
</body></html>
2007-05-19 Anders Carlsson <andersca@apple.com>
Reviewed by Mitz.
Test: fast/frames/inline-object-inside-frameset.html
http://bugs.webkit.org/show_bug.cgi?id=13771
Assertion failure ASSERT(m_layer) when running Hamachi fuzz tester
Don't paint inline objects.
* rendering/RenderFrameSet.cpp:
(WebCore::RenderFrameSet::paint):
2007-05-19 David Hyatt <hyatt@apple.com>
 
Add support for plain text MIME types (CSS/JS/TXT) to view source mode.
......@@ -140,7 +140,8 @@ void RenderFrameSet::paint(PaintInfo& paintInfo, int tx, int ty)
for (int r = 0; r < rows; r++) {
int xPos = 0;
for (int c = 0; c < cols; c++) {
child->paint(paintInfo, tx, ty);
if (!child->isInline())
child->paint(paintInfo, tx, ty);
xPos += m_cols.m_sizes[c];
if (borderThickness && m_cols.m_allowBorder[c + 1]) {
paintColumnBorder(paintInfo, IntRect(tx + xPos, ty + yPos, borderThickness, height()));
......
Supports Markdown
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