[webkit-changes] cvs commit: WebCore/layout-tests/fast/css list-outline-expected.txt list-outline.html

Wed Jun 29 10:18:16 PDT 2005

ggaren      05/06/29 10:18:16

  Modified:    .        ChangeLog
               khtml/rendering render_line.cpp
  Added:       layout-tests/fast/css list-outline-expected.txt
                        list-outline.html
  Log:
  	Patch by Hanspeter Schaub <Hanspeterschaub at mac.com>

  	-fixes http://bugzilla.opendarwin.org/show_bug.cgi?id=3317
  	REGRESSION: CSS2: outline is applied to both <li> element
  	and its enclosing text with context dependent selector

          Reviewed by Hyatt.

          Test cases added:
          * layout-tests/fast/css/list-outline-expected.txt: Added.
          * layout-tests/fast/css/list-outline.html: Added.

          * khtml/rendering/render_line.cpp:
          (khtml::InlineFlowBox::paint):

  Revision  Changes    Path
  1.4325    +17 -0     WebCore/ChangeLog

  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4324
  retrieving revision 1.4325
  diff -u -r1.4324 -r1.4325
  --- ChangeLog	28 Jun 2005 23:22:12 -0000	1.4324
  +++ ChangeLog	29 Jun 2005 17:18:12 -0000	1.4325
  @@ -1,3 +1,20 @@
  +2005-06-29  Geoffrey Garen  <ggaren at apple.com>
  +
  +	Patch by Hanspeter Schaub <Hanspeterschaub at mac.com>
  +
  +	-fixes http://bugzilla.opendarwin.org/show_bug.cgi?id=3317
  +	REGRESSION: CSS2: outline is applied to both <li> element 
  +	and its enclosing text with context dependent selector
  +
  +        Reviewed by Hyatt.
  +
  +        Test cases added: 
  +        * layout-tests/fast/css/list-outline-expected.txt: Added.
  +        * layout-tests/fast/css/list-outline.html: Added.
  +
  +        * khtml/rendering/render_line.cpp:
  +        (khtml::InlineFlowBox::paint):
  +
   2005-06-28  Vicki Murley  <vicki at apple.com>

           Reviewed by Maciej.

  1.41      +1 -1      WebCore/khtml/rendering/render_line.cpp

  Index: render_line.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/rendering/render_line.cpp,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- render_line.cpp	23 Jun 2005 19:47:49 -0000	1.40
  +++ render_line.cpp	29 Jun 2005 17:18:15 -0000	1.41
  @@ -759,7 +759,7 @@
               // Add ourselves to the paint info struct's list of inlines that need to paint their
               // outlines.
               if (object()->style()->visibility() == VISIBLE && object()->style()->outlineWidth() > 0 &&
  -                !object()->isInlineContinuation()) {
  +                !object()->isInlineContinuation() && !isRootInlineBox()) {
                   if (!i.outlineObjects)
                       i.outlineObjects = new QPtrDict<RenderFlow>;
                   if (!i.outlineObjects->find(flowObject()))

  1.1                  WebCore/layout-tests/fast/css/list-outline-expected.txt

  Index: list-outline-expected.txt
  ===================================================================
  layer at (0,0) size 800x600
    RenderCanvas at (0,0) size 800x600
  layer at (0,0) size 800x82
    RenderBlock {HTML} at (0,0) size 800x82
      RenderBody {BODY} at (8,16) size 784x50
        RenderBlock {OL} at (0,0) size 784x50
          RenderListItem {LI} at (40,0) size 744x50
            RenderListMarker at (16,16) size 0x14
            RenderText {TEXT} at (16,16) size 582x18
              text run at (16,16) width 582: "A single outline should only appear over the list element, and not over internal text elements."

  1.1                  WebCore/layout-tests/fast/css/list-outline.html

  Index: list-outline.html
  ===================================================================
  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
  <html>
  <head>
  <title>The WebKit Open Source Project</title>
  <style type="text/css" media="all">
  	ol.test li {
  	outline: 1px solid red;
  	padding: 1em;
      }
  </style>

  </head>

  <body>

  <ol class="test">
  <li >
  A single outline should only appear over the list element, and not over internal text elements.     
  </li> 
  </ol>

  </body>

  </html>