diff options
| author | Steve Block <steveblock@google.com> | 2009-12-17 09:55:06 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-17 09:55:06 -0800 |
| commit | b880d713c04257ca40abfef97c300afdead423b8 (patch) | |
| tree | 6982576c228bcd1a7efe98afed544d840751094c /WebCore/history/android/AndroidWebHistoryBridge.h | |
| parent | e2e7a5c57b53f01e63a0245b4420d54b454cb373 (diff) | |
| parent | 643ca7872b450ea4efacab6188849e5aac2ba161 (diff) | |
| download | external_webkit-b880d713c04257ca40abfef97c300afdead423b8.zip external_webkit-b880d713c04257ca40abfef97c300afdead423b8.tar.gz external_webkit-b880d713c04257ca40abfef97c300afdead423b8.tar.bz2 | |
am 643ca787: Merge webkit.org at r51976 : Initial merge by git.
Merge commit '643ca7872b450ea4efacab6188849e5aac2ba161' into eclair-mr2-plus-aosp
* commit '643ca7872b450ea4efacab6188849e5aac2ba161':
Merge webkit.org at r51976 : Initial merge by git.
Diffstat (limited to 'WebCore/history/android/AndroidWebHistoryBridge.h')
| -rw-r--r-- | WebCore/history/android/AndroidWebHistoryBridge.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/WebCore/history/android/AndroidWebHistoryBridge.h b/WebCore/history/android/AndroidWebHistoryBridge.h index b401933..c6d5147 100644 --- a/WebCore/history/android/AndroidWebHistoryBridge.h +++ b/WebCore/history/android/AndroidWebHistoryBridge.h @@ -34,11 +34,19 @@ class HistoryItem; class AndroidWebHistoryBridge : public RefCounted<AndroidWebHistoryBridge> { public: +<<<<<<< HEAD:WebCore/history/android/AndroidWebHistoryBridge.h AndroidWebHistoryBridge(HistoryItem* item) +======= + AndroidWebHistoryBridge() +>>>>>>> webkit.org at r51976:WebCore/history/android/AndroidWebHistoryBridge.h : m_scale(100) , m_screenWidthScale(100) , m_active(false) +<<<<<<< HEAD:WebCore/history/android/AndroidWebHistoryBridge.h , m_historyItem(item) { } +======= + , m_historyItem(0) { } +>>>>>>> webkit.org at r51976:WebCore/history/android/AndroidWebHistoryBridge.h virtual ~AndroidWebHistoryBridge() { } virtual void updateHistoryItem(HistoryItem* item) = 0; @@ -46,7 +54,10 @@ public: void setScreenWidthScale(int s) { m_screenWidthScale = s; } int scale() const { return m_scale; } int screenWidthScale() const { return m_screenWidthScale; } +<<<<<<< HEAD:WebCore/history/android/AndroidWebHistoryBridge.h void detachHistoryItem() { m_historyItem = 0; } +======= +>>>>>>> webkit.org at r51976:WebCore/history/android/AndroidWebHistoryBridge.h HistoryItem* historyItem() const { return m_historyItem; } void setActive() { m_active = true; } |