summaryrefslogtreecommitdiffstats
path: root/WebCore
diff options
context:
space:
mode:
authorShimeng (Simon) Wang <swang@google.com>2011-01-11 10:55:22 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-11 10:55:22 -0800
commit6208484f422c0d4c3008eb2f78f2fbd8db5982a1 (patch)
tree5813e320016311eb9c7866a99c48957b74c51a27 /WebCore
parent2652d9bc7b047c80081467b671ba16559a5e3069 (diff)
parentc4683829d0d4932156a97ce14ea15deed71bf21d (diff)
downloadexternal_webkit-6208484f422c0d4c3008eb2f78f2fbd8db5982a1.zip
external_webkit-6208484f422c0d4c3008eb2f78f2fbd8db5982a1.tar.gz
external_webkit-6208484f422c0d4c3008eb2f78f2fbd8db5982a1.tar.bz2
Merge "Use float to preserve scales' accuracy." into honeycomb
Diffstat (limited to 'WebCore')
-rw-r--r--WebCore/history/android/AndroidWebHistoryBridge.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/WebCore/history/android/AndroidWebHistoryBridge.h b/WebCore/history/android/AndroidWebHistoryBridge.h
index b320c4a..a827b4a 100644
--- a/WebCore/history/android/AndroidWebHistoryBridge.h
+++ b/WebCore/history/android/AndroidWebHistoryBridge.h
@@ -42,17 +42,17 @@ public:
virtual ~AndroidWebHistoryBridge() { }
virtual void updateHistoryItem(HistoryItem* item) = 0;
- void setScale(int s) { m_scale = s; }
- void setTextWrapScale(int s) { m_textWrapScale = s; }
- int scale() const { return m_scale; }
- int textWrapScale() const { return m_textWrapScale; }
+ void setScale(float s) { m_scale = s; }
+ void setTextWrapScale(float s) { m_textWrapScale = s; }
+ float scale() const { return m_scale; }
+ float textWrapScale() const { return m_textWrapScale; }
void detachHistoryItem() { m_historyItem = 0; }
HistoryItem* historyItem() const { return m_historyItem; }
void setActive() { m_active = true; }
protected:
- int m_scale;
- int m_textWrapScale;
+ float m_scale;
+ float m_textWrapScale;
bool m_active;
HistoryItem* m_historyItem;
};