Changeset 91151 in webkit


Ignore:
Timestamp:
Jul 16, 2011 12:07:21 PM (13 years ago)
Author:
weinig@apple.com
Message:

Attribute selectors don't handle glob namespaces (e.g. *|E)
https://bugs.webkit.org/show_bug.cgi?id=64567

Reviewed by Anders Carlsson.

Source/WebCore:

Change checking of attribute selectors to match CSS 3 Selectors in
the presence of namespaces. This entails changing the algorithm to
check each attribute on an element as a match for the attribute selector
and taking into account a prefix of *.

  • css/CSSStyleSelector.cpp:

(WebCore::attributeQualifiedNameMatches):
Checks if the a particular attributes qualified name matches
the attribute selector, taking into account a prefix of *.

(WebCore::attributeValueMatches):
Checks if a particular attribute on an element, matches
the attribute selector.

(WebCore::anyAttributeMatches):
Top level attribute check. Checks if any of an elements attributes
match the attribute selector.

(WebCore::CSSStyleSelector::SelectorChecker::checkOneSelector):
Factor out attribute checking code into the above functions.

LayoutTests:

Update results for correct handling of a * prefix in an attribute selector.
Fixes 50 tests.

  • platform/mac/css3/selectors3/xhtml/css3-modsel-104-expected.png:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-104-expected.txt:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-105-expected.png:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-105-expected.txt:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-106-expected.png:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-106-expected.txt:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-107-expected.png:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-107-expected.txt:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-108-expected.png:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-108-expected.txt:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-109-expected.png:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-109-expected.txt:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-110-expected.png:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-110-expected.txt:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-130-expected.png:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-130-expected.txt:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-130b-expected.png:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-130b-expected.txt:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-131-expected.png:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-131-expected.txt:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-131b-expected.png:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-131b-expected.txt:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-132-expected.png:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-132-expected.txt:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-132b-expected.png:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-132b-expected.txt:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-133-expected.png:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-133-expected.txt:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-133b-expected.png:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-133b-expected.txt:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-134-expected.png:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-134-expected.txt:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-134b-expected.png:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-134b-expected.txt:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-135-expected.png:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-135-expected.txt:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-135b-expected.png:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-135b-expected.txt:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-136-expected.png:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-136-expected.txt:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-136b-expected.png:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-136b-expected.txt:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-173a-expected.png:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-173a-expected.txt:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-173b-expected.png:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-173b-expected.txt:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-174a-expected.png:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-174a-expected.txt:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-174b-expected.png:
  • platform/mac/css3/selectors3/xhtml/css3-modsel-174b-expected.txt:
  • platform/mac/css3/selectors3/xml/css3-modsel-104-expected.png:
  • platform/mac/css3/selectors3/xml/css3-modsel-104-expected.txt:
  • platform/mac/css3/selectors3/xml/css3-modsel-105-expected.png:
  • platform/mac/css3/selectors3/xml/css3-modsel-105-expected.txt:
  • platform/mac/css3/selectors3/xml/css3-modsel-106-expected.png:
  • platform/mac/css3/selectors3/xml/css3-modsel-106-expected.txt:
  • platform/mac/css3/selectors3/xml/css3-modsel-107-expected.png:
  • platform/mac/css3/selectors3/xml/css3-modsel-107-expected.txt:
  • platform/mac/css3/selectors3/xml/css3-modsel-108-expected.png:
  • platform/mac/css3/selectors3/xml/css3-modsel-108-expected.txt:
  • platform/mac/css3/selectors3/xml/css3-modsel-109-expected.png:
  • platform/mac/css3/selectors3/xml/css3-modsel-109-expected.txt:
  • platform/mac/css3/selectors3/xml/css3-modsel-110-expected.png:
  • platform/mac/css3/selectors3/xml/css3-modsel-110-expected.txt:
  • platform/mac/css3/selectors3/xml/css3-modsel-130-expected.png:
  • platform/mac/css3/selectors3/xml/css3-modsel-130-expected.txt:
  • platform/mac/css3/selectors3/xml/css3-modsel-130b-expected.png:
  • platform/mac/css3/selectors3/xml/css3-modsel-130b-expected.txt:
  • platform/mac/css3/selectors3/xml/css3-modsel-131-expected.png:
  • platform/mac/css3/selectors3/xml/css3-modsel-131-expected.txt:
  • platform/mac/css3/selectors3/xml/css3-modsel-131b-expected.png:
  • platform/mac/css3/selectors3/xml/css3-modsel-131b-expected.txt:
  • platform/mac/css3/selectors3/xml/css3-modsel-132-expected.png:
  • platform/mac/css3/selectors3/xml/css3-modsel-132-expected.txt:
  • platform/mac/css3/selectors3/xml/css3-modsel-132b-expected.png:
  • platform/mac/css3/selectors3/xml/css3-modsel-132b-expected.txt:
  • platform/mac/css3/selectors3/xml/css3-modsel-133-expected.png:
  • platform/mac/css3/selectors3/xml/css3-modsel-133-expected.txt:
  • platform/mac/css3/selectors3/xml/css3-modsel-133b-expected.png:
  • platform/mac/css3/selectors3/xml/css3-modsel-133b-expected.txt:
  • platform/mac/css3/selectors3/xml/css3-modsel-134-expected.png:
  • platform/mac/css3/selectors3/xml/css3-modsel-134-expected.txt:
  • platform/mac/css3/selectors3/xml/css3-modsel-134b-expected.png:
  • platform/mac/css3/selectors3/xml/css3-modsel-134b-expected.txt:
  • platform/mac/css3/selectors3/xml/css3-modsel-135-expected.png:
  • platform/mac/css3/selectors3/xml/css3-modsel-135-expected.txt:
  • platform/mac/css3/selectors3/xml/css3-modsel-135b-expected.png:
  • platform/mac/css3/selectors3/xml/css3-modsel-135b-expected.txt:
  • platform/mac/css3/selectors3/xml/css3-modsel-136-expected.png:
  • platform/mac/css3/selectors3/xml/css3-modsel-136-expected.txt:
  • platform/mac/css3/selectors3/xml/css3-modsel-136b-expected.png:
  • platform/mac/css3/selectors3/xml/css3-modsel-136b-expected.txt:
  • platform/mac/css3/selectors3/xml/css3-modsel-173a-expected.png:
  • platform/mac/css3/selectors3/xml/css3-modsel-173a-expected.txt:
  • platform/mac/css3/selectors3/xml/css3-modsel-173b-expected.png:
  • platform/mac/css3/selectors3/xml/css3-modsel-173b-expected.txt:
  • platform/mac/css3/selectors3/xml/css3-modsel-174a-expected.png:
  • platform/mac/css3/selectors3/xml/css3-modsel-174a-expected.txt:
  • platform/mac/css3/selectors3/xml/css3-modsel-174b-expected.png:
  • platform/mac/css3/selectors3/xml/css3-modsel-174b-expected.txt:
