diff options
| author | Grace Kloba <klobag@google.com> | 2009-12-03 16:34:42 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-03 16:34:42 -0800 |
| commit | 90fe16cecd2e606eaa6cf5a72fe3336e6ca69b12 (patch) | |
| tree | e67b7fb60c554816212a8b782f2e5d193fae123d /WebKit/android | |
| parent | 69bf013f4ecf5f43a1a40cf908623708c5f43e21 (diff) | |
| parent | d262e1f9241778a6d0483945a3e125636cedfb70 (diff) | |
| download | external_webkit-90fe16cecd2e606eaa6cf5a72fe3336e6ca69b12.zip external_webkit-90fe16cecd2e606eaa6cf5a72fe3336e6ca69b12.tar.gz external_webkit-90fe16cecd2e606eaa6cf5a72fe3336e6ca69b12.tar.bz2 | |
am d262e1f9: Rework CL, https://android-git.corp.google.com/g/#change,34511 due to the history unfork change.
Merge commit 'd262e1f9241778a6d0483945a3e125636cedfb70' into eclair-mr2-plus-aosp
* commit 'd262e1f9241778a6d0483945a3e125636cedfb70':
Rework CL, https://android-git.corp.google.com/g/#change,34511
Diffstat (limited to 'WebKit/android')
| -rw-r--r-- | WebKit/android/jni/WebHistory.cpp | 9 | ||||
| -rw-r--r-- | WebKit/android/jni/WebHistory.h | 1 |
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(); } |