commit bc298fb18dd81d0236899ce095ad5a293365ad38
author rchandia@google.com <rchandia@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Mon Oct 29 19:22:40 2012 +0000
committer rchandia@google.com <rchandia@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Mon Oct 29 19:22:40 2012 +0000
tree 8d3e68e57f555db65be96ed3a6e07460f56ac0f9
parent 822a8bb657159de4ce26ea4044994b36736dd4e0

Thanks minichate!
GWT CSS parser was dropping media types.

Fixes issue: 4911

Review at http://gwt-code-reviews.appspot.com/1863803


git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@11366 8db76d5a-ed1c-0410-87a9-c151d255dfc7

user/src/com/google/gwt/resources/css/CssGenerationVisitor.java

diff --git a/user/src/com/google/gwt/resources/css/CssGenerationVisitor.java b/user/src/com/google/gwt/resources/css/CssGenerationVisitor.java
index da35a2d..32f40a9 100644
--- a/user/src/com/google/gwt/resources/css/CssGenerationVisitor.java
+++ b/user/src/com/google/gwt/resources/css/CssGenerationVisitor.java
@@ -185,7 +185,7 @@
 
   @Override
   public boolean visit(CssMediaRule x, Context ctx) {
-    out.print("@MEDIA");
+    out.print("@media");
     for (String m : x.getMedias()) {
       out.print(" " + m);
     }

user/src/com/google/gwt/resources/css/ast/CssNodeCloner.java

diff --git a/user/src/com/google/gwt/resources/css/ast/CssNodeCloner.java b/user/src/com/google/gwt/resources/css/ast/CssNodeCloner.java
index bffbd36..1620fe7 100644
--- a/user/src/com/google/gwt/resources/css/ast/CssNodeCloner.java
+++ b/user/src/com/google/gwt/resources/css/ast/CssNodeCloner.java
@@ -180,7 +180,7 @@
   @Override
   public boolean visit(CssMediaRule x, Context ctx) {
     CssMediaRule newRule = new CssMediaRule();
-    newRule.getMedias().addAll(newRule.getMedias());
+    newRule.getMedias().addAll(x.getMedias());
 
     pushNodes(newRule);
     return true;

user/test/com/google/gwt/resources/css/CssNodeClonerTest.java

diff --git a/user/test/com/google/gwt/resources/css/CssNodeClonerTest.java b/user/test/com/google/gwt/resources/css/CssNodeClonerTest.java
index 7467a60..1323e78 100644
--- a/user/test/com/google/gwt/resources/css/CssNodeClonerTest.java
+++ b/user/test/com/google/gwt/resources/css/CssNodeClonerTest.java
@@ -56,6 +56,16 @@
     }
   }
 
+  public void testCloneMedia() throws UnableToCompleteException {
+    CssStylesheet sheet = GenerateCssAst.exec(TreeLogger.NULL,
+        getClass().getClassLoader().getResource(
+            "com/google/gwt/resources/css/media.css"));
+
+    CssStylesheet cloned = CssNodeCloner.clone(CssStylesheet.class, sheet);
+
+    assertEquals("@media print {\n}\n", cloned.toString());
+  }
+
   public void testCloneProperty() {
     CssProperty.IdentValue value = new CssProperty.IdentValue("value");
     CssProperty p = new CssProperty("name", value, true);

user/test/com/google/gwt/resources/css/media.css

diff --git a/user/test/com/google/gwt/resources/css/media.css b/user/test/com/google/gwt/resources/css/media.css
new file mode 100644
index 0000000..05d1694
--- /dev/null
+++ b/user/test/com/google/gwt/resources/css/media.css
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2010 Google Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+@media print {}