Location:
trunk
Files:
103 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r91148 r91151  
     12011-07-16  Sam Weinig  <sam@webkit.org>
     2
     3        Attribute selectors don't handle glob namespaces (e.g. *|E)
     4        https://bugs.webkit.org/show_bug.cgi?id=64567
     5
     6        Reviewed by Anders Carlsson.
     7
     8        Update results for correct handling of a * prefix in an attribute selector.
     9        Fixes 50 tests.
     10
     11        * platform/mac/css3/selectors3/xhtml/css3-modsel-104-expected.png:
     12        * platform/mac/css3/selectors3/xhtml/css3-modsel-104-expected.txt:
     13        * platform/mac/css3/selectors3/xhtml/css3-modsel-105-expected.png:
     14        * platform/mac/css3/selectors3/xhtml/css3-modsel-105-expected.txt:
     15        * platform/mac/css3/selectors3/xhtml/css3-modsel-106-expected.png:
     16        * platform/mac/css3/selectors3/xhtml/css3-modsel-106-expected.txt:
     17        * platform/mac/css3/selectors3/xhtml/css3-modsel-107-expected.png:
     18        * platform/mac/css3/selectors3/xhtml/css3-modsel-107-expected.txt:
     19        * platform/mac/css3/selectors3/xhtml/css3-modsel-108-expected.png:
     20        * platform/mac/css3/selectors3/xhtml/css3-modsel-108-expected.txt:
     21        * platform/mac/css3/selectors3/xhtml/css3-modsel-109-expected.png:
     22        * platform/mac/css3/selectors3/xhtml/css3-modsel-109-expected.txt:
     23        * platform/mac/css3/selectors3/xhtml/css3-modsel-110-expected.png:
     24        * platform/mac/css3/selectors3/xhtml/css3-modsel-110-expected.txt:
     25        * platform/mac/css3/selectors3/xhtml/css3-modsel-130-expected.png:
     26        * platform/mac/css3/selectors3/xhtml/css3-modsel-130-expected.txt:
     27        * platform/mac/css3/selectors3/xhtml/css3-modsel-130b-expected.png:
     28        * platform/mac/css3/selectors3/xhtml/css3-modsel-130b-expected.txt:
     29        * platform/mac/css3/selectors3/xhtml/css3-modsel-131-expected.png:
     30        * platform/mac/css3/selectors3/xhtml/css3-modsel-131-expected.txt:
     31        * platform/mac/css3/selectors3/xhtml/css3-modsel-131b-expected.png:
     32        * platform/mac/css3/selectors3/xhtml/css3-modsel-131b-expected.txt:
     33        * platform/mac/css3/selectors3/xhtml/css3-modsel-132-expected.png:
     34        * platform/mac/css3/selectors3/xhtml/css3-modsel-132-expected.txt:
     35        * platform/mac/css3/selectors3/xhtml/css3-modsel-132b-expected.png:
     36        * platform/mac/css3/selectors3/xhtml/css3-modsel-132b-expected.txt:
     37        * platform/mac/css3/selectors3/xhtml/css3-modsel-133-expected.png:
     38        * platform/mac/css3/selectors3/xhtml/css3-modsel-133-expected.txt:
     39        * platform/mac/css3/selectors3/xhtml/css3-modsel-133b-expected.png:
     40        * platform/mac/css3/selectors3/xhtml/css3-modsel-133b-expected.txt:
     41        * platform/mac/css3/selectors3/xhtml/css3-modsel-134-expected.png:
     42        * platform/mac/css3/selectors3/xhtml/css3-modsel-134-expected.txt:
     43        * platform/mac/css3/selectors3/xhtml/css3-modsel-134b-expected.png:
     44        * platform/mac/css3/selectors3/xhtml/css3-modsel-134b-expected.txt:
     45        * platform/mac/css3/selectors3/xhtml/css3-modsel-135-expected.png:
     46        * platform/mac/css3/selectors3/xhtml/css3-modsel-135-expected.txt:
     47        * platform/mac/css3/selectors3/xhtml/css3-modsel-135b-expected.png:
     48        * platform/mac/css3/selectors3/xhtml/css3-modsel-135b-expected.txt:
     49        * platform/mac/css3/selectors3/xhtml/css3-modsel-136-expected.png:
     50        * platform/mac/css3/selectors3/xhtml/css3-modsel-136-expected.txt:
     51        * platform/mac/css3/selectors3/xhtml/css3-modsel-136b-expected.png:
     52        * platform/mac/css3/selectors3/xhtml/css3-modsel-136b-expected.txt:
     53        * platform/mac/css3/selectors3/xhtml/css3-modsel-173a-expected.png:
     54        * platform/mac/css3/selectors3/xhtml/css3-modsel-173a-expected.txt:
     55        * platform/mac/css3/selectors3/xhtml/css3-modsel-173b-expected.png:
     56        * platform/mac/css3/selectors3/xhtml/css3-modsel-173b-expected.txt:
     57        * platform/mac/css3/selectors3/xhtml/css3-modsel-174a-expected.png:
     58        * platform/mac/css3/selectors3/xhtml/css3-modsel-174a-expected.txt:
     59        * platform/mac/css3/selectors3/xhtml/css3-modsel-174b-expected.png:
     60        * platform/mac/css3/selectors3/xhtml/css3-modsel-174b-expected.txt:
     61        * platform/mac/css3/selectors3/xml/css3-modsel-104-expected.png:
     62        * platform/mac/css3/selectors3/xml/css3-modsel-104-expected.txt:
     63        * platform/mac/css3/selectors3/xml/css3-modsel-105-expected.png:
     64        * platform/mac/css3/selectors3/xml/css3-modsel-105-expected.txt:
     65        * platform/mac/css3/selectors3/xml/css3-modsel-106-expected.png:
     66        * platform/mac/css3/selectors3/xml/css3-modsel-106-expected.txt:
     67        * platform/mac/css3/selectors3/xml/css3-modsel-107-expected.png:
     68        * platform/mac/css3/selectors3/xml/css3-modsel-107-expected.txt:
     69        * platform/mac/css3/selectors3/xml/css3-modsel-108-expected.png:
     70        * platform/mac/css3/selectors3/xml/css3-modsel-108-expected.txt:
     71        * platform/mac/css3/selectors3/xml/css3-modsel-109-expected.png:
     72        * platform/mac/css3/selectors3/xml/css3-modsel-109-expected.txt:
     73        * platform/mac/css3/selectors3/xml/css3-modsel-110-expected.png:
     74        * platform/mac/css3/selectors3/xml/css3-modsel-110-expected.txt:
     75        * platform/mac/css3/selectors3/xml/css3-modsel-130-expected.png:
     76        * platform/mac/css3/selectors3/xml/css3-modsel-130-expected.txt:
     77        * platform/mac/css3/selectors3/xml/css3-modsel-130b-expected.png:
     78        * platform/mac/css3/selectors3/xml/css3-modsel-130b-expected.txt:
     79        * platform/mac/css3/selectors3/xml/css3-modsel-131-expected.png:
     80        * platform/mac/css3/selectors3/xml/css3-modsel-131-expected.txt:
     81        * platform/mac/css3/selectors3/xml/css3-modsel-131b-expected.png:
     82        * platform/mac/css3/selectors3/xml/css3-modsel-131b-expected.txt:
     83        * platform/mac/css3/selectors3/xml/css3-modsel-132-expected.png:
     84        * platform/mac/css3/selectors3/xml/css3-modsel-132-expected.txt:
     85        * platform/mac/css3/selectors3/xml/css3-modsel-132b-expected.png:
     86        * platform/mac/css3/selectors3/xml/css3-modsel-132b-expected.txt:
     87        * platform/mac/css3/selectors3/xml/css3-modsel-133-expected.png:
     88        * platform/mac/css3/selectors3/xml/css3-modsel-133-expected.txt:
     89        * platform/mac/css3/selectors3/xml/css3-modsel-133b-expected.png:
     90        * platform/mac/css3/selectors3/xml/css3-modsel-133b-expected.txt:
     91        * platform/mac/css3/selectors3/xml/css3-modsel-134-expected.png:
     92        * platform/mac/css3/selectors3/xml/css3-modsel-134-expected.txt:
     93        * platform/mac/css3/selectors3/xml/css3-modsel-134b-expected.png:
     94        * platform/mac/css3/selectors3/xml/css3-modsel-134b-expected.txt:
     95        * platform/mac/css3/selectors3/xml/css3-modsel-135-expected.png:
     96        * platform/mac/css3/selectors3/xml/css3-modsel-135-expected.txt:
     97        * platform/mac/css3/selectors3/xml/css3-modsel-135b-expected.png:
     98        * platform/mac/css3/selectors3/xml/css3-modsel-135b-expected.txt:
     99        * platform/mac/css3/selectors3/xml/css3-modsel-136-expected.png:
     100        * platform/mac/css3/selectors3/xml/css3-modsel-136-expected.txt:
     101        * platform/mac/css3/selectors3/xml/css3-modsel-136b-expected.png:
     102        * platform/mac/css3/selectors3/xml/css3-modsel-136b-expected.txt:
     103        * platform/mac/css3/selectors3/xml/css3-modsel-173a-expected.png:
     104        * platform/mac/css3/selectors3/xml/css3-modsel-173a-expected.txt:
     105        * platform/mac/css3/selectors3/xml/css3-modsel-173b-expected.png:
     106        * platform/mac/css3/selectors3/xml/css3-modsel-173b-expected.txt:
     107        * platform/mac/css3/selectors3/xml/css3-modsel-174a-expected.png:
     108        * platform/mac/css3/selectors3/xml/css3-modsel-174a-expected.txt:
     109        * platform/mac/css3/selectors3/xml/css3-modsel-174b-expected.png:
     110        * platform/mac/css3/selectors3/xml/css3-modsel-174b-expected.txt:
     111
    11122011-07-16  Kulanthaivel Palanichamy  <kulanthaivel@codeaurora.org>
    2113
  • trunk/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-104-expected.txt

    r91104 r91151  
    44  RenderBlock {html} at (0,0) size 800x152
    55    RenderBody {body} at (8,16) size 784x120
    6       RenderBlock {p} at (0,0) size 784x18 [bgcolor=#FF0000]
     6      RenderBlock {p} at (0,0) size 784x18 [bgcolor=#00FF00]
    77        RenderText {#text} at (0,0) size 304x18
    88          text run at (0,0) width 304: "This paragraph should have a green background"
     
    1010        RenderText {#text} at (0,0) size 221x18
    1111          text run at (0,0) width 221: "This paragraph should be unstyled."
    12       RenderBlock {r} at (0,68) size 784x18 [bgcolor=#FF0000]
     12      RenderBlock {r} at (0,68) size 784x18 [bgcolor=#00FF00]
    1313        RenderText {#text} at (0,0) size 304x18
    1414          text run at (0,0) width 304: "This paragraph should have a green background"
    15       RenderBlock {s} at (0,102) size 784x18 [bgcolor=#FF0000]
     15      RenderBlock {s} at (0,102) size 784x18 [bgcolor=#00FF00]
    1616        RenderText {#text} at (0,0) size 304x18
    1717          text run at (0,0) width 304: "This paragraph should have a green background"
  • trunk/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-105-expected.txt

    r91104 r91151  
    44  RenderBlock {html} at (0,0) size 800x186
    55    RenderBody {body} at (8,16) size 784x154
    6       RenderBlock {p} at (0,0) size 784x18 [bgcolor=#FF0000]
     6      RenderBlock {p} at (0,0) size 784x18 [bgcolor=#00FF00]
    77        RenderText {#text} at (0,0) size 308x18
    88          text run at (0,0) width 308: "This paragraph should have a green background."
     
    1313        RenderText {#text} at (0,0) size 221x18
    1414          text run at (0,0) width 221: "This paragraph should be unstyled."
    15       RenderBlock {r} at (0,102) size 784x18 [bgcolor=#FF0000]
     15      RenderBlock {r} at (0,102) size 784x18 [bgcolor=#00FF00]
    1616        RenderText {#text} at (0,0) size 308x18
    1717          text run at (0,0) width 308: "This paragraph should have a green background."
    18       RenderBlock {s} at (0,136) size 784x18 [bgcolor=#FF0000]
     18      RenderBlock {s} at (0,136) size 784x18 [bgcolor=#00FF00]
    1919        RenderText {#text} at (0,0) size 308x18
    2020          text run at (0,0) width 308: "This paragraph should have a green background."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-106-expected.txt

    r91104 r91151  
    44  RenderBlock {html} at (0,0) size 800x186
    55    RenderBody {body} at (8,16) size 784x154
    6       RenderBlock {p} at (0,0) size 784x18 [bgcolor=#FF0000]
     6      RenderBlock {p} at (0,0) size 784x18 [bgcolor=#00FF00]
    77        RenderText {#text} at (0,0) size 308x18
    88          text run at (0,0) width 308: "This paragraph should have a green background."
     
    1313        RenderText {#text} at (0,0) size 221x18
    1414          text run at (0,0) width 221: "This paragraph should be unstyled."
    15       RenderBlock {r} at (0,102) size 784x18 [bgcolor=#FF0000]
     15      RenderBlock {r} at (0,102) size 784x18 [bgcolor=#00FF00]
    1616        RenderText {#text} at (0,0) size 308x18
    1717          text run at (0,0) width 308: "This paragraph should have a green background."
    18       RenderBlock {s} at (0,136) size 784x18 [bgcolor=#FF0000]
     18      RenderBlock {s} at (0,136) size 784x18 [bgcolor=#00FF00]
    1919        RenderText {#text} at (0,0) size 308x18
    2020          text run at (0,0) width 308: "This paragraph should have a green background."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-107-expected.txt

    r91104 r91151  
    44  RenderBlock {html} at (0,0) size 800x186
    55    RenderBody {body} at (8,16) size 784x154
    6       RenderBlock {p} at (0,0) size 784x18 [bgcolor=#FF0000]
     6      RenderBlock {p} at (0,0) size 784x18 [bgcolor=#00FF00]
    77        RenderText {#text} at (0,0) size 304x18
    88          text run at (0,0) width 304: "This paragraph should have a green background"
  • trunk/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-108-expected.txt

    r91104 r91151  
    44  RenderBlock {html} at (0,0) size 800x186
    55    RenderBody {body} at (8,16) size 784x154
    6       RenderBlock {p} at (0,0) size 784x18 [bgcolor=#FF0000]
     6      RenderBlock {p} at (0,0) size 784x18 [bgcolor=#00FF00]
    77        RenderText {#text} at (0,0) size 308x18
    88          text run at (0,0) width 308: "This paragraph should have a green background."
     
    1010        RenderText {#text} at (0,0) size 221x18
    1111          text run at (0,0) width 221: "This paragraph should be unstyled."
    12       RenderBlock {r} at (0,68) size 784x18 [bgcolor=#FF0000]
     12      RenderBlock {r} at (0,68) size 784x18 [bgcolor=#00FF00]
    1313        RenderText {#text} at (0,0) size 308x18
    1414          text run at (0,0) width 308: "This paragraph should have a green background."
    15       RenderBlock {s} at (0,102) size 784x18 [bgcolor=#FF0000]
     15      RenderBlock {s} at (0,102) size 784x18 [bgcolor=#00FF00]
    1616        RenderText {#text} at (0,0) size 308x18
    1717          text run at (0,0) width 308: "This paragraph should have a green background."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-109-expected.txt

    r91104 r91151  
    44  RenderBlock {html} at (0,0) size 800x186
    55    RenderBody {body} at (8,16) size 784x154
    6       RenderBlock {p} at (0,0) size 784x18 [bgcolor=#FF0000]
     6      RenderBlock {p} at (0,0) size 784x18 [bgcolor=#00FF00]
    77        RenderText {#text} at (0,0) size 308x18
    88          text run at (0,0) width 308: "This paragraph should have a green background."
     
    1010        RenderText {#text} at (0,0) size 221x18
    1111          text run at (0,0) width 221: "This paragraph should be unstyled."
    12       RenderBlock {r} at (0,68) size 784x18 [bgcolor=#FF0000]
     12      RenderBlock {r} at (0,68) size 784x18 [bgcolor=#00FF00]
    1313        RenderText {#text} at (0,0) size 308x18
    1414          text run at (0,0) width 308: "This paragraph should have a green background."
    15       RenderBlock {s} at (0,102) size 784x18 [bgcolor=#FF0000]
     15      RenderBlock {s} at (0,102) size 784x18 [bgcolor=#00FF00]
    1616        RenderText {#text} at (0,0) size 308x18
    1717          text run at (0,0) width 308: "This paragraph should have a green background."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-110-expected.txt

    r91104 r91151  
    44  RenderBlock {html} at (0,0) size 800x186
    55    RenderBody {body} at (8,16) size 784x154
    6       RenderBlock {p} at (0,0) size 784x18 [bgcolor=#FF0000]
     6      RenderBlock {p} at (0,0) size 784x18 [bgcolor=#00FF00]
    77        RenderText {#text} at (0,0) size 308x18
    88          text run at (0,0) width 308: "This paragraph should have a green background."
     
    1010        RenderText {#text} at (0,0) size 221x18
    1111          text run at (0,0) width 221: "This paragraph should be unstyled."
    12       RenderBlock {r} at (0,68) size 784x18 [bgcolor=#FF0000]
     12      RenderBlock {r} at (0,68) size 784x18 [bgcolor=#00FF00]
    1313        RenderText {#text} at (0,0) size 308x18
    1414          text run at (0,0) width 308: "This paragraph should have a green background."
    15       RenderBlock {s} at (0,102) size 784x18 [bgcolor=#FF0000]
     15      RenderBlock {s} at (0,102) size 784x18 [bgcolor=#00FF00]
    1616        RenderText {#text} at (0,0) size 308x18
    1717          text run at (0,0) width 308: "This paragraph should have a green background."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-130-expected.txt

    r91104 r91151  
    88          RenderText {#text} at (0,0) size 308x18
    99            text run at (0,0) width 308: "This paragraph should have a green background."
    10         RenderBlock {r} at (0,34) size 784x18 [bgcolor=#00FF00]
     10        RenderBlock {r} at (0,34) size 784x18
    1111          RenderText {#text} at (0,0) size 221x18
    1212            text run at (0,0) width 221: "This paragraph should be unstyled."
    13         RenderBlock {s} at (0,68) size 784x18 [bgcolor=#00FF00]
     13        RenderBlock {s} at (0,68) size 784x18
    1414          RenderText {#text} at (0,0) size 221x18
    1515            text run at (0,0) width 221: "This paragraph should be unstyled."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-130b-expected.txt

    r91104 r91151  
    88          RenderText {#text} at (0,0) size 308x18
    99            text run at (0,0) width 308: "This paragraph should have a green background."
    10         RenderBlock {r} at (0,34) size 784x18 [bgcolor=#FF0000]
     10        RenderBlock {r} at (0,34) size 784x18
    1111          RenderText {#text} at (0,0) size 221x18
    1212            text run at (0,0) width 221: "This paragraph should be unstyled."
    13         RenderBlock {s} at (0,68) size 784x18 [bgcolor=#FF0000]
     13        RenderBlock {s} at (0,68) size 784x18
    1414          RenderText {#text} at (0,0) size 221x18
    1515            text run at (0,0) width 221: "This paragraph should be unstyled."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-131-expected.txt

    r91104 r91151  
    1111          RenderText {#text} at (0,0) size 308x18
    1212            text run at (0,0) width 308: "This paragraph should have a green background."
    13         RenderBlock {r} at (0,68) size 784x18 [bgcolor=#00FF00]
     13        RenderBlock {r} at (0,68) size 784x18
    1414          RenderText {#text} at (0,0) size 221x18
    1515            text run at (0,0) width 221: "This paragraph should be unstyled."
    16         RenderBlock {s} at (0,102) size 784x18 [bgcolor=#00FF00]
     16        RenderBlock {s} at (0,102) size 784x18
    1717          RenderText {#text} at (0,0) size 221x18
    1818            text run at (0,0) width 221: "This paragraph should be unstyled."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-131b-expected.txt

    r91104 r91151  
    1111          RenderText {#text} at (0,0) size 308x18
    1212            text run at (0,0) width 308: "This paragraph should have a green background."
    13         RenderBlock {r} at (0,68) size 784x18 [bgcolor=#FF0000]
     13        RenderBlock {r} at (0,68) size 784x18
    1414          RenderText {#text} at (0,0) size 221x18
    1515            text run at (0,0) width 221: "This paragraph should be unstyled."
    16         RenderBlock {s} at (0,102) size 784x18 [bgcolor=#FF0000]
     16        RenderBlock {s} at (0,102) size 784x18
    1717          RenderText {#text} at (0,0) size 221x18
    1818            text run at (0,0) width 221: "This paragraph should be unstyled."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-132-expected.txt

    r91104 r91151  
    55    RenderBody {body} at (8,16) size 784x188
    66      RenderBlock {div} at (0,0) size 784x188
    7         RenderBlock {p} at (0,0) size 784x18 [bgcolor=#00FF00]
     7        RenderBlock {p} at (0,0) size 784x18
    88          RenderText {#text} at (0,0) size 217x18
    99            text run at (0,0) width 217: "This paragraph should be unstyled"
     
    1717          RenderText {#text} at (0,0) size 308x18
    1818            text run at (0,0) width 308: "This paragraph should have a green background."
    19         RenderBlock {r} at (0,136) size 784x18 [bgcolor=#00FF00]
     19        RenderBlock {r} at (0,136) size 784x18
    2020          RenderText {#text} at (0,0) size 221x18
    2121            text run at (0,0) width 221: "This paragraph should be unstyled."
    22         RenderBlock {s} at (0,170) size 784x18 [bgcolor=#00FF00]
     22        RenderBlock {s} at (0,170) size 784x18
    2323          RenderText {#text} at (0,0) size 221x18
    2424            text run at (0,0) width 221: "This paragraph should be unstyled."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-132b-expected.txt

    r91104 r91151  
    55    RenderBody {body} at (8,16) size 784x188
    66      RenderBlock {div} at (0,0) size 784x188
    7         RenderBlock {p} at (0,0) size 784x18 [bgcolor=#FF0000]
     7        RenderBlock {p} at (0,0) size 784x18
    88          RenderText {#text} at (0,0) size 217x18
    99            text run at (0,0) width 217: "This paragraph should be unstyled"
     
    1717          RenderText {#text} at (0,0) size 308x18
    1818            text run at (0,0) width 308: "This paragraph should have a green background."
    19         RenderBlock {r} at (0,136) size 784x18 [bgcolor=#FF0000]
     19        RenderBlock {r} at (0,136) size 784x18
    2020          RenderText {#text} at (0,0) size 221x18
    2121            text run at (0,0) width 221: "This paragraph should be unstyled."
    22         RenderBlock {s} at (0,170) size 784x18 [bgcolor=#FF0000]
     22        RenderBlock {s} at (0,170) size 784x18
    2323          RenderText {#text} at (0,0) size 221x18
    2424            text run at (0,0) width 221: "This paragraph should be unstyled."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-133-expected.txt

    r91104 r91151  
    55    RenderBody {body} at (8,16) size 784x188
    66      RenderBlock {div} at (0,0) size 784x188
    7         RenderBlock {p} at (0,0) size 784x18 [bgcolor=#00FF00]
     7        RenderBlock {p} at (0,0) size 784x18
    88          RenderText {#text} at (0,0) size 221x18
    99            text run at (0,0) width 221: "This paragraph should be unstyled."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-133b-expected.txt

    r91104 r91151  
    55    RenderBody {body} at (8,16) size 784x188
    66      RenderBlock {div} at (0,0) size 784x188
    7         RenderBlock {p} at (0,0) size 784x18 [bgcolor=#FF0000]
     7        RenderBlock {p} at (0,0) size 784x18
    88          RenderText {#text} at (0,0) size 221x18
    99            text run at (0,0) width 221: "This paragraph should be unstyled."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-134-expected.txt

    r91104 r91151  
    55    RenderBody {body} at (8,16) size 784x188
    66      RenderBlock {div} at (0,0) size 784x188
    7         RenderBlock {p} at (0,0) size 784x18 [bgcolor=#00FF00]
     7        RenderBlock {p} at (0,0) size 784x18
    88          RenderText {#text} at (0,0) size 221x18
    99            text run at (0,0) width 221: "This paragraph should be unstyled."
     
    1414          RenderText {#text} at (0,0) size 308x18
    1515            text run at (0,0) width 308: "This paragraph should have a green background."
    16         RenderBlock {r} at (0,102) size 784x18 [bgcolor=#00FF00]
     16        RenderBlock {r} at (0,102) size 784x18
    1717          RenderText {#text} at (0,0) size 221x18
    1818            text run at (0,0) width 221: "This paragraph should be unstyled."
    19         RenderBlock {s} at (0,136) size 784x18 [bgcolor=#00FF00]
     19        RenderBlock {s} at (0,136) size 784x18
    2020          RenderText {#text} at (0,0) size 221x18
    2121            text run at (0,0) width 221: "This paragraph should be unstyled."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-134b-expected.txt

    r91104 r91151  
    55    RenderBody {body} at (8,16) size 784x188
    66      RenderBlock {div} at (0,0) size 784x188
    7         RenderBlock {p} at (0,0) size 784x18 [bgcolor=#FF0000]
     7        RenderBlock {p} at (0,0) size 784x18
    88          RenderText {#text} at (0,0) size 221x18
    99            text run at (0,0) width 221: "This paragraph should be unstyled."
     
    1414          RenderText {#text} at (0,0) size 308x18
    1515            text run at (0,0) width 308: "This paragraph should have a green background."
    16         RenderBlock {r} at (0,102) size 784x18 [bgcolor=#FF0000]
     16        RenderBlock {r} at (0,102) size 784x18
    1717          RenderText {#text} at (0,0) size 221x18
    1818            text run at (0,0) width 221: "This paragraph should be unstyled."
    19         RenderBlock {s} at (0,136) size 784x18 [bgcolor=#FF0000]
     19        RenderBlock {s} at (0,136) size 784x18
    2020          RenderText {#text} at (0,0) size 221x18
    2121            text run at (0,0) width 221: "This paragraph should be unstyled."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-135-expected.txt

    r91104 r91151  
    55    RenderBody {body} at (8,16) size 784x188
    66      RenderBlock {div} at (0,0) size 784x188
    7         RenderBlock {p} at (0,0) size 784x18 [bgcolor=#00FF00]
     7        RenderBlock {p} at (0,0) size 784x18
    88          RenderText {#text} at (0,0) size 221x18
    99            text run at (0,0) width 221: "This paragraph should be unstyled."
     
    1414          RenderText {#text} at (0,0) size 308x18
    1515            text run at (0,0) width 308: "This paragraph should have a green background."
    16         RenderBlock {r} at (0,102) size 784x18 [bgcolor=#00FF00]
     16        RenderBlock {r} at (0,102) size 784x18
    1717          RenderText {#text} at (0,0) size 221x18
    1818            text run at (0,0) width 221: "This paragraph should be unstyled."
    19         RenderBlock {s} at (0,136) size 784x18 [bgcolor=#00FF00]
     19        RenderBlock {s} at (0,136) size 784x18
    2020          RenderText {#text} at (0,0) size 221x18
    2121            text run at (0,0) width 221: "This paragraph should be unstyled."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-135b-expected.txt

    r91104 r91151  
    55    RenderBody {body} at (8,16) size 784x188
    66      RenderBlock {div} at (0,0) size 784x188
    7         RenderBlock {p} at (0,0) size 784x18 [bgcolor=#FF0000]
     7        RenderBlock {p} at (0,0) size 784x18
    88          RenderText {#text} at (0,0) size 221x18
    99            text run at (0,0) width 221: "This paragraph should be unstyled."
     
    1414          RenderText {#text} at (0,0) size 308x18
    1515            text run at (0,0) width 308: "This paragraph should have a green background."
    16         RenderBlock {r} at (0,102) size 784x18 [bgcolor=#FF0000]
     16        RenderBlock {r} at (0,102) size 784x18
    1717          RenderText {#text} at (0,0) size 221x18
    1818            text run at (0,0) width 221: "This paragraph should be unstyled."
    19         RenderBlock {s} at (0,136) size 784x18 [bgcolor=#FF0000]
     19        RenderBlock {s} at (0,136) size 784x18
    2020          RenderText {#text} at (0,0) size 221x18
    2121            text run at (0,0) width 221: "This paragraph should be unstyled."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-136-expected.txt

    r91104 r91151  
    55    RenderBody {body} at (8,16) size 784x188
    66      RenderBlock {div} at (0,0) size 784x188
    7         RenderBlock {p} at (0,0) size 784x18 [bgcolor=#00FF00]
     7        RenderBlock {p} at (0,0) size 784x18
    88          RenderText {#text} at (0,0) size 221x18
    99            text run at (0,0) width 221: "This paragraph should be unstyled."
     
    1414          RenderText {#text} at (0,0) size 308x18
    1515            text run at (0,0) width 308: "This paragraph should have a green background."
    16         RenderBlock {r} at (0,102) size 784x18 [bgcolor=#00FF00]
     16        RenderBlock {r} at (0,102) size 784x18
    1717          RenderText {#text} at (0,0) size 221x18
    1818            text run at (0,0) width 221: "This paragraph should be unstyled."
    19         RenderBlock {s} at (0,136) size 784x18 [bgcolor=#00FF00]
     19        RenderBlock {s} at (0,136) size 784x18
    2020          RenderText {#text} at (0,0) size 221x18
    2121            text run at (0,0) width 221: "This paragraph should be unstyled."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-136b-expected.txt

    r91104 r91151  
    55    RenderBody {body} at (8,16) size 784x188
    66      RenderBlock {div} at (0,0) size 784x188
    7         RenderBlock {p} at (0,0) size 784x18 [bgcolor=#FF0000]
     7        RenderBlock {p} at (0,0) size 784x18
    88          RenderText {#text} at (0,0) size 221x18
    99            text run at (0,0) width 221: "This paragraph should be unstyled."
     
    1414          RenderText {#text} at (0,0) size 308x18
    1515            text run at (0,0) width 308: "This paragraph should have a green background."
    16         RenderBlock {r} at (0,102) size 784x18 [bgcolor=#FF0000]
     16        RenderBlock {r} at (0,102) size 784x18
    1717          RenderText {#text} at (0,0) size 221x18
    1818            text run at (0,0) width 221: "This paragraph should be unstyled."
    19         RenderBlock {s} at (0,136) size 784x18 [bgcolor=#FF0000]
     19        RenderBlock {s} at (0,136) size 784x18
    2020          RenderText {#text} at (0,0) size 221x18
    2121            text run at (0,0) width 221: "This paragraph should be unstyled."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-173a-expected.txt

    r91104 r91151  
    55    RenderBody {body} at (8,8) size 784x126
    66      RenderBlock {tests} at (0,0) size 784x126 [color=#FF0000]
    7         RenderBlock {testA} at (0,0) size 784x18
     7        RenderBlock {testA} at (0,0) size 784x18 [color=#008000]
    88          RenderText {#text} at (0,0) size 136x18
    99            text run at (0,0) width 136: "This should be green."
    10         RenderBlock {testB} at (0,18) size 784x18
     10        RenderBlock {testB} at (0,18) size 784x18 [color=#008000]
    1111          RenderText {#text} at (0,0) size 136x18
    1212            text run at (0,0) width 136: "This should be green."
    13         RenderBlock {testC} at (0,36) size 784x18
     13        RenderBlock {testC} at (0,36) size 784x18 [color=#008000]
    1414          RenderText {#text} at (0,0) size 136x18
    1515            text run at (0,0) width 136: "This should be green."
    16         RenderBlock {testD} at (0,54) size 784x18
     16        RenderBlock {testD} at (0,54) size 784x18 [color=#008000]
    1717          RenderText {#text} at (0,0) size 136x18
    1818            text run at (0,0) width 136: "This should be green."
    19         RenderBlock {testE} at (0,72) size 784x18
     19        RenderBlock {testE} at (0,72) size 784x18 [color=#008000]
    2020          RenderText {#text} at (0,0) size 136x18
    2121            text run at (0,0) width 136: "This should be green."
    22         RenderBlock {testF} at (0,90) size 784x18
     22        RenderBlock {testF} at (0,90) size 784x18 [color=#008000]
    2323          RenderText {#text} at (0,0) size 136x18
    2424            text run at (0,0) width 136: "This should be green."
    25         RenderBlock {testG} at (0,108) size 784x18
     25        RenderBlock {testG} at (0,108) size 784x18 [color=#008000]
    2626          RenderText {#text} at (0,0) size 136x18
    2727            text run at (0,0) width 136: "This should be green."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-173b-expected.txt

    r91104 r91151  
    55    RenderBody {body} at (8,8) size 784x126
    66      RenderBlock {tests} at (0,0) size 784x126 [color=#FF0000]
    7         RenderBlock {testA} at (0,0) size 784x18
     7        RenderBlock {testA} at (0,0) size 784x18 [color=#008000]
    88          RenderText {#text} at (0,0) size 136x18
    99            text run at (0,0) width 136: "This should be green."
    10         RenderBlock {testB} at (0,18) size 784x18
     10        RenderBlock {testB} at (0,18) size 784x18 [color=#008000]
    1111          RenderText {#text} at (0,0) size 136x18
    1212            text run at (0,0) width 136: "This should be green."
    13         RenderBlock {testC} at (0,36) size 784x18
     13        RenderBlock {testC} at (0,36) size 784x18 [color=#008000]
    1414          RenderText {#text} at (0,0) size 136x18
    1515            text run at (0,0) width 136: "This should be green."
    16         RenderBlock {testD} at (0,54) size 784x18
     16        RenderBlock {testD} at (0,54) size 784x18 [color=#008000]
    1717          RenderText {#text} at (0,0) size 136x18
    1818            text run at (0,0) width 136: "This should be green."
    19         RenderBlock {testE} at (0,72) size 784x18
     19        RenderBlock {testE} at (0,72) size 784x18 [color=#008000]
    2020          RenderText {#text} at (0,0) size 136x18
    2121            text run at (0,0) width 136: "This should be green."
    22         RenderBlock {testF} at (0,90) size 784x18
     22        RenderBlock {testF} at (0,90) size 784x18 [color=#008000]
    2323          RenderText {#text} at (0,0) size 136x18
    2424            text run at (0,0) width 136: "This should be green."
    25         RenderBlock {testG} at (0,108) size 784x18
     25        RenderBlock {testG} at (0,108) size 784x18 [color=#008000]
    2626          RenderText {#text} at (0,0) size 136x18
    2727            text run at (0,0) width 136: "This should be green."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-174a-expected.txt

    r91104 r91151  
    55    RenderBody {body} at (8,8) size 784x36
    66      RenderBlock {tests} at (0,0) size 784x36 [color=#FF0000]
    7         RenderBlock {testA} at (0,0) size 784x18
     7        RenderBlock {testA} at (0,0) size 784x18 [color=#008000]
    88          RenderText {#text} at (0,0) size 136x18
    99            text run at (0,0) width 136: "This should be green."
    10         RenderBlock {testB} at (0,18) size 784x18
     10        RenderBlock {testB} at (0,18) size 784x18 [color=#008000]
    1111          RenderText {#text} at (0,0) size 136x18
    1212            text run at (0,0) width 136: "This should be green."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-174b-expected.txt

    r91104 r91151  
    55    RenderBody {body} at (8,8) size 784x36
    66      RenderBlock {tests} at (0,0) size 784x36 [color=#008000]
    7         RenderBlock {testA} at (0,0) size 784x18 [color=#FF0000]
     7        RenderBlock {testA} at (0,0) size 784x18
    88          RenderText {#text} at (0,0) size 136x18
    99            text run at (0,0) width 136: "This should be green."
    10         RenderBlock {testB} at (0,18) size 784x18 [color=#FF0000]
     10        RenderBlock {testB} at (0,18) size 784x18
    1111          RenderText {#text} at (0,0) size 136x18
    1212            text run at (0,0) width 136: "This should be green."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-104-expected.txt

    r91104 r91151  
    33layer at (0,0) size 800x152
    44  RenderBlock {test} at (0,0) size 800x152
    5     RenderBlock {p} at (0,16) size 800x18 [bgcolor=#FF0000]
     5    RenderBlock {p} at (0,16) size 800x18 [bgcolor=#00FF00]
    66      RenderText {#text} at (0,0) size 304x18
    77        text run at (0,0) width 304: "This paragraph should have a green background"
     
    99      RenderText {#text} at (0,0) size 221x18
    1010        text run at (0,0) width 221: "This paragraph should be unstyled."
    11     RenderBlock {r} at (0,84) size 800x18 [bgcolor=#FF0000]
     11    RenderBlock {r} at (0,84) size 800x18 [bgcolor=#00FF00]
    1212      RenderText {#text} at (0,0) size 304x18
    1313        text run at (0,0) width 304: "This paragraph should have a green background"
    14     RenderBlock {s} at (0,118) size 800x18 [bgcolor=#FF0000]
     14    RenderBlock {s} at (0,118) size 800x18 [bgcolor=#00FF00]
    1515      RenderText {#text} at (0,0) size 304x18
    1616        text run at (0,0) width 304: "This paragraph should have a green background"
  • trunk/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-105-expected.txt

    r91104 r91151  
    33layer at (0,0) size 800x186
    44  RenderBlock {test} at (0,0) size 800x186
    5     RenderBlock {p} at (0,16) size 800x18 [bgcolor=#FF0000]
     5    RenderBlock {p} at (0,16) size 800x18 [bgcolor=#00FF00]
    66      RenderText {#text} at (0,0) size 308x18
    77        text run at (0,0) width 308: "This paragraph should have a green background."
     
    1212      RenderText {#text} at (0,0) size 221x18
    1313        text run at (0,0) width 221: "This paragraph should be unstyled."
    14     RenderBlock {r} at (0,118) size 800x18 [bgcolor=#FF0000]
     14    RenderBlock {r} at (0,118) size 800x18 [bgcolor=#00FF00]
    1515      RenderText {#text} at (0,0) size 308x18
    1616        text run at (0,0) width 308: "This paragraph should have a green background."
    17     RenderBlock {s} at (0,152) size 800x18 [bgcolor=#FF0000]
     17    RenderBlock {s} at (0,152) size 800x18 [bgcolor=#00FF00]
    1818      RenderText {#text} at (0,0) size 308x18
    1919        text run at (0,0) width 308: "This paragraph should have a green background."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-106-expected.txt

    r91104 r91151  
    33layer at (0,0) size 800x186
    44  RenderBlock {test} at (0,0) size 800x186
    5     RenderBlock {p} at (0,16) size 800x18 [bgcolor=#FF0000]
     5    RenderBlock {p} at (0,16) size 800x18 [bgcolor=#00FF00]
    66      RenderText {#text} at (0,0) size 308x18
    77        text run at (0,0) width 308: "This paragraph should have a green background."
     
    1212      RenderText {#text} at (0,0) size 221x18
    1313        text run at (0,0) width 221: "This paragraph should be unstyled."
    14     RenderBlock {r} at (0,118) size 800x18 [bgcolor=#FF0000]
     14    RenderBlock {r} at (0,118) size 800x18 [bgcolor=#00FF00]
    1515      RenderText {#text} at (0,0) size 308x18
    1616        text run at (0,0) width 308: "This paragraph should have a green background."
    17     RenderBlock {s} at (0,152) size 800x18 [bgcolor=#FF0000]
     17    RenderBlock {s} at (0,152) size 800x18 [bgcolor=#00FF00]
    1818      RenderText {#text} at (0,0) size 308x18
    1919        text run at (0,0) width 308: "This paragraph should have a green background."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-107-expected.txt

    r91104 r91151  
    33layer at (0,0) size 800x186
    44  RenderBlock {test} at (0,0) size 800x186
    5     RenderBlock {p} at (0,16) size 800x18 [bgcolor=#FF0000]
     5    RenderBlock {p} at (0,16) size 800x18 [bgcolor=#00FF00]
    66      RenderText {#text} at (0,0) size 304x18
    77        text run at (0,0) width 304: "This paragraph should have a green background"
  • trunk/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-108-expected.txt

    r91104 r91151  
    33layer at (0,0) size 800x186
    44  RenderBlock {test} at (0,0) size 800x186
    5     RenderBlock {p} at (0,16) size 800x18 [bgcolor=#FF0000]
     5    RenderBlock {p} at (0,16) size 800x18 [bgcolor=#00FF00]
    66      RenderText {#text} at (0,0) size 308x18
    77        text run at (0,0) width 308: "This paragraph should have a green background."
     
    99      RenderText {#text} at (0,0) size 221x18
    1010        text run at (0,0) width 221: "This paragraph should be unstyled."
    11     RenderBlock {r} at (0,84) size 800x18 [bgcolor=#FF0000]
     11    RenderBlock {r} at (0,84) size 800x18 [bgcolor=#00FF00]
    1212      RenderText {#text} at (0,0) size 308x18
    1313        text run at (0,0) width 308: "This paragraph should have a green background."
    14     RenderBlock {s} at (0,118) size 800x18 [bgcolor=#FF0000]
     14    RenderBlock {s} at (0,118) size 800x18 [bgcolor=#00FF00]
    1515      RenderText {#text} at (0,0) size 308x18
    1616        text run at (0,0) width 308: "This paragraph should have a green background."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-109-expected.txt

    r91104 r91151  
    33layer at (0,0) size 800x186
    44  RenderBlock {test} at (0,0) size 800x186
    5     RenderBlock {p} at (0,16) size 800x18 [bgcolor=#FF0000]
     5    RenderBlock {p} at (0,16) size 800x18 [bgcolor=#00FF00]
    66      RenderText {#text} at (0,0) size 308x18
    77        text run at (0,0) width 308: "This paragraph should have a green background."
     
    99      RenderText {#text} at (0,0) size 221x18
    1010        text run at (0,0) width 221: "This paragraph should be unstyled."
    11     RenderBlock {r} at (0,84) size 800x18 [bgcolor=#FF0000]
     11    RenderBlock {r} at (0,84) size 800x18 [bgcolor=#00FF00]
    1212      RenderText {#text} at (0,0) size 308x18
    1313        text run at (0,0) width 308: "This paragraph should have a green background."
    14     RenderBlock {s} at (0,118) size 800x18 [bgcolor=#FF0000]
     14    RenderBlock {s} at (0,118) size 800x18 [bgcolor=#00FF00]
    1515      RenderText {#text} at (0,0) size 308x18
    1616        text run at (0,0) width 308: "This paragraph should have a green background."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-110-expected.txt

    r91104 r91151  
    33layer at (0,0) size 800x186
    44  RenderBlock {test} at (0,0) size 800x186
    5     RenderBlock {p} at (0,16) size 800x18 [bgcolor=#FF0000]
     5    RenderBlock {p} at (0,16) size 800x18 [bgcolor=#00FF00]
    66      RenderText {#text} at (0,0) size 308x18
    77        text run at (0,0) width 308: "This paragraph should have a green background."
     
    99      RenderText {#text} at (0,0) size 221x18
    1010        text run at (0,0) width 221: "This paragraph should be unstyled."
    11     RenderBlock {r} at (0,84) size 800x18 [bgcolor=#FF0000]
     11    RenderBlock {r} at (0,84) size 800x18 [bgcolor=#00FF00]
    1212      RenderText {#text} at (0,0) size 308x18
    1313        text run at (0,0) width 308: "This paragraph should have a green background."
    14     RenderBlock {s} at (0,118) size 800x18 [bgcolor=#FF0000]
     14    RenderBlock {s} at (0,118) size 800x18 [bgcolor=#00FF00]
    1515      RenderText {#text} at (0,0) size 308x18
    1616        text run at (0,0) width 308: "This paragraph should have a green background."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-130-expected.txt

    r91104 r91151  
    77        RenderText {#text} at (0,0) size 308x18
    88          text run at (0,0) width 308: "This paragraph should have a green background."
    9       RenderBlock {r} at (0,34) size 800x18 [bgcolor=#00FF00]
     9      RenderBlock {r} at (0,34) size 800x18
    1010        RenderText {#text} at (0,0) size 221x18
    1111          text run at (0,0) width 221: "This paragraph should be unstyled."
    12       RenderBlock {s} at (0,68) size 800x18 [bgcolor=#00FF00]
     12      RenderBlock {s} at (0,68) size 800x18
    1313        RenderText {#text} at (0,0) size 221x18
    1414          text run at (0,0) width 221: "This paragraph should be unstyled."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-130b-expected.txt

    r91104 r91151  
    77        RenderText {#text} at (0,0) size 308x18
    88          text run at (0,0) width 308: "This paragraph should have a green background."
    9       RenderBlock {r} at (0,34) size 800x18 [bgcolor=#FF0000]
     9      RenderBlock {r} at (0,34) size 800x18
    1010        RenderText {#text} at (0,0) size 221x18
    1111          text run at (0,0) width 221: "This paragraph should be unstyled."
    12       RenderBlock {s} at (0,68) size 800x18 [bgcolor=#FF0000]
     12      RenderBlock {s} at (0,68) size 800x18
    1313        RenderText {#text} at (0,0) size 221x18
    1414          text run at (0,0) width 221: "This paragraph should be unstyled."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-131-expected.txt

    r91104 r91151  
    1010        RenderText {#text} at (0,0) size 308x18
    1111          text run at (0,0) width 308: "This paragraph should have a green background."
    12       RenderBlock {r} at (0,68) size 800x18 [bgcolor=#00FF00]
     12      RenderBlock {r} at (0,68) size 800x18
    1313        RenderText {#text} at (0,0) size 221x18
    1414          text run at (0,0) width 221: "This paragraph should be unstyled."
    15       RenderBlock {s} at (0,102) size 800x18 [bgcolor=#00FF00]
     15      RenderBlock {s} at (0,102) size 800x18
    1616        RenderText {#text} at (0,0) size 221x18
    1717          text run at (0,0) width 221: "This paragraph should be unstyled."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-131b-expected.txt

    r91104 r91151  
    1010        RenderText {#text} at (0,0) size 308x18
    1111          text run at (0,0) width 308: "This paragraph should have a green background."
    12       RenderBlock {r} at (0,68) size 800x18 [bgcolor=#FF0000]
     12      RenderBlock {r} at (0,68) size 800x18
    1313        RenderText {#text} at (0,0) size 221x18
    1414          text run at (0,0) width 221: "This paragraph should be unstyled."
    15       RenderBlock {s} at (0,102) size 800x18 [bgcolor=#FF0000]
     15      RenderBlock {s} at (0,102) size 800x18
    1616        RenderText {#text} at (0,0) size 221x18
    1717          text run at (0,0) width 221: "This paragraph should be unstyled."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-132-expected.txt

    r91104 r91151  
    44  RenderBlock {test} at (0,0) size 800x220
    55    RenderBlock {div} at (0,16) size 800x188
    6       RenderBlock {p} at (0,0) size 800x18 [bgcolor=#00FF00]
     6      RenderBlock {p} at (0,0) size 800x18
    77        RenderText {#text} at (0,0) size 217x18
    88          text run at (0,0) width 217: "This paragraph should be unstyled"
     
    1616        RenderText {#text} at (0,0) size 308x18
    1717          text run at (0,0) width 308: "This paragraph should have a green background."
    18       RenderBlock {r} at (0,136) size 800x18 [bgcolor=#00FF00]
     18      RenderBlock {r} at (0,136) size 800x18
    1919        RenderText {#text} at (0,0) size 221x18
    2020          text run at (0,0) width 221: "This paragraph should be unstyled."
    21       RenderBlock {s} at (0,170) size 800x18 [bgcolor=#00FF00]
     21      RenderBlock {s} at (0,170) size 800x18
    2222        RenderText {#text} at (0,0) size 221x18
    2323          text run at (0,0) width 221: "This paragraph should be unstyled."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-132b-expected.txt

    r91104 r91151  
    44  RenderBlock {test} at (0,0) size 800x220
    55    RenderBlock {div} at (0,16) size 800x188
    6       RenderBlock {p} at (0,0) size 800x18 [bgcolor=#FF0000]
     6      RenderBlock {p} at (0,0) size 800x18
    77        RenderText {#text} at (0,0) size 217x18
    88          text run at (0,0) width 217: "This paragraph should be unstyled"
     
    1616        RenderText {#text} at (0,0) size 308x18
    1717          text run at (0,0) width 308: "This paragraph should have a green background."
    18       RenderBlock {r} at (0,136) size 800x18 [bgcolor=#FF0000]
     18      RenderBlock {r} at (0,136) size 800x18
    1919        RenderText {#text} at (0,0) size 221x18
    2020          text run at (0,0) width 221: "This paragraph should be unstyled."
    21       RenderBlock {s} at (0,170) size 800x18 [bgcolor=#FF0000]
     21      RenderBlock {s} at (0,170) size 800x18
    2222        RenderText {#text} at (0,0) size 221x18
    2323          text run at (0,0) width 221: "This paragraph should be unstyled."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-133-expected.txt

    r91104 r91151  
    44  RenderBlock {test} at (0,0) size 800x220
    55    RenderBlock {div} at (0,16) size 800x188
    6       RenderBlock {p} at (0,0) size 800x18 [bgcolor=#00FF00]
     6      RenderBlock {p} at (0,0) size 800x18
    77        RenderText {#text} at (0,0) size 221x18
    88          text run at (0,0) width 221: "This paragraph should be unstyled."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-133b-expected.txt

    r91104 r91151  
    44  RenderBlock {test} at (0,0) size 800x220
    55    RenderBlock {div} at (0,16) size 800x188
    6       RenderBlock {p} at (0,0) size 800x18 [bgcolor=#FF0000]
     6      RenderBlock {p} at (0,0) size 800x18
    77        RenderText {#text} at (0,0) size 221x18
    88          text run at (0,0) width 221: "This paragraph should be unstyled."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-134-expected.txt

    r91104 r91151  
    44  RenderBlock {test} at (0,0) size 800x220
    55    RenderBlock {div} at (0,16) size 800x188
    6       RenderBlock {p} at (0,0) size 800x18 [bgcolor=#00FF00]
     6      RenderBlock {p} at (0,0) size 800x18
    77        RenderText {#text} at (0,0) size 221x18
    88          text run at (0,0) width 221: "This paragraph should be unstyled."
     
    1313        RenderText {#text} at (0,0) size 308x18
    1414          text run at (0,0) width 308: "This paragraph should have a green background."
    15       RenderBlock {r} at (0,102) size 800x18 [bgcolor=#00FF00]
     15      RenderBlock {r} at (0,102) size 800x18
    1616        RenderText {#text} at (0,0) size 221x18
    1717          text run at (0,0) width 221: "This paragraph should be unstyled."
    18       RenderBlock {s} at (0,136) size 800x18 [bgcolor=#00FF00]
     18      RenderBlock {s} at (0,136) size 800x18
    1919        RenderText {#text} at (0,0) size 221x18
    2020          text run at (0,0) width 221: "This paragraph should be unstyled."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-134b-expected.txt

    r91104 r91151  
    44  RenderBlock {test} at (0,0) size 800x220
    55    RenderBlock {div} at (0,16) size 800x188
    6       RenderBlock {p} at (0,0) size 800x18 [bgcolor=#FF0000]
     6      RenderBlock {p} at (0,0) size 800x18
    77        RenderText {#text} at (0,0) size 221x18
    88          text run at (0,0) width 221: "This paragraph should be unstyled."
     
    1313        RenderText {#text} at (0,0) size 308x18
    1414          text run at (0,0) width 308: "This paragraph should have a green background."
    15       RenderBlock {r} at (0,102) size 800x18 [bgcolor=#FF0000]
     15      RenderBlock {r} at (0,102) size 800x18
    1616        RenderText {#text} at (0,0) size 221x18
    1717          text run at (0,0) width 221: "This paragraph should be unstyled."
    18       RenderBlock {s} at (0,136) size 800x18 [bgcolor=#FF0000]
     18      RenderBlock {s} at (0,136) size 800x18
    1919        RenderText {#text} at (0,0) size 221x18
    2020          text run at (0,0) width 221: "This paragraph should be unstyled."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-135-expected.txt

    r91104 r91151  
    44  RenderBlock {test} at (0,0) size 800x220
    55    RenderBlock {div} at (0,16) size 800x188
    6       RenderBlock {p} at (0,0) size 800x18 [bgcolor=#00FF00]
     6      RenderBlock {p} at (0,0) size 800x18
    77        RenderText {#text} at (0,0) size 221x18
    88          text run at (0,0) width 221: "This paragraph should be unstyled."
     
    1313        RenderText {#text} at (0,0) size 308x18
    1414          text run at (0,0) width 308: "This paragraph should have a green background."
    15       RenderBlock {r} at (0,102) size 800x18 [bgcolor=#00FF00]
     15      RenderBlock {r} at (0,102) size 800x18
    1616        RenderText {#text} at (0,0) size 221x18
    1717          text run at (0,0) width 221: "This paragraph should be unstyled."
    18       RenderBlock {s} at (0,136) size 800x18 [bgcolor=#00FF00]
     18      RenderBlock {s} at (0,136) size 800x18
    1919        RenderText {#text} at (0,0) size 221x18
    2020          text run at (0,0) width 221: "This paragraph should be unstyled."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-135b-expected.txt

    r91104 r91151  
    44  RenderBlock {test} at (0,0) size 800x220
    55    RenderBlock {div} at (0,16) size 800x188
    6       RenderBlock {p} at (0,0) size 800x18 [bgcolor=#FF0000]
     6      RenderBlock {p} at (0,0) size 800x18
    77        RenderText {#text} at (0,0) size 221x18
    88          text run at (0,0) width 221: "This paragraph should be unstyled."
     
    1313        RenderText {#text} at (0,0) size 308x18
    1414          text run at (0,0) width 308: "This paragraph should have a green background."
    15       RenderBlock {r} at (0,102) size 800x18 [bgcolor=#FF0000]
     15      RenderBlock {r} at (0,102) size 800x18
    1616        RenderText {#text} at (0,0) size 221x18
    1717          text run at (0,0) width 221: "This paragraph should be unstyled."
    18       RenderBlock {s} at (0,136) size 800x18 [bgcolor=#FF0000]
     18      RenderBlock {s} at (0,136) size 800x18
    1919        RenderText {#text} at (0,0) size 221x18
    2020          text run at (0,0) width 221: "This paragraph should be unstyled."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-136-expected.txt

    r91104 r91151  
    44  RenderBlock {test} at (0,0) size 800x220
    55    RenderBlock {div} at (0,16) size 800x188
    6       RenderBlock {p} at (0,0) size 800x18 [bgcolor=#00FF00]
     6      RenderBlock {p} at (0,0) size 800x18
    77        RenderText {#text} at (0,0) size 221x18
    88          text run at (0,0) width 221: "This paragraph should be unstyled."
     
    1313        RenderText {#text} at (0,0) size 308x18
    1414          text run at (0,0) width 308: "This paragraph should have a green background."
    15       RenderBlock {r} at (0,102) size 800x18 [bgcolor=#00FF00]
     15      RenderBlock {r} at (0,102) size 800x18
    1616        RenderText {#text} at (0,0) size 221x18
    1717          text run at (0,0) width 221: "This paragraph should be unstyled."
    18       RenderBlock {s} at (0,136) size 800x18 [bgcolor=#00FF00]
     18      RenderBlock {s} at (0,136) size 800x18
    1919        RenderText {#text} at (0,0) size 221x18
    2020          text run at (0,0) width 221: "This paragraph should be unstyled."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-136b-expected.txt

    r91104 r91151  
    44  RenderBlock {test} at (0,0) size 800x220
    55    RenderBlock {div} at (0,16) size 800x188
    6       RenderBlock {p} at (0,0) size 800x18 [bgcolor=#FF0000]
     6      RenderBlock {p} at (0,0) size 800x18
    77        RenderText {#text} at (0,0) size 221x18
    88          text run at (0,0) width 221: "This paragraph should be unstyled."
     
    1313        RenderText {#text} at (0,0) size 308x18
    1414          text run at (0,0) width 308: "This paragraph should have a green background."
    15       RenderBlock {r} at (0,102) size 800x18 [bgcolor=#FF0000]
     15      RenderBlock {r} at (0,102) size 800x18
    1616        RenderText {#text} at (0,0) size 221x18
    1717          text run at (0,0) width 221: "This paragraph should be unstyled."
    18       RenderBlock {s} at (0,136) size 800x18 [bgcolor=#FF0000]
     18      RenderBlock {s} at (0,136) size 800x18
    1919        RenderText {#text} at (0,0) size 221x18
    2020          text run at (0,0) width 221: "This paragraph should be unstyled."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-173a-expected.txt

    r91104 r91151  
    44  RenderBlock {test} at (0,0) size 800x126
    55    RenderBlock {tests} at (0,0) size 800x126 [color=#FF0000]
    6       RenderBlock {testA} at (0,0) size 800x18
     6      RenderBlock {testA} at (0,0) size 800x18 [color=#008000]
    77        RenderText {#text} at (0,0) size 136x18
    88          text run at (0,0) width 136: "This should be green."
    9       RenderBlock {testB} at (0,18) size 800x18
     9      RenderBlock {testB} at (0,18) size 800x18 [color=#008000]
    1010        RenderText {#text} at (0,0) size 136x18
    1111          text run at (0,0) width 136: "This should be green."
    12       RenderBlock {testC} at (0,36) size 800x18
     12      RenderBlock {testC} at (0,36) size 800x18 [color=#008000]
    1313        RenderText {#text} at (0,0) size 136x18
    1414          text run at (0,0) width 136: "This should be green."
    15       RenderBlock {testD} at (0,54) size 800x18
     15      RenderBlock {testD} at (0,54) size 800x18 [color=#008000]
    1616        RenderText {#text} at (0,0) size 136x18
    1717          text run at (0,0) width 136: "This should be green."
    18       RenderBlock {testE} at (0,72) size 800x18
     18      RenderBlock {testE} at (0,72) size 800x18 [color=#008000]
    1919        RenderText {#text} at (0,0) size 136x18
    2020          text run at (0,0) width 136: "This should be green."
    21       RenderBlock {testF} at (0,90) size 800x18
     21      RenderBlock {testF} at (0,90) size 800x18 [color=#008000]
    2222        RenderText {#text} at (0,0) size 136x18
    2323          text run at (0,0) width 136: "This should be green."
    24       RenderBlock {testG} at (0,108) size 800x18
     24      RenderBlock {testG} at (0,108) size 800x18 [color=#008000]
    2525        RenderText {#text} at (0,0) size 136x18
    2626          text run at (0,0) width 136: "This should be green."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-173b-expected.txt

    r91104 r91151  
    44  RenderBlock {test} at (0,0) size 800x126
    55    RenderBlock {tests} at (0,0) size 800x126 [color=#FF0000]
    6       RenderBlock {testA} at (0,0) size 800x18
     6      RenderBlock {testA} at (0,0) size 800x18 [color=#008000]
    77        RenderText {#text} at (0,0) size 136x18
    88          text run at (0,0) width 136: "This should be green."
    9       RenderBlock {testB} at (0,18) size 800x18
     9      RenderBlock {testB} at (0,18) size 800x18 [color=#008000]
    1010        RenderText {#text} at (0,0) size 136x18
    1111          text run at (0,0) width 136: "This should be green."
    12       RenderBlock {testC} at (0,36) size 800x18
     12      RenderBlock {testC} at (0,36) size 800x18 [color=#008000]
    1313        RenderText {#text} at (0,0) size 136x18
    1414          text run at (0,0) width 136: "This should be green."
    15       RenderBlock {testD} at (0,54) size 800x18
     15      RenderBlock {testD} at (0,54) size 800x18 [color=#008000]
    1616        RenderText {#text} at (0,0) size 136x18
    1717          text run at (0,0) width 136: "This should be green."
    18       RenderBlock {testE} at (0,72) size 800x18
     18      RenderBlock {testE} at (0,72) size 800x18 [color=#008000]
    1919        RenderText {#text} at (0,0) size 136x18
    2020          text run at (0,0) width 136: "This should be green."
    21       RenderBlock {testF} at (0,90) size 800x18
     21      RenderBlock {testF} at (0,90) size 800x18 [color=#008000]
    2222        RenderText {#text} at (0,0) size 136x18
    2323          text run at (0,0) width 136: "This should be green."
    24       RenderBlock {testG} at (0,108) size 800x18
     24      RenderBlock {testG} at (0,108) size 800x18 [color=#008000]
    2525        RenderText {#text} at (0,0) size 136x18
    2626          text run at (0,0) width 136: "This should be green."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-174a-expected.txt

    r91104 r91151  
    44  RenderBlock {test} at (0,0) size 800x36
    55    RenderBlock {tests} at (0,0) size 800x36 [color=#FF0000]
    6       RenderBlock {testA} at (0,0) size 800x18
     6      RenderBlock {testA} at (0,0) size 800x18 [color=#008000]
    77        RenderText {#text} at (0,0) size 136x18
    88          text run at (0,0) width 136: "This should be green."
    9       RenderBlock {testB} at (0,18) size 800x18
     9      RenderBlock {testB} at (0,18) size 800x18 [color=#008000]
    1010        RenderText {#text} at (0,0) size 136x18
    1111          text run at (0,0) width 136: "This should be green."
  • trunk/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-174b-expected.txt

    r91104 r91151  
    44  RenderBlock {test} at (0,0) size 800x36
    55    RenderBlock {tests} at (0,0) size 800x36 [color=#008000]
    6       RenderBlock {testA} at (0,0) size 800x18 [color=#FF0000]
     6      RenderBlock {testA} at (0,0) size 800x18
    77        RenderText {#text} at (0,0) size 136x18
    88          text run at (0,0) width 136: "This should be green."
    9       RenderBlock {testB} at (0,18) size 800x18 [color=#FF0000]
     9      RenderBlock {testB} at (0,18) size 800x18
    1010        RenderText {#text} at (0,0) size 136x18
    1111          text run at (0,0) width 136: "This should be green."
  • trunk/Source/WebCore/ChangeLog

    r91149 r91151  
     12011-07-16  Sam Weinig  <sam@webkit.org>
     2
     3        Attribute selectors don't handle glob namespaces (e.g. *|E)
     4        https://bugs.webkit.org/show_bug.cgi?id=64567
     5
     6        Reviewed by Anders Carlsson.
     7
     8        Change checking of attribute selectors to match CSS 3 Selectors in
     9        the presence of namespaces. This entails changing the algorithm to
     10        check each attribute on an element as a match for the attribute selector
     11        and taking into account a prefix of *.
     12
     13        * css/CSSStyleSelector.cpp:
     14        (WebCore::attributeQualifiedNameMatches):
     15        Checks if the a particular attributes qualified name matches
     16        the attribute selector, taking into account a prefix of *.
     17
     18        (WebCore::attributeValueMatches):
     19        Checks if a particular attribute on an element, matches
     20        the attribute selector.
     21
     22        (WebCore::anyAttributeMatches):
     23        Top level attribute check. Checks if any of an elements attributes
     24        match the attribute selector.
     25       
     26        (WebCore::CSSStyleSelector::SelectorChecker::checkOneSelector):
     27        Factor out attribute checking code into the above functions.
     28
    1292011-07-16  Jon Honeycutt  <jhoneycutt@apple.com>
    230
  • trunk/Source/WebCore/css/CSSStyleSelector.cpp

    r91049 r91151  
    23922392}
    23932393
     2394static bool attributeQualifiedNameMatches(Attribute* attribute, const QualifiedName& selectorAttr)
     2395{
     2396    if (selectorAttr.localName() != attribute->localName())
     2397        return false;
     2398
     2399    return selectorAttr.prefix() == starAtom || selectorAttr.namespaceURI() == attribute->namespaceURI();
     2400}
     2401
     2402static bool attributeValueMatches(Attribute* attributeItem, CSSSelector::Match match, const AtomicString& selectorValue, bool caseSensitive)
     2403{
     2404    const AtomicString& value = attributeItem->value();
     2405    if (value.isNull())
     2406        return false;
     2407
     2408    switch (match) {
     2409    case CSSSelector::Exact:
     2410        if (caseSensitive ? selectorValue != value : !equalIgnoringCase(selectorValue, value))
     2411            return false;
     2412        break;
     2413    case CSSSelector::List: {
     2414        // Ignore empty selectors or selectors containing spaces
     2415        if (selectorValue.contains(' ') || selectorValue.isEmpty())
     2416            return false;
     2417
     2418        unsigned startSearchAt = 0;
     2419        while (true) {
     2420            size_t foundPos = value.find(selectorValue, startSearchAt, caseSensitive);
     2421            if (foundPos == notFound)
     2422                return false;
     2423            if (!foundPos || value[foundPos - 1] == ' ') {
     2424                unsigned endStr = foundPos + selectorValue.length();
     2425                if (endStr == value.length() || value[endStr] == ' ')
     2426                    break; // We found a match.
     2427            }
     2428           
     2429            // No match. Keep looking.
     2430            startSearchAt = foundPos + 1;
     2431        }
     2432        break;
     2433    }
     2434    case CSSSelector::Contain:
     2435        if (!value.contains(selectorValue, caseSensitive) || selectorValue.isEmpty())
     2436            return false;
     2437        break;
     2438    case CSSSelector::Begin:
     2439        if (!value.startsWith(selectorValue, caseSensitive) || selectorValue.isEmpty())
     2440            return false;
     2441        break;
     2442    case CSSSelector::End:
     2443        if (!value.endsWith(selectorValue, caseSensitive) || selectorValue.isEmpty())
     2444            return false;
     2445        break;
     2446    case CSSSelector::Hyphen:
     2447        if (value.length() < selectorValue.length())
     2448            return false;
     2449        if (!value.startsWith(selectorValue, caseSensitive))
     2450            return false;
     2451        // It they start the same, check for exact match or following '-':
     2452        if (value.length() != selectorValue.length() && value[selectorValue.length()] != '-')
     2453            return false;
     2454        break;
     2455    case CSSSelector::PseudoClass:
     2456    case CSSSelector::PseudoElement:
     2457    default:
     2458        break;
     2459    }
     2460
     2461    return true;
     2462}
     2463
     2464static bool anyAttributeMatches(NamedNodeMap* attributes, CSSSelector::Match match, const QualifiedName& selectorAttr, const AtomicString& selectorValue, bool caseSensitive)
     2465{
     2466    for (size_t i = 0; i < attributes->length(); ++i) {
     2467        Attribute* attributeItem = attributes->attributeItem(i);
     2468
     2469        if (!attributeQualifiedNameMatches(attributeItem, selectorAttr))
     2470            continue;
     2471
     2472        if (attributeValueMatches(attributeItem, match, selectorValue, caseSensitive))
     2473            return true;
     2474    }
     2475
     2476    return false;
     2477}
     2478
    23942479bool CSSStyleSelector::SelectorChecker::checkOneSelector(CSSSelector* sel, Element* e, PseudoId& dynamicPseudo, bool isSubSelector, bool encounteredLink, unsigned forcePseudoClassMask, RenderStyle* elementStyle, RenderStyle* elementParentStyle) const
    23952480{
     
    24072492        if (sel->m_match == CSSSelector::Id)
    24082493            return e->hasID() && e->idForStyleResolution() == sel->value();
    2409        
     2494
    24102495        const QualifiedName& attr = sel->attribute();
    24112496
    24122497        // FIXME: Handle the case were elementStyle is 0.
    2413         if (elementStyle && (!e->isStyledElement() || (!static_cast<StyledElement*>(e)->isMappedAttribute(attr) && attr != typeAttr && attr != readonlyAttr))) {
     2498        if (elementStyle && (!e->isStyledElement() || (!static_cast<StyledElement*>(e)->isMappedAttribute(attr) && attr != typeAttr && attr != readonlyAttr)))
    24142499            elementStyle->setAffectedByAttributeSelectors(); // Special-case the "type" and "readonly" attributes so input form controls can share style.
    2415         }
    2416 
    2417         const AtomicString& value = e->getAttribute(attr);
    2418         if (value.isNull())
    2419             return false; // attribute is not set
     2500
     2501        NamedNodeMap* attributes = e->attributes(true);
     2502        if (!attributes)
     2503            return false;
    24202504
    24212505        bool caseSensitive = !m_documentIsHTML || !htmlAttributeHasCaseInsensitiveValue(attr);
    24222506
    2423         switch (sel->m_match) {
    2424         case CSSSelector::Exact:
    2425             if (caseSensitive ? sel->value() != value : !equalIgnoringCase(sel->value(), value))
    2426                 return false;
    2427             break;
    2428         case CSSSelector::List:
    2429         {
    2430             // Ignore empty selectors or selectors containing spaces
    2431             if (sel->value().contains(' ') || sel->value().isEmpty())
    2432                 return false;
    2433 
    2434             unsigned startSearchAt = 0;
    2435             while (true) {
    2436                 size_t foundPos = value.find(sel->value(), startSearchAt, caseSensitive);
    2437                 if (foundPos == notFound)
    2438                     return false;
    2439                 if (foundPos == 0 || value[foundPos - 1] == ' ') {
    2440                     unsigned endStr = foundPos + sel->value().length();
    2441                     if (endStr == value.length() || value[endStr] == ' ')
    2442                         break; // We found a match.
    2443                 }
    2444                
    2445                 // No match. Keep looking.
    2446                 startSearchAt = foundPos + 1;
    2447             }
    2448             break;
    2449         }
    2450         case CSSSelector::Contain:
    2451             if (!value.contains(sel->value(), caseSensitive) || sel->value().isEmpty())
    2452                 return false;
    2453             break;
    2454         case CSSSelector::Begin:
    2455             if (!value.startsWith(sel->value(), caseSensitive) || sel->value().isEmpty())
    2456                 return false;
    2457             break;
    2458         case CSSSelector::End:
    2459             if (!value.endsWith(sel->value(), caseSensitive) || sel->value().isEmpty())
    2460                 return false;
    2461             break;
    2462         case CSSSelector::Hyphen:
    2463             if (value.length() < sel->value().length())
    2464                 return false;
    2465             if (!value.startsWith(sel->value(), caseSensitive))
    2466                 return false;
    2467             // It they start the same, check for exact match or following '-':
    2468             if (value.length() != sel->value().length() && value[sel->value().length()] != '-')
    2469                 return false;
    2470             break;
    2471         case CSSSelector::PseudoClass:
    2472         case CSSSelector::PseudoElement:
    2473         default:
    2474             break;
    2475         }
     2507        if (!anyAttributeMatches(attributes, static_cast<CSSSelector::Match>(sel->m_match), attr, sel->value(), caseSensitive))
     2508            return false;
    24762509    }
    24772510   
Note: See TracChangeset for help on using the changeset viewer.