Merge WebKit at r75993: Move WebKit/android files to Source

Change-Id: Ifa871f8320bdb3a09fe189fffecc23f702c394b9

1 files changed, 0 insertions, 68 deletions

diff --git a/WebKit/android/jni/WebHistory.h b/WebKit/android/jni/WebHistory.h
deleted file mode 100644
index 2d86aa4..0000000
--- a/WebKit/android/jni/WebHistory.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2006, 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 ANDROID_WEBKIT_WEBHISTORY_H
-#define ANDROID_WEBKIT_WEBHISTORY_H
-
-#include "AndroidWebHistoryBridge.h"
-
-#include <jni.h>
-#include <wtf/RefCounted.h>
-#include <wtf/Vector.h>
-
-namespace android {
-
-class AutoJObject;
-
-class WebHistory {
-public:
-    static jbyteArray Flatten(JNIEnv*, WTF::Vector<char>&, WebCore::HistoryItem*);
-    static void AddItem(const AutoJObject&, WebCore::HistoryItem*);
-    static void RemoveItem(const AutoJObject&, int);
-    static void UpdateHistoryIndex(const AutoJObject&, int);
-};
-
-// there are two scale factors saved with each history item. m_scale reflects the
-// viewport scale factor, default to 100 means 100%. m_textWrapScale records
-// the scale factor for wrapping the text paragraph.
-class WebHistoryItem : public WebCore::AndroidWebHistoryBridge {
-public:
-    WebHistoryItem(WebHistoryItem* parent)
-        : WebCore::AndroidWebHistoryBridge(0)
-        , m_parent(parent)
-        , m_object(NULL) { }
-    WebHistoryItem(JNIEnv*, jobject, WebCore::HistoryItem*);
-    ~WebHistoryItem();
-    void updateHistoryItem(WebCore::HistoryItem* item);
-    void setParent(WebHistoryItem* parent) { m_parent = parent; }
-    WebHistoryItem* parent() const { return m_parent.get(); }
-private:
-    RefPtr<WebHistoryItem> m_parent;
-    jweak m_object;
-};
-
-};
-
-#endif