Title: [128336] trunk/LayoutTests
- Revision
- 128336
- Author
- commit-qu...@webkit.org
- Date
- 2012-09-12 10:32:37 -0700 (Wed, 12 Sep 2012)
Log Message
[CSS Exclusions] Test incremental layout
https://bugs.webkit.org/show_bug.cgi?id=91879
Patch by Bear Travis <betra...@adobe.com> on 2012-09-12
Reviewed by Julien Chaffraix.
Adding tests to make sure that text and shape can be set dynamically, and that
content will still layout while respecting shape-inside.
* fast/exclusions/shape-inside/shape-inside-dynamic-shape-expected.html: Added.
* fast/exclusions/shape-inside/shape-inside-dynamic-shape.html: Added.
* fast/exclusions/shape-inside/shape-inside-dynamic-text-expected.html: Added.
* fast/exclusions/shape-inside/shape-inside-dynamic-text.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (128335 => 128336)
--- trunk/LayoutTests/ChangeLog 2012-09-12 17:25:27 UTC (rev 128335)
+++ trunk/LayoutTests/ChangeLog 2012-09-12 17:32:37 UTC (rev 128336)
@@ -1,3 +1,18 @@
+2012-09-12 Bear Travis <betra...@adobe.com>
+
+ [CSS Exclusions] Test incremental layout
+ https://bugs.webkit.org/show_bug.cgi?id=91879
+
+ Reviewed by Julien Chaffraix.
+
+ Adding tests to make sure that text and shape can be set dynamically, and that
+ content will still layout while respecting shape-inside.
+
+ * fast/exclusions/shape-inside/shape-inside-dynamic-shape-expected.html: Added.
+ * fast/exclusions/shape-inside/shape-inside-dynamic-shape.html: Added.
+ * fast/exclusions/shape-inside/shape-inside-dynamic-text-expected.html: Added.
+ * fast/exclusions/shape-inside/shape-inside-dynamic-text.html: Added.
+
2012-09-12 Max Vujovic <mvujo...@adobe.com>
[CSS Shaders] Remove direct texture access via u_texture
Added: trunk/LayoutTests/fast/exclusions/shape-inside/shape-inside-dynamic-shape-expected.html (0 => 128336)
--- trunk/LayoutTests/fast/exclusions/shape-inside/shape-inside-dynamic-shape-expected.html (rev 0)
+++ trunk/LayoutTests/fast/exclusions/shape-inside/shape-inside-dynamic-shape-expected.html 2012-09-12 17:32:37 UTC (rev 128336)
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style>
+ #shape-inside {
+ padding: 10px;
+ width: 180px;
+ height: 180px;
+ position: relative;
+ }
+ #border {
+ position: absolute;
+ top: 8px;
+ left: 8px;
+ width: 180px;
+ height: 180px;
+ border: 2px solid blue;
+ }
+</style>
+</head>
+<body>
+ <div id="shape-inside">
+ <div id="border"></div>
+ This text should be contained by the blue square.
+ </div>
+ Test that setting a shape through _javascript_ causes layout using the new shape.
+</body>
+</html>
Added: trunk/LayoutTests/fast/exclusions/shape-inside/shape-inside-dynamic-shape.html (0 => 128336)
--- trunk/LayoutTests/fast/exclusions/shape-inside/shape-inside-dynamic-shape.html (rev 0)
+++ trunk/LayoutTests/fast/exclusions/shape-inside/shape-inside-dynamic-shape.html 2012-09-12 17:32:37 UTC (rev 128336)
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script>
+ if (window.internals)
+ window.internals.settings.setCSSExclusionsEnabled(true);
+ window._onload_ = function() {
+ var elem = document.getElementById("shape-inside");
+ elem.setAttribute("style", "-webkit-shape-inside: rectangle(10px, 10px, 180px, 180px);");
+ };
+</script>
+<style>
+ #shape-inside {
+ width: 200px;
+ height: 200px;
+ position: relative;
+ }
+ #border {
+ position: absolute;
+ top: 8px;
+ left: 8px;
+ width: 180px;
+ height: 180px;
+ border: 2px solid blue;
+ }
+</style>
+</head>
+<body>
+ <div id="shape-inside">
+ <div id="border"></div>
+ This text should be contained by the blue square.
+ </div>
+ Test that setting a shape through _javascript_ causes layout using the new shape.
+</body>
+</html>
Added: trunk/LayoutTests/fast/exclusions/shape-inside/shape-inside-dynamic-text-expected.html (0 => 128336)
--- trunk/LayoutTests/fast/exclusions/shape-inside/shape-inside-dynamic-text-expected.html (rev 0)
+++ trunk/LayoutTests/fast/exclusions/shape-inside/shape-inside-dynamic-text-expected.html 2012-09-12 17:32:37 UTC (rev 128336)
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style>
+ #shape-inside {
+ padding: 10px;
+ width: 180px;
+ height: 180px;
+ position: relative;
+ }
+ #border {
+ position: absolute;
+ top: 8px;
+ left: 8px;
+ width: 180px;
+ height: 180px;
+ border: 2px solid blue;
+ }
+</style>
+</head>
+<body>
+ <div id="shape-inside">
+ <div id="border"></div>
+ This text should be contained by the blue square.
+ </div>
+ Test that text set through _javascript_ should layout within the shape inside.
+</body>
+</html>
Added: trunk/LayoutTests/fast/exclusions/shape-inside/shape-inside-dynamic-text.html (0 => 128336)
--- trunk/LayoutTests/fast/exclusions/shape-inside/shape-inside-dynamic-text.html (rev 0)
+++ trunk/LayoutTests/fast/exclusions/shape-inside/shape-inside-dynamic-text.html 2012-09-12 17:32:37 UTC (rev 128336)
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script>
+ if (window.internals)
+ window.internals.settings.setCSSExclusionsEnabled(true);
+ window._onload_ = function() {
+ var node = document.createTextNode("This text should be contained by the blue square.");
+ document.getElementById("shape-inside").appendChild(node);
+ };
+</script>
+<style>
+ #shape-inside {
+ width: 200px;
+ height: 200px;
+ -webkit-shape-inside: rectangle(10px, 10px, 180px, 180px);
+ position: relative;
+ }
+ #border {
+ position: absolute;
+ top: 8px;
+ left: 8px;
+ width: 180px;
+ height: 180px;
+ border: 2px solid blue;
+ }
+</style>
+</head>
+<body>
+ <div id="shape-inside">
+ <div id="border"></div>
+ </div>
+ Test that text set through _javascript_ should layout within the shape inside.
+</body>
+</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
