[HtmlUnit] SVN: [7898] trunk/htmlunit/src

[<asa...@us...>]

Revision: 7898
          http://sourceforge.net/p/htmlunit/code/7898
Author:   asashour
Date:     2012-12-22 06:13:04 +0000 (Sat, 22 Dec 2012)
Log Message:
-----------
Revert: CSS3, as it seems SACParserCSS3 has issues.

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomNode.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleSheet.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSSelectorTest.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomNode.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomNode.java	2012-12-21 18:55:47 UTC (rev 7897)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/DomNode.java	2012-12-22 06:13:04 UTC (rev 7898)
@@ -59,7 +59,7 @@
 import com.gargoylesoftware.htmlunit.javascript.host.css.CSSStyleSheet;
 import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLElement;
 import com.steadystate.css.parser.CSSOMParser;
-import com.steadystate.css.parser.SACParserCSS3;
+import com.steadystate.css.parser.SACParserCSS21;
 
 /**
  * Base class for nodes in the HTML DOM tree. This class is modeled after the
@@ -1558,7 +1558,7 @@
                     errorOccured.set(true);
                 }
             };
-            final CSSOMParser parser = new CSSOMParser(new SACParserCSS3());
+            final CSSOMParser parser = new CSSOMParser(new SACParserCSS21());
             parser.setErrorHandler(errorHandler);
             final SelectorList selectorList = parser.parseSelectors(new InputSource(new StringReader(selectors)));
             // in case of error parseSelectors returns null

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration.java	2012-12-21 18:55:47 UTC (rev 7897)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleDeclaration.java	2012-12-22 06:13:04 UTC (rev 7898)
@@ -69,7 +69,7 @@
 import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLHtmlElement;
 import com.steadystate.css.dom.CSSValueImpl;
 import com.steadystate.css.parser.CSSOMParser;
-import com.steadystate.css.parser.SACParserCSS3;
+import com.steadystate.css.parser.SACParserCSS21;
 
 /**
  * A JavaScript object for a CSSStyleDeclaration.
@@ -5607,7 +5607,7 @@
             final InputSource source = new InputSource(new StringReader(styleAttribute));
             source.setURI(uri);
             final ErrorHandler errorHandler = getWindow().getWebWindow().getWebClient().getCssErrorHandler();
-            final CSSOMParser parser = new CSSOMParser(new SACParserCSS3());
+            final CSSOMParser parser = new CSSOMParser(new SACParserCSS21());
             parser.setErrorHandler(errorHandler);
             try {
                 styleDeclaration_ = parser.parseStyleDeclaration(source);

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleSheet.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleSheet.java	2012-12-21 18:55:47 UTC (rev 7897)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSStyleSheet.java	2012-12-22 06:13:04 UTC (rev 7898)
@@ -93,7 +93,7 @@
 import com.steadystate.css.dom.CSSStyleRuleImpl;
 import com.steadystate.css.dom.CSSStyleSheetImpl;
 import com.steadystate.css.parser.CSSOMParser;
-import com.steadystate.css.parser.SACParserCSS3;
+import com.steadystate.css.parser.SACParserCSS21;
 import com.steadystate.css.parser.SelectorListImpl;
 import com.steadystate.css.parser.selectors.GeneralAdjacentSelectorImpl;
 import com.steadystate.css.parser.selectors.PrefixAttributeConditionImpl;
@@ -605,7 +605,7 @@
         org.w3c.dom.css.CSSStyleSheet ss;
         try {
             final ErrorHandler errorHandler = getWindow().getWebWindow().getWebClient().getCssErrorHandler();
-            final CSSOMParser parser = new CSSOMParser(new SACParserCSS3());
+            final CSSOMParser parser = new CSSOMParser(new SACParserCSS21());
             parser.setErrorHandler(errorHandler);
             ss = parser.parseStyleSheet(source, null, null);
         }
@@ -632,7 +632,7 @@
         SelectorList selectors;
         try {
             final ErrorHandler errorHandler = getWindow().getWebWindow().getWebClient().getCssErrorHandler();
-            final CSSOMParser parser = new CSSOMParser(new SACParserCSS3());
+            final CSSOMParser parser = new CSSOMParser(new SACParserCSS21());
             parser.setErrorHandler(errorHandler);
             selectors = parser.parseSelectors(source);
             // in case of error parseSelectors returns null

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSSelectorTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSSelectorTest.java	2012-12-21 18:55:47 UTC (rev 7897)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/CSSSelectorTest.java	2012-12-22 06:13:04 UTC (rev 7898)
@@ -19,6 +19,7 @@
 
 import com.gargoylesoftware.htmlunit.BrowserRunner;
 import com.gargoylesoftware.htmlunit.BrowserRunner.Alerts;
+import com.gargoylesoftware.htmlunit.BrowserRunner.NotYetImplemented;
 import com.gargoylesoftware.htmlunit.WebDriverTestCase;
 import com.gargoylesoftware.htmlunit.html.HtmlPageTest;
 
@@ -40,6 +41,7 @@
      */
     @Test
     @Alerts("li2")
+    @NotYetImplemented
     public void nth_child() throws Exception {
         final String html
             = HtmlPageTest.STANDARDS_MODE_PREFIX_ + "<html><head><title>First</title><script>\n"
@@ -88,6 +90,7 @@
      */
     @Test
     @Alerts({ "li1", "li4", "li7", "li10" })
+    @NotYetImplemented
     public void nth_child_equation() throws Exception {
         final String html
             = HtmlPageTest.STANDARDS_MODE_PREFIX_ + "<html><head><title>First</title><script>\n"
@@ -169,6 +172,7 @@
      */
     @Test
     @Alerts({ "1", "thing1" })
+    @NotYetImplemented
     public void prefixAttribute() throws Exception {
         final String html
             = HtmlPageTest.STANDARDS_MODE_PREFIX_ + "<html><head><title>First</title><script>\n"
@@ -195,6 +199,7 @@
      */
     @Test
     @Alerts({ "1", "something" })
+    @NotYetImplemented
     public void suffixAttribute() throws Exception {
         final String html
             = HtmlPageTest.STANDARDS_MODE_PREFIX_ + "<html><head><title>First</title><script>\n"
@@ -221,6 +226,7 @@
      */
     @Test
     @Alerts({ "2", "something", "thing2" })
+    @NotYetImplemented
     public void substringAttribute() throws Exception {
         final String html
             = HtmlPageTest.STANDARDS_MODE_PREFIX_ + "<html><head><title>First</title><script>\n"
@@ -248,6 +254,7 @@
      */
     @Test
     @Alerts({ "1", "ul2" })
+    @NotYetImplemented
     public void generalAdjacentSelector() throws Exception {
         final String html
             = HtmlPageTest.STANDARDS_MODE_PREFIX_ + "<html><head><title>First</title><script>\n"