<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[164267] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/164267">164267</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2014-02-17 19:50:41 -0800 (Mon, 17 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS, WebKit2] Add settings and correct default values for settings important on iOS
https://bugs.webkit.org/show_bug.cgi?id=128947
Reviewed by Simon Fraser.
* Shared/WebPreferencesStore.cpp:
* Shared/WebPreferencesStore.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPreferencesStorecpp">trunk/Source/WebKit2/Shared/WebPreferencesStore.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPreferencesStoreh">trunk/Source/WebKit2/Shared/WebPreferencesStore.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (164266 => 164267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-18 02:50:50 UTC (rev 164266)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-18 03:50:41 UTC (rev 164267)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-02-17 Sam Weinig <sam@webkit.org>
+
+ [iOS, WebKit2] Add settings and correct default values for settings important on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=128947
+
+ Reviewed by Simon Fraser.
+
+ * Shared/WebPreferencesStore.cpp:
+ * Shared/WebPreferencesStore.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+
</ins><span class="cx"> 2014-02-17 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> [CoordinatedGraphics][EFL] Remove view_source functions.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesStore.cpp (164266 => 164267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesStore.cpp 2014-02-18 02:50:50 UTC (rev 164266)
+++ trunk/Source/WebKit2/Shared/WebPreferencesStore.cpp 2014-02-18 03:50:41 UTC (rev 164267)
</span><span class="lines">@@ -31,6 +31,10 @@
</span><span class="cx"> #include <WebCore/Settings.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+#import <WebKitSystemInterfaceIOS.h>
+#endif
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> namespace WebPreferencesKey {
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesStore.h (164266 => 164267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2014-02-18 02:50:50 UTC (rev 164266)
+++ trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2014-02-18 03:50:41 UTC (rev 164267)
</span><span class="lines">@@ -66,8 +66,20 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #define DEFAULT_FRAME_FLATTENING_ENABLED true
</span><ins>+#define DEFAULT_SHOULD_PRINT_BACKGROUNDS true
+#define DEFAULT_TEXT_AREAS_ARE_RESIZABLE false
+#define DEFAULT_JAVASCRIPT_CAN_OPEN_WINDOWS_AUTOMATICALLY false
+#define DEFAULT_SHOULD_RESPECT_IMAGE_ORIENTATION true
+#define DEFAULT_MINIMUM_FONT_ZOOM_SIZE WKGetMinimumZoomFontSize()
+#define DEFAULT_PASSWORD_ECHO_ENABLED true
</ins><span class="cx"> #else
</span><span class="cx"> #define DEFAULT_FRAME_FLATTENING_ENABLED false
</span><ins>+#define DEFAULT_SHOULD_PRINT_BACKGROUNDS false
+#define DEFAULT_TEXT_AREAS_ARE_RESIZABLE true
+#define DEFAULT_JAVASCRIPT_CAN_OPEN_WINDOWS_AUTOMATICALLY true
+#define DEFAULT_SHOULD_RESPECT_IMAGE_ORIENTATION false
+#define DEFAULT_MINIMUM_FONT_ZOOM_SIZE 0
+#define DEFAULT_PASSWORD_ECHO_ENABLED false
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR)
</span><span class="lines">@@ -98,8 +110,8 @@
</span><span class="cx"> macro(DeveloperExtrasEnabled, developerExtrasEnabled, Bool, bool, false) \
</span><span class="cx"> macro(JavaScriptExperimentsEnabled, javaScriptExperimentsEnabled, Bool, bool, false) \
</span><span class="cx"> macro(PrivateBrowsingEnabled, privateBrowsingEnabled, Bool, bool, false) \
</span><del>- macro(TextAreasAreResizable, textAreasAreResizable, Bool, bool, true) \
- macro(JavaScriptCanOpenWindowsAutomatically, javaScriptCanOpenWindowsAutomatically, Bool, bool, true) \
</del><ins>+ macro(TextAreasAreResizable, textAreasAreResizable, Bool, bool, DEFAULT_TEXT_AREAS_ARE_RESIZABLE) \
+ macro(JavaScriptCanOpenWindowsAutomatically, javaScriptCanOpenWindowsAutomatically, Bool, bool, DEFAULT_JAVASCRIPT_CAN_OPEN_WINDOWS_AUTOMATICALLY) \
</ins><span class="cx"> macro(HyperlinkAuditingEnabled, hyperlinkAuditingEnabled, Bool, bool, true) \
</span><span class="cx"> macro(NeedsSiteSpecificQuirks, needsSiteSpecificQuirks, Bool, bool, false) \
</span><span class="cx"> macro(AcceleratedCompositingEnabled, acceleratedCompositingEnabled, Bool, bool, true) \
</span><span class="lines">@@ -140,7 +152,7 @@
</span><span class="cx"> macro(InspectorStartsAttached, inspectorStartsAttached, Bool, bool, true) \
</span><span class="cx"> macro(ShowsToolTipOverTruncatedText, showsToolTipOverTruncatedText, Bool, bool, false) \
</span><span class="cx"> macro(MockScrollbarsEnabled, mockScrollbarsEnabled, Bool, bool, false) \
</span><del>- macro(WebAudioEnabled, webAudioEnabled, Bool, bool, false) \
</del><ins>+ macro(WebAudioEnabled, webAudioEnabled, Bool, bool, true) \
</ins><span class="cx"> macro(ApplicationChromeModeEnabled, applicationChromeMode, Bool, bool, false) \
</span><span class="cx"> macro(SuppressesIncrementalRendering, suppressesIncrementalRendering, Bool, bool, false) \
</span><span class="cx"> macro(BackspaceKeyNavigationEnabled, backspaceKeyNavigationEnabled, Bool, bool, true) \
</span><span class="lines">@@ -149,7 +161,7 @@
</span><span class="cx"> macro(ShouldDisplayCaptions, shouldDisplayCaptions, Bool, bool, false) \
</span><span class="cx"> macro(ShouldDisplayTextDescriptions, shouldDisplayTextDescriptions, Bool, bool, false) \
</span><span class="cx"> macro(NotificationsEnabled, notificationsEnabled, Bool, bool, true) \
</span><del>- macro(ShouldRespectImageOrientation, shouldRespectImageOrientation, Bool, bool, false) \
</del><ins>+ macro(ShouldRespectImageOrientation, shouldRespectImageOrientation, Bool, bool, DEFAULT_SHOULD_RESPECT_IMAGE_ORIENTATION) \
</ins><span class="cx"> macro(WantsBalancedSetDefersLoadingBehavior, wantsBalancedSetDefersLoadingBehavior, Bool, bool, false) \
</span><span class="cx"> macro(RequestAnimationFrameEnabled, requestAnimationFrameEnabled, Bool, bool, true) \
</span><span class="cx"> macro(DiagnosticLoggingEnabled, diagnosticLoggingEnabled, Bool, bool, false) \
</span><span class="lines">@@ -191,15 +203,24 @@
</span><span class="cx"> macro(MediaSourceEnabled, mediaSourceEnabled, Bool, bool, false) \
</span><span class="cx"> macro(ViewGestureDebuggingEnabled, viewGestureDebuggingEnabled, Bool, bool, false) \
</span><span class="cx"> macro(ShouldConvertPositionStyleOnCopy, shouldConvertPositionStyleOnCopy, Bool, bool, false) \
</span><del>- \
</del><ins>+ macro(Standalone, standalone, Bool, bool, false) \
+ macro(TelephoneNumberParsingEnabled, telephoneNumberParsingEnabled, Bool, bool, false) \
+ macro(AlwaysUseBaselineOfPrimaryFont, alwaysUseBaselineOfPrimaryFont, Bool, bool, false) \
+ macro(AllowMultiElementImplicitSubmission, allowMultiElementImplicitSubmission, Bool, bool, false) \
+ macro(AlwaysUseAcceleratedOverflowScroll, alwaysUseAcceleratedOverflowScroll, Bool, bool, false) \
+ macro(PasswordEchoEnabled, passwordEchoEnabled, Bool, bool, DEFAULT_PASSWORD_ECHO_ENABLED)
</ins><span class="cx">
</span><span class="cx"> #define FOR_EACH_WEBKIT_DOUBLE_PREFERENCE(macro) \
</span><span class="cx"> macro(PDFScaleFactor, pdfScaleFactor, Double, double, 0) \
</span><span class="cx"> macro(IncrementalRenderingSuppressionTimeout, incrementalRenderingSuppressionTimeout, Double, double, 5) \
</span><span class="cx"> macro(MinimumFontSize, minimumFontSize, Double, double, 0) \
</span><span class="cx"> macro(MinimumLogicalFontSize, minimumLogicalFontSize, Double, double, 9) \
</span><ins>+ macro(MinimumZoomFontSize, minimumZoomFontSize, Double, double, DEFAULT_MINIMUM_FONT_ZOOM_SIZE) \
</ins><span class="cx"> macro(DefaultFontSize, defaultFontSize, Double, double, 16) \
</span><span class="cx"> macro(DefaultFixedFontSize, defaultFixedFontSize, Double, double, 13) \
</span><ins>+ macro(LayoutInterval, layoutInterval, Double, double, -1) \
+ macro(MaxParseDuration, maxParseDuration, Double, double, -1) \
+ macro(PasswordEchoDuration, passwordEchoDuration, Double, double, 2) \
</ins><span class="cx"> \
</span><span class="cx">
</span><span class="cx"> #define FOR_EACH_WEBKIT_FLOAT_PREFERENCE(macro) \
</span><span class="lines">@@ -215,13 +236,23 @@
</span><span class="cx"> macro(InspectorAttachedHeight, inspectorAttachedHeight, UInt32, uint32_t, 300) \
</span><span class="cx"> macro(InspectorAttachedWidth, inspectorAttachedWidth, UInt32, uint32_t, 750) \
</span><span class="cx"> macro(InspectorAttachmentSide, inspectorAttachmentSide, UInt32, uint32_t, 0) \
</span><ins>+ macro(MaximumDecodedImageSize, maximumDecodedImageSize, UInt32, uint32_t, 20 * 1024 * 1024) \
</ins><span class="cx"> \
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+#define DEFAULT_CURSIVE_FONT_FAMILY "Snell Roundhand"
+#define DEFAULT_PICTOGRAPH_FONT_FAMILY "AppleColorEmoji"
+#else
+#define DEFAULT_CURSIVE_FONT_FAMILY "Apple Chancery"
+#define DEFAULT_PICTOGRAPH_FONT_FAMILY "Apple Color Emoji"
+#endif
+
+
</ins><span class="cx"> #define FOR_EACH_WEBKIT_FONT_FAMILY_PREFERENCE(macro) \
</span><span class="cx"> macro(StandardFontFamily, standardFontFamily, String, String, "Times") \
</span><del>- macro(CursiveFontFamily, cursiveFontFamily, String, String, "Apple Chancery") \
</del><ins>+ macro(CursiveFontFamily, cursiveFontFamily, String, String, DEFAULT_CURSIVE_FONT_FAMILY) \
</ins><span class="cx"> macro(FantasyFontFamily, fantasyFontFamily, String, String, "Papyrus") \
</span><span class="cx"> macro(FixedFontFamily, fixedFontFamily, String, String, "Courier") \
</span><span class="cx"> macro(SansSerifFontFamily, sansSerifFontFamily, String, String, "Helvetica") \
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (164266 => 164267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-02-18 02:50:50 UTC (rev 164266)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-02-18 03:50:41 UTC (rev 164267)
</span><span class="lines">@@ -2508,6 +2508,10 @@
</span><span class="cx"> settings.setAVKitEnabled(true);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(IOS_TEXT_AUTOSIZING)
+ settings.setMinimumZoomFontSize(store.getDoubleValueForKey(WebPreferencesKey::minimumZoomFontSizeKey()));
+#endif
+
</ins><span class="cx"> #if ENABLE(WEB_AUDIO)
</span><span class="cx"> settings.setWebAudioEnabled(store.getBoolValueForKey(WebPreferencesKey::webAudioEnabledKey()));
</span><span class="cx"> #endif
</span><span class="lines">@@ -2577,6 +2581,19 @@
</span><span class="cx">
</span><span class="cx"> settings.setShouldConvertPositionStyleOnCopy(store.getBoolValueForKey(WebPreferencesKey::shouldConvertPositionStyleOnCopyKey()));
</span><span class="cx">
</span><ins>+ settings.setStandalone(store.getBoolValueForKey(WebPreferencesKey::standaloneKey()));
+ settings.setTelephoneNumberParsingEnabled(store.getBoolValueForKey(WebPreferencesKey::telephoneNumberParsingEnabledKey()));
+ settings.setAlwaysUseBaselineOfPrimaryFont(store.getBoolValueForKey(WebPreferencesKey::alwaysUseBaselineOfPrimaryFontKey()));
+ settings.setAllowMultiElementImplicitSubmission(store.getBoolValueForKey(WebPreferencesKey::allowMultiElementImplicitSubmissionKey()));
+ settings.setAlwaysUseAcceleratedOverflowScroll(store.getBoolValueForKey(WebPreferencesKey::alwaysUseAcceleratedOverflowScrollKey()));
+
+ settings.setPasswordEchoEnabled(store.getBoolValueForKey(WebPreferencesKey::passwordEchoEnabledKey()));
+ settings.setPasswordEchoDurationInSeconds(store.getDoubleValueForKey(WebPreferencesKey::passwordEchoDurationKey()));
+
+ settings.setLayoutInterval(std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::duration<double>(store.getDoubleValueForKey(WebPreferencesKey::layoutIntervalKey()))));
+ settings.setMaxParseDuration(store.getDoubleValueForKey(WebPreferencesKey::maxParseDurationKey()));
+ settings.setMaximumDecodedImageSize(store.getUInt32ValueForKey(WebPreferencesKey::maximumDecodedImageSizeKey()));
+
</ins><span class="cx"> if (store.getBoolValueForKey(WebPreferencesKey::pageVisibilityBasedProcessSuppressionEnabledKey())) {
</span><span class="cx"> if (m_processSuppressionDisabledByWebPreference.isActive())
</span><span class="cx"> m_processSuppressionDisabledByWebPreference.endActivity();
</span></span></pre>
</div>
</div>
</body>
</html>