Fix for keeping lists structure

java/org/chromium/distiller/webdocument/DomConverter.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.DomUtil;
 import org.chromium.distiller.DomWalker;
 import org.chromium.distiller.LogUtil;
 import org.chromium.distiller.TableClassifier;
 
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.Node;
 import com.google.gwt.dom.client.Style;
 import com.google.gwt.dom.client.TableElement;
 import com.google.gwt.dom.client.Text;
 import org.chromium.distiller.extractors.embeds.EmbedExtractor;
 import org.chromium.distiller.extractors.embeds.ImageExtractor;
 import org.chromium.distiller.extractors.embeds.TwitterExtractor;
 import org.chromium.distiller.extractors.embeds.VimeoExtractor;
 import org.chromium.distiller.extractors.embeds.YouTubeExtractor;
-
 import java.util.ArrayList;

[wychen, 2015/08/01 01:00:20]

nitpick: why deleting the empty line above?

 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
 /**
  * This DomWalker.Visitor creates a WebDocument from the walked DOM. It skips hidden and other
  * elements that should not be in the created document. Some of these skipped elements (hidden
  * elements and data tables) are available for retrieval after processing.
  */
 public class DomConverter implements DomWalker.Visitor {
@@ skipping 59 matching lines @@
             for (EmbedExtractor extractor : extractors) {
                 WebElement embed = extractor.extract(e);
                 if (embed != null) {
                     builder.embed(embed);
                     return false;
                 }
             }
         }
 
         switch (e.getTagName()) {
+            case "OL":
+            case "UL":
+            case "LI":
+                builder.list(new PlaceHolder(e.getTagName(), PlaceHolder.TagType.START));
+                break;
             case "BR":
                 builder.lineBreak(e);
                 return false;
             // Skip data tables, keep track of them to be extracted by RelevantElementsFinder
             // later.
             case "TABLE":
                 TableClassifier.Type type = TableClassifier.table(TableElement.as(e));
                 logTableInfo(e, type);
                 if (type == TableClassifier.Type.DATA) {
                     builder.dataTable(e);
@@ skipping 22 matching lines @@
             case "LINK":
             case "NOSCRIPT":
                 return false;
         }
         builder.startElement(e);
         return true;
     }
 
     @Override
     public void exit(Node n) {
+        if (n.getNodeType() == Node.ELEMENT_NODE) {
+            Element e = Element.as(n);
+            switch (e.getTagName()) {
+                case "OL":
+                case "UL":
+                case "LI":
+                    builder.list(new PlaceHolder(e.getTagName(), PlaceHolder.TagType.END));
+                    break;
+            }
+        }
         builder.endElement();
     }
 
     private static void logVisibilityInfo(Element e, boolean visible) {
         if (!LogUtil.isLoggable(LogUtil.DEBUG_LEVEL_VISIBILITY_INFO)) return;
         Style style = DomUtil.getComputedStyle(e);
         LogUtil.logToConsole((visible ? "KEEP " : "SKIP ") + e.getTagName() +
                 ": id=" + e.getId() +
                 ", dsp=" + style.getDisplay() +
                 ", vis=" + style.getVisibility() +
                 ", opaq=" + style.getOpacity());
     }
 
     private static void logTableInfo(Element e, TableClassifier.Type type) {
         if (!LogUtil.isLoggable(LogUtil.DEBUG_LEVEL_VISIBILITY_INFO)) return;
         Element parent = e.getParentElement();
         LogUtil.logToConsole("TABLE: " + type +
                 ", id=" + e.getId() +
                 ", class=" + e.getClassName() +
                 ", parent=[" + parent.getTagName() +
                 ", id=" + parent.getId() +
                 ", class=" + parent.getClassName() +
                 "]");
     }
 }