Update the flute jar to accept double colon notation in css selectors, rename
it to version 2, and use it throughout gwt.
Review at http://gwt-code-reviews.appspot.com/1431801
Review by: cromwellian@google.com
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@10145 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/user/build.xml b/user/build.xml
index 4f6286f..bb1d8dd 100755
--- a/user/build.xml
+++ b/user/build.xml
@@ -98,7 +98,7 @@
<pathelement location="${gwt.tools.lib}/jfreechart/jfreechart-1.0.3.jar" />
<pathelement location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar" />
<pathelement location="${gwt.tools.lib}/w3c/sac/sac-1.3.jar" />
- <pathelement location="${gwt.tools.lib}/w3c/flute/flute-1.3-gg1.jar" />
+ <pathelement location="${gwt.tools.lib}/w3c/flute/flute-1.3-gg2.jar" />
<pathelement location="${gwt.tools}/redist/json/r2_20080312/json-1.5.jar" />
<pathelement location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA.jar" />
<!-- The source is included so validation is available from client code -->
@@ -150,7 +150,7 @@
<fileset dir="${javac.out}" />
<zipfileset src="${gwt.tools.lib}/tomcat/servlet-api-2.5.jar" excludes="**/*.java"/>
<zipfileset src="${gwt.tools.lib}/w3c/sac/sac-1.3.jar" />
- <zipfileset src="${gwt.tools.lib}/w3c/flute/flute-1.3-gg1.jar" />
+ <zipfileset src="${gwt.tools.lib}/w3c/flute/flute-1.3-gg2.jar" />
</gwt.jar>
</target>
diff --git a/user/test/com/google/gwt/resources/client/CSSResourceTest.java b/user/test/com/google/gwt/resources/client/CSSResourceTest.java
index 8e69a39..6b7e316 100644
--- a/user/test/com/google/gwt/resources/client/CSSResourceTest.java
+++ b/user/test/com/google/gwt/resources/client/CSSResourceTest.java
@@ -290,6 +290,8 @@
assertTrue(text.contains("with_underscore:_is_better"));
assertTrue(text.contains("ns\\:tag"));
assertTrue(text.contains("ns\\:tag:pseudo"));
+ assertTrue(text.contains("ns\\:tag::double-pseudo"));
+ assertTrue(text.contains("ns\\:tag::-webkit-scrollbar"));
// Check escaped string values
assertTrue(text.contains("\"Hello\\\\\\\" world\""));
diff --git a/user/test/com/google/gwt/resources/client/test.css b/user/test/com/google/gwt/resources/client/test.css
index 148adb8..e766a31 100644
--- a/user/test/com/google/gwt/resources/client/test.css
+++ b/user/test/com/google/gwt/resources/client/test.css
@@ -129,6 +129,14 @@
content : "blah";
}
+ns\:tag::double-pseudo {
+ content : "blah";
+}
+
+ns\:tag::-webkit-scrollbar {
+ content : "blah";
+}
+
/* Test merging / promotion functions*/
.may-merge {
