diff options
| author | Steve Block <steveblock@google.com> | 2011-06-07 16:28:27 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-07 16:39:23 +0100 |
| commit | cbb4d7cda345c2678aa649cc57bffce8ca84949a (patch) | |
| tree | 2ce088f21ca9f4f3accd6c66ba90df7eee4920c2 /Source/WebCore/page/Settings.cpp | |
| parent | dfadaafc15c16563aba837f05c778eaa2a433a8b (diff) | |
| download | external_webkit-cbb4d7cda345c2678aa649cc57bffce8ca84949a.zip external_webkit-cbb4d7cda345c2678aa649cc57bffce8ca84949a.tar.gz external_webkit-cbb4d7cda345c2678aa649cc57bffce8ca84949a.tar.bz2 | |
Move all Android modification to Settings to the end of the relevant block
This will ease future merges
Change-Id: I7203cfb0cdc52140802a11cd35c64a9cfd502d30
Diffstat (limited to 'Source/WebCore/page/Settings.cpp')
| -rw-r--r-- | Source/WebCore/page/Settings.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Source/WebCore/page/Settings.cpp b/Source/WebCore/page/Settings.cpp index 1db8a92..f0b489a 100644 --- a/Source/WebCore/page/Settings.cpp +++ b/Source/WebCore/page/Settings.cpp @@ -88,30 +88,21 @@ static EditingBehaviorType editingBehaviorTypeForPlatform() Settings::Settings(Page* page) : m_page(page) -#ifdef ANDROID_LAYOUT - , m_layoutAlgorithm(kLayoutFitColumnToScreen) -#endif , m_editableLinkBehavior(EditableLinkDefaultBehavior) , m_textDirectionSubmenuInclusionBehavior(TextDirectionSubmenuAutomaticallyIncluded) , m_minimumFontSize(0) , m_minimumLogicalFontSize(0) , m_defaultFontSize(0) , m_defaultFixedFontSize(0) -#ifdef ANDROID_LAYOUT - , m_useWideViewport(false) -#endif -#ifdef ANDROID_MULTIPLE_WINDOWS - , m_supportMultipleWindows(true) -#endif -#ifdef ANDROID_BLOCK_NETWORK_IMAGE - , m_blockNetworkImage(false) -#endif , m_maximumDecodedImageSize(numeric_limits<size_t>::max()) #if ENABLE(DOM_STORAGE) , m_sessionStorageQuota(StorageMap::noQuota) #endif , m_pluginAllowedRunTime(numeric_limits<unsigned>::max()) , m_editingBehaviorType(editingBehaviorTypeForPlatform()) +#ifdef ANDROID_LAYOUT + , m_layoutAlgorithm(kLayoutFitColumnToScreen) +#endif , m_isSpatialNavigationEnabled(false) , m_isJavaEnabled(false) , m_loadsImagesAutomatically(false) @@ -186,6 +177,15 @@ Settings::Settings(Page* page) , m_usePreHTML5ParserQuirks(false) , m_hyperlinkAuditingEnabled(false) , m_crossOriginCheckInGetMatchedCSSRulesDisabled(false) +#ifdef ANDROID_LAYOUT + , m_useWideViewport(false) +#endif +#ifdef ANDROID_MULTIPLE_WINDOWS + , m_supportMultipleWindows(true) +#endif +#ifdef ANDROID_BLOCK_NETWORK_IMAGE + , m_blockNetworkImage(false) +#endif #if ENABLE(WEB_AUTOFILL) , m_autoFillEnabled(false) #endif |