Clean up attributes of image elements

java/org/chromium/distiller/DomUtil.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;
 
 import com.google.gwt.core.client.JsArray;
 import com.google.gwt.core.client.JsArrayString;
 import com.google.gwt.dom.client.AnchorElement;
 import com.google.gwt.dom.client.Document;
@@ skipping 198 matching lines @@
         NodeTree expanded = NodeListExpander.expand(outputNodes);
         Node clonedSubtree = expanded.cloneSubtreeRetainDirection();
 
         if (clonedSubtree.getNodeType() != Node.ELEMENT_NODE) return "";
 
         stripIds(clonedSubtree);
         makeAllLinksAbsolute(clonedSubtree);
         stripFontColorAttributes(clonedSubtree);
         stripTableBackgroundColorAttributes(clonedSubtree);
         stripStyleAttributes(clonedSubtree);
+        stripAlignAttributes(clonedSubtree);
 
         if (textOnly) {
             return DomUtil.getTextFromTree(clonedSubtree);
         }
         return Element.as(clonedSubtree).getString();
     }
 
     /**
      * Makes all anchors and video posters absolute. This calls "makeAllSrcAttributesAbsolute".
      * @param rootNode The root Node to look through.
@@ skipping 24 matching lines @@
     }
 
     private static void makeSrcSetAbsolute(Element root) {
         NodeList<Element> imgs = DomUtil.querySelectorAll(root, "IMG[SRCSET]");
         for (int i = 0; i < imgs.getLength(); i++) {
             makeSrcSetAbsolute(ImageElement.as(imgs.getItem(i)));
         }
     }
 
     public static void makeSrcSetAbsolute(ImageElement ie) {
+        String srcset = ie.getAttribute("srcset");
+        if (srcset == "") return;
+
         String oldsrc = ie.getSrc();
-        String[] sizes = StringUtil.jsSplit(ie.getAttribute("srcset"), ",");
+        String[] sizes = StringUtil.jsSplit(srcset, ",");
         for(int i = 0; i < sizes.length; i++) {
             String size = StringUtil.jsTrim(sizes[i]);
             if (size.isEmpty()) continue;
             String[] comp = size.split(" ");
             ie.setSrc(comp[0]);
             comp[0] = ie.getSrc();
             sizes[i] = StringUtil.join(comp, " ");
         }
         ie.setAttribute("srcset", StringUtil.join(sizes, ", "));
         ie.setSrc(oldsrc);
@@ skipping 56 matching lines @@
     }
 
     /**
      * Strips all "style" attributes from all nodes in the tree rooted at |rootNode|
      */
     public static void stripStyleAttributes(Node rootNode) {
         stripAttributeFromTags(rootNode, "STYLE", new String[]{"*"});
     }
 
     /**
+     * Strips all "align" attributes from image elements in the tree rooted at |rootNode|
+     */
+    public static void stripAlignAttributes(Node rootNode) {
+        stripAttributeFromTags(rootNode, "ALIGN", new String[]{"IMG"});
+    }
+
+    /**
      * Get a list of relevant nodes from a subtree.
      * @param root The root of the subtree.
      * @return A list of relevant nodes.
      */
     public static List<Node> getOutputNodes(Node root) {
         final List<Node> nodes = new ArrayList<>();
         new DomWalker(new DomWalker.Visitor() {
             @Override
             public boolean visit(Node n) {
                 switch (n.getNodeType()) {
@@ skipping 43 matching lines @@
     }-*/;
 
     public static native Document createHTMLDocument(Document doc) /*-{
         return doc.implementation.createHTMLDocument();
     }-*/;
 
     public static native Element getFirstElementChild(Document document) /*-{
         return document.firstElementChild;
     }-*/;
 }