From 0b9d36d96db8c9f0462409ac20b6c25a31dcb4bb Mon Sep 17 00:00:00 2001 From: Grace Kloba Date: Mon, 7 Dec 2009 14:27:17 -0800 Subject: [PATCH] Modify AndroidWebHistoryBridge to prepare uploading detachHistoryItem() to WebKit. I think it is easy to read this way that the constructor sets the m_historyItem and the new method will detach it. --- WebCore/history/android/AndroidWebHistoryBridge.h | 4 ++-- WebKit/android/jni/WebHistory.cpp | 5 +---- WebKit/android/jni/WebHistory.h | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/WebCore/history/android/AndroidWebHistoryBridge.h b/WebCore/history/android/AndroidWebHistoryBridge.h index b15cc86b2..b40193355 100644 --- a/WebCore/history/android/AndroidWebHistoryBridge.h +++ b/WebCore/history/android/AndroidWebHistoryBridge.h @@ -34,11 +34,11 @@ class HistoryItem; class AndroidWebHistoryBridge : public RefCounted { public: - AndroidWebHistoryBridge() + AndroidWebHistoryBridge(HistoryItem* item) : m_scale(100) , m_screenWidthScale(100) , m_active(false) - , m_historyItem(0) { } + , m_historyItem(item) { } virtual ~AndroidWebHistoryBridge() { } virtual void updateHistoryItem(HistoryItem* item) = 0; diff --git a/WebKit/android/jni/WebHistory.cpp b/WebKit/android/jni/WebHistory.cpp index 3741e03bf..71cd416bc 100644 --- a/WebKit/android/jni/WebHistory.cpp +++ b/WebKit/android/jni/WebHistory.cpp @@ -225,12 +225,9 @@ jbyteArray WebHistory::Flatten(JNIEnv* env, WTF::Vector& 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() { diff --git a/WebKit/android/jni/WebHistory.h b/WebKit/android/jni/WebHistory.h index baba1fd97..b9618727d 100644 --- a/WebKit/android/jni/WebHistory.h +++ b/WebKit/android/jni/WebHistory.h @@ -50,7 +50,7 @@ public: class WebHistoryItem : public WebCore::AndroidWebHistoryBridge { public: WebHistoryItem(WebHistoryItem* parent) - : WebCore::AndroidWebHistoryBridge() + : WebCore::AndroidWebHistoryBridge(0) , m_parent(parent) , m_object(NULL) { } WebHistoryItem(JNIEnv*, jobject, WebCore::HistoryItem*); -- 2.11.0