Changeset 47400 in webkit


Ignore:
Timestamp:
Aug 17, 2009 5:24:46 PM (15 years ago)
Author:
eric@webkit.org
Message:

2009-08-17 Shinichiro Hamaji <hamaji@chromium.org>

Reviewed by Darin Adler.

Assertion failure in WebCore::RenderHTMLCanvas::layout
https://bugs.webkit.org/show_bug.cgi?id=12052

Don't handle run-in if the element is not a block element.

  • fast/runin/canvas-runin-expected.txt: Added.
  • fast/runin/canvas-runin.html: Added.

2009-08-17 Shinichiro Hamaji <hamaji@chromium.org>

Reviewed by Darin Adler.

Assertion failure in WebCore::RenderHTMLCanvas::layout
https://bugs.webkit.org/show_bug.cgi?id=12052

Don't handle run-in if the element is not a block element.

Test: fast/runin/nonblock-runin.html

  • rendering/RenderBlock.cpp: (WebCore::RenderBlock::handleRunInChild):
Location:
trunk
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r47398 r47400  
     12009-08-17  Shinichiro Hamaji  <hamaji@chromium.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        Assertion failure in WebCore::RenderHTMLCanvas::layout
     6        https://bugs.webkit.org/show_bug.cgi?id=12052
     7
     8        Don't handle run-in if the element is not a block element.
     9
     10        * fast/runin/canvas-runin-expected.txt: Added.
     11        * fast/runin/canvas-runin.html: Added.
     12
    1132009-08-17  Benjamin C Meyer  <benjamin.meyer@torchmobile.com>
    214
  • trunk/WebCore/ChangeLog

    r47398 r47400  
     12009-08-17  Shinichiro Hamaji  <hamaji@chromium.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        Assertion failure in WebCore::RenderHTMLCanvas::layout
     6        https://bugs.webkit.org/show_bug.cgi?id=12052
     7
     8        Don't handle run-in if the element is not a block element.
     9
     10        Test: fast/runin/nonblock-runin.html
     11
     12        * rendering/RenderBlock.cpp:
     13        (WebCore::RenderBlock::handleRunInChild):
     14
    1152009-08-17  Benjamin C Meyer  <benjamin.meyer@torchmobile.com>
    216
  • trunk/WebCore/rendering/RenderBlock.cpp

    r47255 r47400  
    10231023    // children aren't inline, then just treat the run-in as a normal
    10241024    // block.
    1025     if (!child->isRunIn() || !child->childrenInline() && !child->isReplaced())
     1025    if (!child->isRunIn() || !child->childrenInline())
     1026        return false;
     1027    // FIXME: We don't handle non-block elements with run-in for now.
     1028    if (!child->isRenderBlock())
    10261029        return false;
    10271030
Note: See TracChangeset for help on using the changeset viewer.