summaryrefslogtreecommitdiffstats
path: root/Source/WebCore
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebCore')
-rw-r--r--Source/WebCore/page/Settings.cpp24
-rw-r--r--Source/WebCore/page/Settings.h59
-rw-r--r--Source/WebCore/platform/PlatformTouchEvent.h1
-rw-r--r--Source/WebCore/platform/android/PlatformTouchEventAndroid.cpp2
4 files changed, 42 insertions, 44 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
diff --git a/Source/WebCore/page/Settings.h b/Source/WebCore/page/Settings.h
index aee749e..0e93249 100644
--- a/Source/WebCore/page/Settings.h
+++ b/Source/WebCore/page/Settings.h
@@ -455,15 +455,18 @@ namespace WebCore {
AtomicString m_sansSerifFontFamily;
AtomicString m_cursiveFontFamily;
AtomicString m_fantasyFontFamily;
-#ifdef ANDROID_LAYOUT
- LayoutAlgorithm m_layoutAlgorithm;
-#endif
EditableLinkBehavior m_editableLinkBehavior;
TextDirectionSubmenuInclusionBehavior m_textDirectionSubmenuInclusionBehavior;
int m_minimumFontSize;
int m_minimumLogicalFontSize;
int m_defaultFontSize;
int m_defaultFixedFontSize;
+ size_t m_maximumDecodedImageSize;
+#if ENABLE(DOM_STORAGE)
+ unsigned m_sessionStorageQuota;
+#endif
+ unsigned m_pluginAllowedRunTime;
+ unsigned m_editingBehaviorType;
#ifdef ANDROID_META_SUPPORT
// range is from 200 to 10,000. 0 is a special value means device-width.
// default is -1, which means undefined.
@@ -477,34 +480,10 @@ namespace WebCore {
int m_viewport_minimum_scale;
// range is from 1 to 1000 in percent. default is 0, which means undefined.
int m_viewport_maximum_scale;
- // default is yes
- bool m_viewport_user_scalable : 1;
- // range is from 70 to 400. 0 is a special value means device-dpi
- // default is -1, which means undefined.
- int m_viewport_target_densitydpi;
- // default is yes
- bool m_format_detection_telephone : 1;
- // default is yes
- bool m_format_detection_address : 1;
- // default is yes
- bool m_format_detection_email : 1;
- bool m_default_format_detection : 1;
#endif
#ifdef ANDROID_LAYOUT
- bool m_useWideViewport : 1;
-#endif
-#ifdef ANDROID_MULTIPLE_WINDOWS
- bool m_supportMultipleWindows : 1;
-#endif
-#ifdef ANDROID_BLOCK_NETWORK_IMAGE
- bool m_blockNetworkImage : 1;
-#endif
- size_t m_maximumDecodedImageSize;
-#if ENABLE(DOM_STORAGE)
- unsigned m_sessionStorageQuota;
+ LayoutAlgorithm m_layoutAlgorithm;
#endif
- unsigned m_pluginAllowedRunTime;
- unsigned m_editingBehaviorType;
bool m_isSpatialNavigationEnabled : 1;
bool m_isJavaEnabled : 1;
bool m_loadsImagesAutomatically : 1;
@@ -577,7 +556,29 @@ namespace WebCore {
bool m_usePreHTML5ParserQuirks: 1;
bool m_hyperlinkAuditingEnabled : 1;
bool m_crossOriginCheckInGetMatchedCSSRulesDisabled : 1;
-
+#ifdef ANDROID_META_SUPPORT
+ // default is yes
+ bool m_viewport_user_scalable : 1;
+ // range is from 70 to 400. 0 is a special value means device-dpi
+ // default is -1, which means undefined.
+ int m_viewport_target_densitydpi;
+ // default is yes
+ bool m_format_detection_telephone : 1;
+ // default is yes
+ bool m_format_detection_address : 1;
+ // default is yes
+ bool m_format_detection_email : 1;
+ bool m_default_format_detection : 1;
+#endif
+#ifdef ANDROID_LAYOUT
+ bool m_useWideViewport : 1;
+#endif
+#ifdef ANDROID_MULTIPLE_WINDOWS
+ bool m_supportMultipleWindows : 1;
+#endif
+#ifdef ANDROID_BLOCK_NETWORK_IMAGE
+ bool m_blockNetworkImage : 1;
+#endif
#if ENABLE(WEB_AUTOFILL)
bool m_autoFillEnabled: 1;
#endif
diff --git a/Source/WebCore/platform/PlatformTouchEvent.h b/Source/WebCore/platform/PlatformTouchEvent.h
index 080f2f9..2ca7c99 100644
--- a/Source/WebCore/platform/PlatformTouchEvent.h
+++ b/Source/WebCore/platform/PlatformTouchEvent.h
@@ -71,7 +71,6 @@ public:
#if PLATFORM(QT)
PlatformTouchEvent(QTouchEvent*);
#elif PLATFORM(ANDROID)
- // Changes in next line is in ANDROID but waiting to upstream to WebKit. TODO: upstream it.
PlatformTouchEvent(const Vector<int>&, const Vector<IntPoint>&, TouchEventType, const Vector<PlatformTouchPoint::State>&, int metaState);
#elif PLATFORM(BREWMP)
PlatformTouchEvent(AEEEvent, uint16 wParam, uint32 dwParam);
diff --git a/Source/WebCore/platform/android/PlatformTouchEventAndroid.cpp b/Source/WebCore/platform/android/PlatformTouchEventAndroid.cpp
index ba3b086..dd06400 100644
--- a/Source/WebCore/platform/android/PlatformTouchEventAndroid.cpp
+++ b/Source/WebCore/platform/android/PlatformTouchEventAndroid.cpp
@@ -38,7 +38,6 @@ enum AndroidMetaKeyState {
META_SYM_ON = 0x04
};
-// Changes in next line is in ANDROID but waiting to upstream to WebKit. TODO: upstream it.
PlatformTouchEvent::PlatformTouchEvent(const Vector<int>& ids, const Vector<IntPoint>& windowPoints, TouchEventType type, const Vector<PlatformTouchPoint::State>& states, int metaState)
: m_type(type)
, m_metaKey(false)
@@ -46,7 +45,6 @@ PlatformTouchEvent::PlatformTouchEvent(const Vector<int>& ids, const Vector<IntP
{
m_touchPoints.reserveCapacity(windowPoints.size());
for (unsigned c = 0; c < windowPoints.size(); c++)
- // Changes in next line is in ANDROID but waiting to upstream to WebKit. TODO: upstream it.
m_touchPoints.append(PlatformTouchPoint(ids[c], windowPoints[c], states[c]));
m_altKey = metaState & META_ALT_ON;
generated by cgit v1.1 at 2025-11-12 19:18:10 +0000