- Revision
- 151506
- Author
- ser...@webkit.org
- Date
- 2013-06-12 10:01:00 -0700 (Wed, 12 Jun 2013)
Log Message
[css exclusions] fast/css/variables/var-inside-shape.html is failing
https://bugs.webkit.org/show_bug.cgi?id=116059
Reviewed by Alexandru Chiculita.
Some shapes were incorrectly defined, there was a "rectange"
instead of a "rectangle" and also the number of parameters and
their types was wrong. Apart from that, both the CSS exclusions
and CSS variables settings were not enabled at runtime.
Some extra text was also added to the divs in order to verify that
the CSS exclusions are working properly.
* fast/css/variables/var-inside-shape-expected.html:
* fast/css/variables/var-inside-shape.html:
* platform/efl/TestExpectations: Removed var-inside-shape.html.
* platform/gtk/TestExpectations: Ditto.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (151505 => 151506)
--- trunk/LayoutTests/ChangeLog 2013-06-12 16:46:15 UTC (rev 151505)
+++ trunk/LayoutTests/ChangeLog 2013-06-12 17:01:00 UTC (rev 151506)
@@ -1,3 +1,23 @@
+2013-06-12 Sergio Villar Senin <svil...@igalia.com>
+
+ [css exclusions] fast/css/variables/var-inside-shape.html is failing
+ https://bugs.webkit.org/show_bug.cgi?id=116059
+
+ Reviewed by Alexandru Chiculita.
+
+ Some shapes were incorrectly defined, there was a "rectange"
+ instead of a "rectangle" and also the number of parameters and
+ their types was wrong. Apart from that, both the CSS exclusions
+ and CSS variables settings were not enabled at runtime.
+
+ Some extra text was also added to the divs in order to verify that
+ the CSS exclusions are working properly.
+
+ * fast/css/variables/var-inside-shape-expected.html:
+ * fast/css/variables/var-inside-shape.html:
+ * platform/efl/TestExpectations: Removed var-inside-shape.html.
+ * platform/gtk/TestExpectations: Ditto.
+
2013-06-12 Daniel Bates <daba...@apple.com>
window.find() case-insensitive search doesn't match diacritical marks
Modified: trunk/LayoutTests/fast/css/variables/var-inside-shape-expected.html (151505 => 151506)
--- trunk/LayoutTests/fast/css/variables/var-inside-shape-expected.html 2013-06-12 16:46:15 UTC (rev 151505)
+++ trunk/LayoutTests/fast/css/variables/var-inside-shape-expected.html 2013-06-12 17:01:00 UTC (rev 151506)
@@ -1,5 +1,9 @@
<!DOCTYPE html>
<html>
+<script>
+if (window.internals)
+ internals.settings.setCSSExclusionsEnabled(true);
+</script>
<style>
.a {
-webkit-shape-inside: ellipse(100px, 100px, 100px, 100px);
@@ -8,22 +12,23 @@
-webkit-shape-inside: circle(100px, 100px, 100px);
}
.c {
- -webkit-shape-inside: rectange(100px);
+ -webkit-shape-inside: rectangle(100px, 100px, 100px, 100px);
}
.d {
- -webkit-shape-inside: polygon(100px, 100px, 100px, 100px, 100px);
+ height: 100px;
+ -webkit-shape-inside: polygon(10% 100%, 100% 50%, 50% 10%);
}
</style>
<div class="a">
-Some text.
+Some text inside an area inside which inline content can flow.
</div>
<div class="b">
-Some text.
+Some text inside an area inside which inline content can flow.
</div>
<div class="c">
-Some text.
+Some text inside an area inside which inline content can flow.
</div>
<div class="d">
-Some text.
+Some text inside an area inside which inline content can flow.
</div>
</html>
Modified: trunk/LayoutTests/fast/css/variables/var-inside-shape.html (151505 => 151506)
--- trunk/LayoutTests/fast/css/variables/var-inside-shape.html 2013-06-12 16:46:15 UTC (rev 151505)
+++ trunk/LayoutTests/fast/css/variables/var-inside-shape.html 2013-06-12 17:01:00 UTC (rev 151506)
@@ -1,36 +1,42 @@
<!DOCTYPE html>
<html>
<script>
-if (window.internals)
+if (window.internals) {
internals.settings.setCSSVariablesEnabled(true);
+ internals.settings.setCSSExclusionsEnabled(true);
+}
</script>
<style>
:root {
-webkit-var-a: 100px;
+ -webkit-var-b: 100%;
+ -webkit-var-c: 50%;
+ -webkit-var-d: 10%;
}
.a {
-webkit-shape-inside: ellipse(-webkit-var(a), -webkit-var(a), -webkit-var(a), -webkit-var(a));
}
.b {
- -webkit-shape-inside: circle(-webkit-var(a), -webkit-var(a), -webkit-var(a)));
+ -webkit-shape-inside: circle(-webkit-var(a), -webkit-var(a), -webkit-var(a));
}
.c {
- -webkit-shape-inside: rectange(-webkit-var(a));
+ -webkit-shape-inside: rectangle(-webkit-var(a), -webkit-var(a), -webkit-var(a), -webkit-var(a));
}
.d {
- -webkit-shape-inside: polygon(-webkit-var(a), -webkit-var(a), -webkit-var(a), -webkit-var(a));
+ height: -webkit-var(a);
+ -webkit-shape-inside: polygon(-webkit-var(d) -webkit-var(b), -webkit-var(b) -webkit-var(c), -webkit-var(c) -webkit-var(d));
}
</style>
<div class="a">
-Some text.
+Some text inside an area inside which inline content can flow.
</div>
<div class="b">
-Some text.
+Some text inside an area inside which inline content can flow.
</div>
<div class="c">
-Some text.
+Some text inside an area inside which inline content can flow.
</div>
<div class="d">
-Some text.
+Some text inside an area inside which inline content can flow.
</div>
</html>
Modified: trunk/LayoutTests/platform/efl/TestExpectations (151505 => 151506)
--- trunk/LayoutTests/platform/efl/TestExpectations 2013-06-12 16:46:15 UTC (rev 151505)
+++ trunk/LayoutTests/platform/efl/TestExpectations 2013-06-12 17:01:00 UTC (rev 151506)
@@ -1796,9 +1796,6 @@
webkit.org/b/114612 editing/style/block-style-005.html [ Failure ]
-# Regression(r150025).
-webkit.org/b/115919 fast/css/variables/var-inside-shape.html [ ImageOnlyFailure ]
-
# Unidentified failing media tests
webkit.org/b/115419 http/tests/media/reload-after-dialog.html [ Failure ]
webkit.org/b/115419 http/tests/media/remove-while-loading.html [ Failure ]
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (151505 => 151506)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2013-06-12 16:46:15 UTC (rev 151505)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2013-06-12 17:01:00 UTC (rev 151506)
@@ -1389,8 +1389,6 @@
webkit.org/b/115633 accessibility/meter-element.html [ Failure ]
-webkit.org/b/116059 fast/css/variables/var-inside-shape.html [ ImageOnlyFailure ]
-
webkit.org/b/116153 fast/css/text-overflow-ellipsis-full-truncate-rtl.html [ ImageOnlyFailure ]
webkit.org/b/90589 fast/css/user-drag-none.html [ Failure ]
