diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-12-08 09:45:22 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-12-08 09:45:22 -0800 |
| commit | c0e0daaba9824f379ec50a976f8b48f0d6ad9317 (patch) | |
| tree | 2711d16a0d693dfe6b596285041a4fd19f01aef7 /WebKit/android/jni/WebHistory.cpp | |
| parent | 91a3bec8a1f1a64c6e1ca755766988b4fd6bf41a (diff) | |
| parent | 0b9d36d96db8c9f0462409ac20b6c25a31dcb4bb (diff) | |
| download | external_webkit-c0e0daaba9824f379ec50a976f8b48f0d6ad9317.zip external_webkit-c0e0daaba9824f379ec50a976f8b48f0d6ad9317.tar.gz external_webkit-c0e0daaba9824f379ec50a976f8b48f0d6ad9317.tar.bz2 | |
Merge change I0b9d36d9 into eclair-mr2
* changes:
Modify AndroidWebHistoryBridge to prepare uploading detachHistoryItem() to WebKit.
Diffstat (limited to 'WebKit/android/jni/WebHistory.cpp')
| -rw-r--r-- | WebKit/android/jni/WebHistory.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/WebKit/android/jni/WebHistory.cpp b/WebKit/android/jni/WebHistory.cpp index 3741e03..71cd416 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) { + 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() { |