summaryrefslogtreecommitdiffstats
path: root/WebCore
diff options
context:
space:
mode:
authorShimeng (Simon) Wang <swang@google.com>2010-03-05 15:17:45 -0800
committerShimeng (Simon) Wang <swang@google.com>2010-03-05 17:17:54 -0800
commit61e86687816f581053a96dc2686208fe3616ae40 (patch)
tree4d3f74b474aed4fd7ce10ec1514aaba0836f7d43 /WebCore
parent0d72f882dbb757a8398e371417dd96714d0dc7f7 (diff)
downloadexternal_webkit-61e86687816f581053a96dc2686208fe3616ae40.zip
external_webkit-61e86687816f581053a96dc2686208fe3616ae40.tar.gz
external_webkit-61e86687816f581053a96dc2686208fe3616ae40.tar.bz2
Serialize/unserialize screen width scale, which is used when restoring sites.
Also change the scales' default value to 0, so in WebViewCore.java, in case the scales are not set inside webkit, the default logic can be used. This helps in case a mobile site is loaded but no scales is saved, and when restored, the mobile site will have wrong restored scales because default values are not 0.
Diffstat (limited to 'WebCore')
-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 b401933..893d137 100644
--- a/WebCore/history/android/AndroidWebHistoryBridge.h
+++ b/WebCore/history/android/AndroidWebHistoryBridge.h
@@ -35,8 +35,8 @@ class HistoryItem;
class AndroidWebHistoryBridge : public RefCounted<AndroidWebHistoryBridge> {
public:
AndroidWebHistoryBridge(HistoryItem* item)
- : m_scale(100)
- , m_screenWidthScale(100)
+ : m_scale(0)
+ , m_screenWidthScale(0)
, m_active(false)
, m_historyItem(item) { }
virtual ~AndroidWebHistoryBridge() { }