diff options
| author | Grace Kloba <klobag@google.com> | 2009-12-10 14:34:32 -0800 |
|---|---|---|
| committer | Grace Kloba <klobag@google.com> | 2009-12-10 14:34:32 -0800 |
| commit | 1d106ce5c6648f4c1f7a6f3f63aa7de4f4aed6d6 (patch) | |
| tree | 8ace5a731446bfafedd9fc37a578d39c3619a8b1 /WebKit/android/jni/WebHistory.cpp | |
| parent | 1f39d2d9fa8ad17be2edeb570a625ed331f5a8f1 (diff) | |
| parent | 66f4cc3567c125acc529d2bc3e5d092ff692ac69 (diff) | |
| download | external_webkit-1d106ce5c6648f4c1f7a6f3f63aa7de4f4aed6d6.zip external_webkit-1d106ce5c6648f4c1f7a6f3f63aa7de4f4aed6d6.tar.gz external_webkit-1d106ce5c6648f4c1f7a6f3f63aa7de4f4aed6d6.tar.bz2 | |
resolved conflicts for merge of 66f4cc35 to master
Diffstat (limited to 'WebKit/android/jni/WebHistory.cpp')
| -rw-r--r-- | WebKit/android/jni/WebHistory.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/WebKit/android/jni/WebHistory.cpp b/WebKit/android/jni/WebHistory.cpp index 6d4db64..2219703 100644 --- a/WebKit/android/jni/WebHistory.cpp +++ b/WebKit/android/jni/WebHistory.cpp @@ -225,12 +225,9 @@ jbyteArray WebHistory::Flatten(JNIEnv* env, WTF::Vector<char>& v, WebCore::Histo } WebHistoryItem::WebHistoryItem(JNIEnv* env, jobject obj, - WebCore::HistoryItem* item) { - m_object = env->NewWeakGlobalRef(obj); + WebCore::HistoryItem* item) : WebCore::AndroidWebHistoryBridge(item) { + m_object = adoptGlobalRef(env, obj); m_parent = 0; - m_scale = 100; - m_active = false; - m_historyItem = item; } WebHistoryItem::~WebHistoryItem() { |