Bug 136851 – filterRootById accidentally clears inAdjacentChain flag

• Component: CSS
• Status: RESOLVED FIXED

[Yusuke Suzuki]

When SubSelector comes, inAdjacentChain flag is cleared to false.
So for example, `document.querySelector("span#id + ok")` doesn't work correctly.

[Yusuke Suzuki]

Created attachment 238172 [details]
Patch

[Benjamin Poulain]

Comment on attachment 238172 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=238172&action=review

Good catch and good fix.

> Source/WebCore/ChangeLog:11
> +        * dom/SelectorQuery.cpp:
> +        (WebCore::filterRootById):

You could add your copyright to this file, you already fixed a bunch of stuff here.

> LayoutTests/fast/selectors/filter-root-node-with-selector-contains-adjacents.html:35
> +shouldBe('document.querySelectorAll("span#first + t1").length', '1');
> +shouldBe('document.querySelectorAll("span#second ~ t2").length', '1');
> +shouldBe('document.querySelectorAll("span#third + t3 > t4").length', '1');
> +shouldBe('document.querySelectorAll("span#third + t3 > t5").length', '0');
> +shouldBe('document.querySelectorAll("span#fourth t6 ~ t7").length', '3');

Can you please extend those test cases to sub-selectors on the left and on the right to cover all possible cases?

Something like "span#first + t1", ".class#first + t1", ""#first.class + t1",  "span#first.class + t1", etc.

[Yusuke Suzuki]

Comment on attachment 238172 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=238172&action=review

Thank you for your review, Benjamin!

>> Source/WebCore/ChangeLog:11
>> +        (WebCore::filterRootById):
> 
> You could add your copyright to this file, you already fixed a bunch of stuff here.

Thanks! I've added my copyright.

>> LayoutTests/fast/selectors/filter-root-node-with-selector-contains-adjacents.html:35
>> +shouldBe('document.querySelectorAll("span#fourth t6 ~ t7").length', '3');
> 
> Can you please extend those test cases to sub-selectors on the left and on the right to cover all possible cases?
> 
> Something like "span#first + t1", ".class#first + t1", ""#first.class + t1",  "span#first.class + t1", etc.

Yes. I'll expand it by using the code such as
`[ 'span$', '.class$', '$.class', 'span$.class' ].map(function (p) { p.replace('$', '#id'); });`

[Yusuke Suzuki]

Committed r173688: <http://trac.webkit.org/changeset/173688>

[Radar WebKit Bug Importer]

<rdar://problem/19326698>

[Simon Fraser (smfr)]

<rdar://problem/18824663>