move input-related fields out of CachedNode to expand

Some of the fields in CachedNode are relevant only to input
fields and text areas. Move these into their own vector
so that we can add more data without making all CacheNodes
bigger.

Remove CacheNode entries that are no longer used, or can
be consolidated into the node type. Alphabetize some interfaces
and implementations. Update the debugging output.

part of http://b/2299660

1 files changed, 78 insertions, 0 deletions

diff --git a/WebKit/android/nav/CachedInput.h b/WebKit/android/nav/CachedInput.h
new file mode 100644
index 0000000..3b00b52
--- /dev/null
+++ b/WebKit/android/nav/CachedInput.h
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2009, The Android Open Source Project
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef CachedInput_H
+#define CachedInput_H
+
+#include "CachedDebug.h"
+#include "PlatformString.h"
+
+namespace android {
+
+class CachedInput {
+public:
+    CachedInput() {
+        // Initiaized to 0 in its array, so nothing to do in the
+        // constructor
+    }
+    void init() {
+        bzero(this, sizeof(CachedInput));
+        mName = WebCore::String();
+    }
+    bool isPassword() const { return mIsPassword; }
+    bool isReadOnly() const { return mIsReadOnly; }
+    bool isRtlText() const { return mIsRtlText; }
+    bool isTextField() const { return mIsTextField; }
+    int maxLength() const { return mMaxLength; };
+    const WebCore::String& name() const { return mName; }
+    void setIsPassword(bool isPassword) { mIsPassword = isPassword; }
+    void setIsReadOnly(bool isReadOnly) { mIsReadOnly = isReadOnly; }
+    void setIsRtlText(bool isRtlText) { mIsRtlText = isRtlText; }
+    void setIsTextField(bool isTextField) { mIsTextField = isTextField; }
+    void setMaxLength(int maxLength) { mMaxLength = maxLength; }
+    void setName(const WebCore::String& name) { mName = name; }
+    void setTextSize(int textSize) { mTextSize = textSize; }
+    int textSize() const { return mTextSize; }
+private:
+    WebCore::String mName;
+    int mMaxLength;
+    int mTextSize;
+    bool mIsPassword : 1;
+    bool mIsReadOnly : 1;
+    bool mIsRtlText : 1;
+    bool mIsTextField : 1;
+#if DUMP_NAV_CACHE
+public:
+    class Debug {
+public:
+        CachedInput* base() const;
+        void print() const;
+    } mDebug;
+#endif
+};
+
+}
+
+#endif