summaryrefslogtreecommitdiffstats
path: root/WebCore/history/android/AndroidWebHistoryBridge.h
diff options
context:
space:
mode:
authorGrace Kloba <klobag@google.com>2009-12-09 15:46:59 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-09 15:46:59 -0800
commit66f4cc3567c125acc529d2bc3e5d092ff692ac69 (patch)
tree2711d16a0d693dfe6b596285041a4fd19f01aef7 /WebCore/history/android/AndroidWebHistoryBridge.h
parent3b242d089e9d96995ad22fb2ed76fa1a9533eb64 (diff)
parentc0e0daaba9824f379ec50a976f8b48f0d6ad9317 (diff)
downloadexternal_webkit-66f4cc3567c125acc529d2bc3e5d092ff692ac69.zip
external_webkit-66f4cc3567c125acc529d2bc3e5d092ff692ac69.tar.gz
external_webkit-66f4cc3567c125acc529d2bc3e5d092ff692ac69.tar.bz2
am c0e0daab: Merge change I0b9d36d9 into eclair-mr2
Merge commit 'c0e0daaba9824f379ec50a976f8b48f0d6ad9317' into eclair-mr2-plus-aosp * commit 'c0e0daaba9824f379ec50a976f8b48f0d6ad9317': Modify AndroidWebHistoryBridge to prepare uploading
Diffstat (limited to 'WebCore/history/android/AndroidWebHistoryBridge.h')
-rw-r--r--WebCore/history/android/AndroidWebHistoryBridge.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/history/android/AndroidWebHistoryBridge.h b/WebCore/history/android/AndroidWebHistoryBridge.h
index b15cc86..b401933 100644
--- a/WebCore/history/android/AndroidWebHistoryBridge.h
+++ b/WebCore/history/android/AndroidWebHistoryBridge.h
@@ -34,11 +34,11 @@ class HistoryItem;
class AndroidWebHistoryBridge : public RefCounted<AndroidWebHistoryBridge> {
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;