Fix a nasty scroll bug for Chrome Now-on-tap feature. Also combine the code paths for Android Webvi…

content/public/android/java/src/org/chromium/content_public/browser/AccessibilitySnapshotNode.java

Index: content/public/android/java/src/org/chromium/content_public/browser/AccessibilitySnapshotNode.java
diff --git a/content/public/android/java/src/org/chromium/content_public/browser/AccessibilitySnapshotNode.java b/content/public/android/java/src/org/chromium/content_public/browser/AccessibilitySnapshotNode.java
index 781493467403ed77ac8114b2515fa54f8ce03595..a5c7c4b8f6439ce313ca05a5e360376180cf93bc 100644
--- a/content/public/android/java/src/org/chromium/content_public/browser/AccessibilitySnapshotNode.java
+++ b/content/public/android/java/src/org/chromium/content_public/browser/AccessibilitySnapshotNode.java
@@ -16,8 +16,8 @@ import java.util.ArrayList;
  */
 @SuppressFBWarnings("URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
 public class AccessibilitySnapshotNode {
-
-    public int x, y, scrollX, scrollY, width, height;
+    public int x, y, width, height;
+    public boolean isRootNode;
     public float textSize;
     public String text;
     public String className;
@@ -34,14 +34,7 @@ public class AccessibilitySnapshotNode {
     public ArrayList<AccessibilitySnapshotNode> children =
             new ArrayList<AccessibilitySnapshotNode>();
 
-    public AccessibilitySnapshotNode(int x, int y, int scrollX, int scrollY, int width,
-            int height, String text, String className) {
-        this.x = x;
-        this.y = y;
-        this.scrollX = scrollX;
-        this.scrollY = scrollY;
-        this.width = width;
-        this.height = height;
+    public AccessibilitySnapshotNode(String text, String className) {
         this.text = text;
         this.className = className;
     }
@@ -64,6 +57,14 @@ public class AccessibilitySnapshotNode {
         endSelection = end;
     }
 
+    public void setLocationInfo(int x, int y, int width, int height, boolean isRootNode) {
+        this.x = x;
+        this.y = y;
+        this.width = width;
+        this.height = height;
+        this.isRootNode = isRootNode;
+    }
+
     public void addChild(AccessibilitySnapshotNode node) {
         children.add(node);
     }