Fix more partially hidden articles

javatests/org/chromium/distiller/webdocument/DomConverterTest.java

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.distiller.webdocument;
 
 import org.chromium.distiller.DomDistillerJsTestCase;
 import org.chromium.distiller.DomWalker;
 
 import com.google.gwt.dom.client.Document;
 import com.google.gwt.dom.client.Element;
 
 import java.util.List;
 
 public class DomConverterTest extends DomDistillerJsTestCase {
     private void runTest(String innerHtml, String expectedHtml) throws Throwable {
+        runTest(innerHtml, expectedHtml, false);
+    }
+
+    private void runTest(String innerHtml, String expectedHtml, boolean mobileArticle)
+            throws Throwable {
         Element container = Document.get().createDivElement();
         mBody.appendChild(container);
         container.setInnerHTML(innerHtml);
         FakeWebDocumentBuilder builder = new FakeWebDocumentBuilder();
         DomConverter filteringDomVisitor = new DomConverter(builder);
+        filteringDomVisitor.setHasArticleElement(mobileArticle);
+        filteringDomVisitor.setIsMobileFriendly(mobileArticle);
         new DomWalker(filteringDomVisitor).walk(container);
         String expectedDocument = "<div>" + expectedHtml + "</div>";
         assertEquals(expectedDocument, builder.getDocumentString().toLowerCase());
     }
 
     public void testVisibleText() throws Throwable {
         String html = "visible text";
         runTest(html, html);
     }
 
@@ skipping 12 matching lines @@
 
     public void testInvisibleInVisible() throws Throwable {
         String html = "<div>visible parent" +
                           "<div style=\"display:none\">invisible child</div>" +
                       "</div>";
         runTest(html, "<div>visible parent</div>");
     }
 
     public void testVisibleInInvisible() throws Throwable {
         String html = "<div style=\"visibility:hidden\">invisible parent" +
-                          "<div>visible child</div>" +
-                      "</div>";
+                "<div>visible child</div>" +
+                "</div>";
         runTest(html, "");
     }
 
+    public void testVisibleInInvisible2() throws Throwable {
+        String html = "<div style=\"display:none\">invisible parent" +
+                "<div>visible child</div>" +
+                "</div>";
+        runTest(html, "");
+    }
+
     public void testVisibleInVisible() throws Throwable {
         String html = "<div>visible parent" +
                           "<div>visible child</div>" +
                       "</div>";
         runTest(html, html);
     }
 
     public void testInvisibleInInvisible() throws Throwable {
         String html = "<div style=\"visibility:hidden\">invisible parent" +
                           "<div style=\"display:none\">invisible child</div>" +
@@ skipping 16 matching lines @@
         String html = "<div style=\"visibility:hidden\">invisible parent" +
                           "<div style=\"display:none\">invisible child0</div>" +
                           "<div>visible child1" +
                               "<div style=\"display:none\">invisible grandchild</div>" +
                           "</div>" +
                           "<div style=\"visibility:hidden\">invisible child2</div>" +
                       "</div>";
         runTest(html, "");
     }
 
+    public void testKeepHidden() throws Throwable {
+        String html = "<div class=\"hidden\" style=\"display: none\">visible element</div>";
+        runTest(html, html, true);
+    }
+
+    public void testKeepHiddenNested() throws Throwable {
+        // "visibility: hidden" is used. See crbug.com/599121
+        String html = "<div class=\"hidden\" style=\"visibility: hidden\">" +
+                "<div>visible element</div></div>";
+        runTest(html, html, true);
+    }
+
+    public void testKeepContinue() throws Throwable {
+        String html = "<div class=\"continue\" style=\"display: none\">visible element</div>";
+        runTest(html, html, true);
+    }
+
+    public void testKeepContinueNested() throws Throwable {
+        // "display: none" is used. See crbug.com/687071
+        String html = "<div class=\"continue\" style=\"display: none\">" +
+                "<div>visible element</div></div>";
+        runTest(html, html, true);
+    }
+
     public void testDataTable() throws Throwable {
         String html = "<table align=\"left\" role=\"grid\">" + // role=grid make this a data table.
                           "<tbody align=\"left\">" +
                               "<tr>" +
                                   "<td>row1col1</td>" +
                                   "<td>row1col2</td>" +
                               "</tr>" +
                           "</tbody>" +
                       "</table>";
         runTest(html, "<datatable/>");
@@ skipping 82 matching lines @@
 
         assertTrue(elements.get(5) instanceof WebText);
 
         assertTrue(elements.get(6) instanceof WebTag);
         assertFalse(((WebTag) elements.get(6)).isStartTag());
 
         assertTrue(elements.get(7) instanceof WebTag);
         assertFalse(((WebTag) elements.get(7)).isStartTag());
     }
 }