Title: [141806] trunk
- Revision
- 141806
- Author
- [email protected]
- Date
- 2013-02-04 13:45:41 -0800 (Mon, 04 Feb 2013)
Log Message
class="cue" is getting some default style
https://bugs.webkit.org/show_bug.cgi?id=108752
Source/WebCore:
Patch by Dima Gorbik <[email protected]> on 2013-02-04
Reviewed by Dean Jackson.
The value variable inside the selector is used to store different information depending on the
type of the selector so we have to check explicitly that the selector we apply filtering to
matches a pseudo element.
Existing tests modified to cover this case.
* css/RuleSet.cpp:
(WebCore::determinePropertyWhitelistType):
LayoutTests:
Patch by Dima Gorbik <[email protected]> on 2013-02-04
Reviewed by Dean Jackson.
* media/track/track-css-property-whitelist-expected.txt:
* media/track/track-css-property-whitelist.html:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (141805 => 141806)
--- trunk/LayoutTests/ChangeLog 2013-02-04 21:37:43 UTC (rev 141805)
+++ trunk/LayoutTests/ChangeLog 2013-02-04 21:45:41 UTC (rev 141806)
@@ -1,3 +1,13 @@
+2013-02-04 Dima Gorbik <[email protected]>
+
+ class="cue" is getting some default style
+ https://bugs.webkit.org/show_bug.cgi?id=108752
+
+ Reviewed by Dean Jackson.
+
+ * media/track/track-css-property-whitelist-expected.txt:
+ * media/track/track-css-property-whitelist.html:
+
2013-02-04 Jessie Berlin <[email protected]>
[WK2] [Mac] Support drag in mouse events for WebKit2 EventSender
Modified: trunk/LayoutTests/media/track/track-css-property-whitelist-expected.txt (141805 => 141806)
--- trunk/LayoutTests/media/track/track-css-property-whitelist-expected.txt 2013-02-04 21:37:43 UTC (rev 141805)
+++ trunk/LayoutTests/media/track/track-css-property-whitelist-expected.txt 2013-02-04 21:45:41 UTC (rev 141806)
@@ -1,3 +1,4 @@
+This should display inline
EVENT(canplaythrough)
EVENT(seeked)
@@ -12,5 +13,8 @@
EXPECTED (getComputedStyle(cueNode).color == 'rgb(255, 0, 0)') OK
EXPECTED (getComputedStyle(cueNode).padding == '0px') OK
EXPECTED (getComputedStyle(cueNode).wordSpacing == '0px') OK
+
+Test that filtering doesn't apply to elements which class equals 'cue' outside WebVTT scope.
+EXPECTED (getComputedStyle(cueNode).display == 'inline') OK
END OF TEST
Modified: trunk/LayoutTests/media/track/track-css-property-whitelist.html (141805 => 141806)
--- trunk/LayoutTests/media/track/track-css-property-whitelist.html 2013-02-04 21:37:43 UTC (rev 141805)
+++ trunk/LayoutTests/media/track/track-css-property-whitelist.html 2013-02-04 21:45:41 UTC (rev 141806)
@@ -10,6 +10,10 @@
<style>
::cue {word-spacing: 100px;}
::cue(c) {padding-left: 10px; color: red;}
+ .cue {
+ display: inline;
+ background-color: green;
+ }
</style>
<script>
@@ -36,6 +40,10 @@
testExpected("getComputedStyle(cueNode).color", "rgb(255, 0, 0)");
testExpected("getComputedStyle(cueNode).padding", "0px");
testExpected("getComputedStyle(cueNode).wordSpacing", "0px");
+
+ consoleWrite("<br>Test that filtering doesn't apply to elements which class equals 'cue' outside WebVTT scope.");
+ cueNode = document.getElementsByClassName("cue")[0];
+ testExpected("getComputedStyle(cueNode).display", "inline");
endTest();
}
@@ -54,5 +62,6 @@
<video controls >
<track src="" kind="captions" default>
</video>
+ <div><div class="cue">This should display inline</div></div>
</body>
</html>
Modified: trunk/Source/WebCore/ChangeLog (141805 => 141806)
--- trunk/Source/WebCore/ChangeLog 2013-02-04 21:37:43 UTC (rev 141805)
+++ trunk/Source/WebCore/ChangeLog 2013-02-04 21:45:41 UTC (rev 141806)
@@ -1,3 +1,19 @@
+2013-02-04 Dima Gorbik <[email protected]>
+
+ class="cue" is getting some default style
+ https://bugs.webkit.org/show_bug.cgi?id=108752
+
+ Reviewed by Dean Jackson.
+
+ The value variable inside the selector is used to store different information depending on the
+ type of the selector so we have to check explicitly that the selector we apply filtering to
+ matches a pseudo element.
+
+ Existing tests modified to cover this case.
+
+ * css/RuleSet.cpp:
+ (WebCore::determinePropertyWhitelistType):
+
2013-02-04 Tom Sepez <[email protected]>
[V8] Binding Integrity crash in V8HTMLEmbedElement::createWrapper
Modified: trunk/Source/WebCore/css/RuleSet.cpp (141805 => 141806)
--- trunk/Source/WebCore/css/RuleSet.cpp 2013-02-04 21:37:43 UTC (rev 141805)
+++ trunk/Source/WebCore/css/RuleSet.cpp 2013-02-04 21:45:41 UTC (rev 141806)
@@ -122,7 +122,7 @@
return PropertyWhitelistRegion;
#if ENABLE(VIDEO_TRACK)
for (const CSSSelector* component = selector; component; component = component->tagHistory()) {
- if (component->pseudoType() == CSSSelector::PseudoCue || (component->m_match != CSSSelector::Tag && component->value() == TextTrackCue::cueShadowPseudoId()))
+ if (component->pseudoType() == CSSSelector::PseudoCue || (component->m_match == CSSSelector::PseudoElement && component->value() == TextTrackCue::cueShadowPseudoId()))
return PropertyWhitelistCue;
}
#else
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
