summaryrefslogtreecommitdiffstats
path: root/WebKit/android
diff options
context:
space:
mode:
authorGrace Kloba <klobag@google.com>2009-12-03 11:39:15 -0800
committerGrace Kloba <klobag@google.com>2009-12-03 11:39:15 -0800
commitd262e1f9241778a6d0483945a3e125636cedfb70 (patch)
treee67b7fb60c554816212a8b782f2e5d193fae123d /WebKit/android
parentab87fa9e3781b4b32b4c1014acd9079ea145e2d6 (diff)
downloadexternal_webkit-d262e1f9241778a6d0483945a3e125636cedfb70.zip
external_webkit-d262e1f9241778a6d0483945a3e125636cedfb70.tar.gz
external_webkit-d262e1f9241778a6d0483945a3e125636cedfb70.tar.bz2
Rework CL, https://android-git.corp.google.com/g/#change,34511
due to the history unfork change.
Diffstat (limited to 'WebKit/android')
-rw-r--r--WebKit/android/jni/WebHistory.cpp9
-rw-r--r--WebKit/android/jni/WebHistory.h1
2 files changed, 0 insertions, 10 deletions
diff --git a/WebKit/android/jni/WebHistory.cpp b/WebKit/android/jni/WebHistory.cpp
index 86eeffe..3741e03 100644
--- a/WebKit/android/jni/WebHistory.cpp
+++ b/WebKit/android/jni/WebHistory.cpp
@@ -242,15 +242,6 @@ WebHistoryItem::~WebHistoryItem() {
}
}
-void WebHistoryItem::detach(WebCore::HistoryItem* item) {
-/* if (mHistoryItem == item) {
- mHistoryItem = NULL;
- } else if (mHistoryItem) {
- LOGE("WebHistoryItem::detach doesn't have a matching HistoryItem");
- }
- */
-}
-
void WebHistoryItem::updateHistoryItem(WebCore::HistoryItem* item) {
// Do not want to update during inflation.
if (!m_active)
diff --git a/WebKit/android/jni/WebHistory.h b/WebKit/android/jni/WebHistory.h
index b756464..baba1fd 100644
--- a/WebKit/android/jni/WebHistory.h
+++ b/WebKit/android/jni/WebHistory.h
@@ -55,7 +55,6 @@ public:
, m_object(NULL) { }
WebHistoryItem(JNIEnv*, jobject, WebCore::HistoryItem*);
~WebHistoryItem();
- void detach(WebCore::HistoryItem* item);
void updateHistoryItem(WebCore::HistoryItem* item);
void setParent(WebHistoryItem* parent) { m_parent = parent; }
WebHistoryItem* parent() const { return m_parent.get(); }