Title: [164259] trunk/Source/WebCore
- Revision
- 164259
- Author
- wei...@apple.com
- Date
- 2014-02-17 16:53:40 -0800 (Mon, 17 Feb 2014)
Log Message
Move iOS only Settings into Settings.in and make them not-iOS only
https://bugs.webkit.org/show_bug.cgi?id=128942
Reviewed by Tim Horton.
* page/Settings.cpp:
* page/Settings.h:
* page/Settings.in:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (164258 => 164259)
--- trunk/Source/WebCore/ChangeLog 2014-02-18 00:44:31 UTC (rev 164258)
+++ trunk/Source/WebCore/ChangeLog 2014-02-18 00:53:40 UTC (rev 164259)
@@ -1,3 +1,14 @@
+2014-02-17 Sam Weinig <s...@webkit.org>
+
+ Move iOS only Settings into Settings.in and make them not-iOS only
+ https://bugs.webkit.org/show_bug.cgi?id=128942
+
+ Reviewed by Tim Horton.
+
+ * page/Settings.cpp:
+ * page/Settings.h:
+ * page/Settings.in:
+
2014-02-17 Anders Carlsson <ander...@apple.com>
Remove view source code
Modified: trunk/Source/WebCore/page/Settings.cpp (164258 => 164259)
--- trunk/Source/WebCore/page/Settings.cpp 2014-02-18 00:44:31 UTC (rev 164258)
+++ trunk/Source/WebCore/page/Settings.cpp 2014-02-18 00:53:40 UTC (rev 164259)
@@ -156,9 +156,6 @@
, m_fontGenericFamilies(std::make_unique<FontGenericFamilies>())
, m_storageBlockingPolicy(SecurityOrigin::AllowAllStorage)
, m_layoutInterval(layoutScheduleThreshold)
-#if PLATFORM(IOS)
- , m_maxParseDuration(-1)
-#endif
#if ENABLE(TEXT_AUTOSIZING)
, m_textAutosizingFontScaleFactor(1)
#if HACK_FORCE_TEXT_AUTOSIZING_ON_DESKTOP
@@ -180,15 +177,6 @@
, m_needsAdobeFrameReloadingQuirk(false)
, m_usesPageCache(false)
, m_fontRenderingMode(0)
-#if PLATFORM(IOS)
- , m_standalone(false)
- , m_telephoneNumberParsingEnabled(false)
- , m_mediaDataLoadsAutomatically(false)
- , m_shouldTransformsAffectOverflow(true)
- , m_shouldDispatchJavaScriptWindowOnErrorEvents(false)
- , m_alwaysUseBaselineOfPrimaryFont(false)
- , m_alwaysUseAcceleratedOverflowScroll(false)
-#endif
, m_showTiledScrollingIndicator(false)
, m_tiledBackingStoreEnabled(false)
, m_backgroundShouldExtendBeyondPage(false)
@@ -714,11 +702,6 @@
}
#if PLATFORM(IOS)
-void Settings::setStandalone(bool standalone)
-{
- m_standalone = standalone;
-}
-
void Settings::setAudioSessionCategoryOverride(unsigned sessionCategory)
{
AudioSession::sharedSession().setCategoryOverride(static_cast<AudioSession::CategoryType>(sessionCategory));
Modified: trunk/Source/WebCore/page/Settings.h (164258 => 164259)
--- trunk/Source/WebCore/page/Settings.h 2014-02-18 00:44:31 UTC (rev 164258)
+++ trunk/Source/WebCore/page/Settings.h 2014-02-18 00:53:40 UTC (rev 164259)
@@ -179,33 +179,6 @@
void setHiddenPageDOMTimerThrottlingEnabled(bool);
#endif
-#if PLATFORM(IOS)
- // FIXME: This setting isn't specific to iOS.
- void setMaxParseDuration(double maxParseDuration) { m_maxParseDuration = maxParseDuration; }
- double maxParseDuration() const { return m_maxParseDuration; }
-
- void setStandalone(bool);
- bool standalone() const { return m_standalone; }
-
- void setTelephoneNumberParsingEnabled(bool flag) { m_telephoneNumberParsingEnabled = flag; }
- bool telephoneNumberParsingEnabled() const { return m_telephoneNumberParsingEnabled; }
-
- void setMediaDataLoadsAutomatically(bool flag) { m_mediaDataLoadsAutomatically = flag; }
- bool mediaDataLoadsAutomatically() const { return m_mediaDataLoadsAutomatically; }
-
- void setShouldTransformsAffectOverflow(bool flag) { m_shouldTransformsAffectOverflow = flag; }
- bool shouldTransformsAffectOverflow() const { return m_shouldTransformsAffectOverflow; }
-
- void setShouldDispatchJavaScriptWindowOnErrorEvents(bool flag) { m_shouldDispatchJavaScriptWindowOnErrorEvents = flag; }
- bool shouldDispatchJavaScriptWindowOnErrorEvents() const { return m_shouldDispatchJavaScriptWindowOnErrorEvents; }
-
- void setAlwaysUseBaselineOfPrimaryFont(bool flag) { m_alwaysUseBaselineOfPrimaryFont = flag; }
- bool alwaysUseBaselineOfPrimaryFont() const { return m_alwaysUseBaselineOfPrimaryFont; }
-
- void setAlwaysUseAcceleratedOverflowScroll(bool flag) { m_alwaysUseAcceleratedOverflowScroll = flag; }
- bool alwaysUseAcceleratedOverflowScroll() const { return m_alwaysUseAcceleratedOverflowScroll; }
-#endif
-
void setUsesPageCache(bool);
bool usesPageCache() const { return m_usesPageCache; }
@@ -313,9 +286,6 @@
const std::unique_ptr<FontGenericFamilies> m_fontGenericFamilies;
SecurityOrigin::StorageBlockingPolicy m_storageBlockingPolicy;
std::chrono::milliseconds m_layoutInterval;
-#if PLATFORM(IOS)
- double m_maxParseDuration;
-#endif
#if ENABLE(TEXT_AUTOSIZING)
float m_textAutosizingFontScaleFactor;
IntSize m_textAutosizingWindowSizeOverride;
@@ -335,16 +305,6 @@
bool m_needsAdobeFrameReloadingQuirk : 1;
bool m_usesPageCache : 1;
unsigned m_fontRenderingMode : 1;
-#if PLATFORM(IOS)
- bool m_standalone : 1;
- bool m_telephoneNumberParsingEnabled : 1;
- bool m_mediaDataLoadsAutomatically : 1;
- bool m_shouldTransformsAffectOverflow : 1;
- bool m_shouldDispatchJavaScriptWindowOnErrorEvents : 1;
- bool m_alwaysUseBaselineOfPrimaryFont : 1;
- bool m_allowMultiElementImplicitFormSubmission : 1;
- bool m_alwaysUseAcceleratedOverflowScroll : 1;
-#endif
bool m_showTiledScrollingIndicator : 1;
bool m_tiledBackingStoreEnabled : 1;
bool m_backgroundShouldExtendBeyondPage : 1;
Modified: trunk/Source/WebCore/page/Settings.in (164258 => 164259)
--- trunk/Source/WebCore/page/Settings.in 2014-02-18 00:44:31 UTC (rev 164258)
+++ trunk/Source/WebCore/page/Settings.in 2014-02-18 00:53:40 UTC (rev 164259)
@@ -206,3 +206,14 @@
mediaPlaybackAllowsAirPlay initial=true, conditional=IOS_AIRPLAY
shouldConvertPositionStyleOnCopy initial=false
+
+maxParseDuration type=double, initial=-1
+standalone initial=false
+telephoneNumberParsingEnabled initial=false
+mediaDataLoadsAutomatically initial=false
+shouldTransformsAffectOverflow initial=true
+shouldDispatchJavaScriptWindowOnErrorEvents initial=false
+alwaysUseAcceleratedOverflowScroll initial=false
+
+# FIXME: This is unneeded and should be removed.
+alwaysUseBaselineOfPrimaryFont initial=false
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
