<!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>[168911] trunk/Source/WebKit/mac</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/168911">168911</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-05-15 14:20:55 -0700 (Thu, 15 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up -[WebView _preferencesChanged]
https://bugs.webkit.org/show_bug.cgi?id=132967
Reviewed by Sam Weinig.
-[WebView _preferencesChanged] was a horrible mess of #ifdefs. Clean this up by
moving all the #if PLATFORM() code together, and moving all the feature-define related
settings to the end.
No behavior changes, checked by diffing the resulting Settings with and without
the patch, on OS X and iOS.
* WebView/WebView.mm:
(-[WebView _preferencesChanged:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (168910 => 168911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-05-15 21:17:33 UTC (rev 168910)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-05-15 21:20:55 UTC (rev 168911)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-05-15 Simon Fraser <simon.fraser@apple.com>
+
+ Clean up -[WebView _preferencesChanged]
+ https://bugs.webkit.org/show_bug.cgi?id=132967
+
+ Reviewed by Sam Weinig.
+
+ -[WebView _preferencesChanged] was a horrible mess of #ifdefs. Clean this up by
+ moving all the #if PLATFORM() code together, and moving all the feature-define related
+ settings to the end.
+
+ No behavior changes, checked by diffing the resulting Settings with and without
+ the patch, on OS X and iOS.
+
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]):
+
</ins><span class="cx"> 2014-05-15 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Add pointer lock to features without enabling it.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (168910 => 168911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-05-15 21:17:33 UTC (rev 168910)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-05-15 21:20:55 UTC (rev 168911)
</span><span class="lines">@@ -2227,13 +2227,8 @@
</span><span class="cx"> settings.setMinimumLogicalFontSize([preferences minimumLogicalFontSize]);
</span><span class="cx"> settings.setPictographFontFamily([preferences pictographFontFamily]);
</span><span class="cx"> settings.setPluginsEnabled([preferences arePlugInsEnabled]);
</span><del>-#if ENABLE(SQL_DATABASE)
- DatabaseManager::manager().setIsAvailable([preferences databasesEnabled]);
-#endif
</del><span class="cx"> settings.setLocalStorageEnabled([preferences localStorageEnabled]);
</span><del>-#if !PLATFORM(IOS)
- settings.setExperimentalNotificationsEnabled([preferences experimentalNotificationsEnabled]);
-#endif
</del><ins>+
</ins><span class="cx"> _private->page->enableLegacyPrivateBrowsing([preferences privateBrowsingEnabled]);
</span><span class="cx"> settings.setSansSerifFontFamily([preferences sansSerifFontFamily]);
</span><span class="cx"> settings.setSerifFontFamily([preferences serifFontFamily]);
</span><span class="lines">@@ -2244,7 +2239,6 @@
</span><span class="cx"> settings.setShouldPrintBackgrounds(true);
</span><span class="cx"> #else
</span><span class="cx"> settings.setShouldPrintBackgrounds([preferences shouldPrintBackgrounds]);
</span><del>- settings.setTextAreasAreResizable([preferences textAreasAreResizable]);
</del><span class="cx"> #endif
</span><span class="cx"> settings.setShrinksStandaloneImagesToFit([preferences shrinksStandaloneImagesToFit]);
</span><span class="cx"> settings.setEditableLinkBehavior(core([preferences editableLinkBehavior]));
</span><span class="lines">@@ -2253,44 +2247,18 @@
</span><span class="cx"> settings.setUsesPageCache([self usesPageCache]);
</span><span class="cx"> settings.setPageCacheSupportsPlugins([preferences pageCacheSupportsPlugins]);
</span><span class="cx"> settings.setBackForwardCacheExpirationInterval([preferences _backForwardCacheExpirationInterval]);
</span><del>-#if !PLATFORM(IOS)
- settings.setShowsURLsInToolTips([preferences showsURLsInToolTips]);
- settings.setShowsToolTipOverTruncatedText([preferences showsToolTipOverTruncatedText]);
-#endif
</del><ins>+
</ins><span class="cx"> settings.setDeveloperExtrasEnabled([preferences developerExtrasEnabled]);
</span><span class="cx"> settings.setJavaScriptExperimentsEnabled([preferences javaScriptExperimentsEnabled]);
</span><span class="cx"> settings.setAuthorAndUserStylesEnabled([preferences authorAndUserStylesEnabled]);
</span><span class="cx"> settings.setApplicationChromeMode([preferences applicationChromeModeEnabled]);
</span><del>-#if !PLATFORM(IOS)
- if ([preferences userStyleSheetEnabled]) {
- NSString* location = [[preferences userStyleSheetLocation] _web_originalDataAsString];
- if ([location isEqualToString:@"apple-dashboard://stylesheet"])
- location = @"file:///System/Library/PrivateFrameworks/DashboardClient.framework/Resources/widget.css";
- settings.setUserStyleSheetLocation([NSURL URLWithString:(location ? location : @"")]);
- } else
- settings.setUserStyleSheetLocation([NSURL URLWithString:@""]);
- settings.setNeedsAdobeFrameReloadingQuirk([self _needsAdobeFrameReloadingQuirk]);
- settings.setTreatsAnyTextCSSLinkAsStylesheet([self _needsLinkElementTextCSSQuirk]);
- settings.setNeedsKeyboardEventDisambiguationQuirks([self _needsKeyboardEventDisambiguationQuirks]);
-#else
- // iOS-specific settings
- settings.setStandalone([preferences _standalone]);
- settings.setTelephoneNumberParsingEnabled([preferences _telephoneNumberParsingEnabled]);
- settings.setAlwaysUseBaselineOfPrimaryFont([preferences _alwaysUseBaselineOfPrimaryFont]);
- settings.setAllowMultiElementImplicitSubmission([preferences _allowMultiElementImplicitFormSubmission]);
- settings.setLayoutInterval(std::chrono::milliseconds([preferences _layoutInterval]));
- settings.setMaxParseDuration([preferences _maxParseDuration]);
- settings.setAlwaysUseAcceleratedOverflowScroll([preferences _alwaysUseAcceleratedOverflowScroll]);
-#endif
</del><ins>+
</ins><span class="cx"> settings.setNeedsSiteSpecificQuirks(_private->useSiteSpecificSpoofing);
</span><span class="cx"> settings.setWebArchiveDebugModeEnabled([preferences webArchiveDebugModeEnabled]);
</span><span class="cx"> settings.setLocalFileContentSniffingEnabled([preferences localFileContentSniffingEnabled]);
</span><span class="cx"> settings.setOfflineWebApplicationCacheEnabled([preferences offlineWebApplicationCacheEnabled]);
</span><span class="cx"> settings.setJavaScriptCanAccessClipboard([preferences javaScriptCanAccessClipboard]);
</span><span class="cx"> settings.setXSSAuditorEnabled([preferences isXSSAuditorEnabled]);
</span><del>-#if !PLATFORM(IOS)
- settings.setEnforceCSSMIMETypeInNoQuirksMode(!WKAppVersionCheckLessThan(@"com.apple.iWeb", -1, 2.1));
-#endif
</del><span class="cx"> settings.setDNSPrefetchingEnabled([preferences isDNSPrefetchingEnabled]);
</span><span class="cx">
</span><span class="cx"> // FIXME: Enabling accelerated compositing when WebGL is enabled causes tests to fail on Leopard which expect HW compositing to be disabled.
</span><span class="lines">@@ -2301,10 +2269,7 @@
</span><span class="cx"> settings.setShowDebugBorders([preferences showDebugBorders]);
</span><span class="cx"> settings.setShowRepaintCounter([preferences showRepaintCounter]);
</span><span class="cx"> settings.setWebGLEnabled([preferences webGLEnabled]);
</span><del>-#if !PLATFORM(IOS)
- // FIXME: Should we enable this following <rdar://problem/15290404>?
- settings.setMultithreadedWebGLEnabled([preferences multithreadedWebGLEnabled]);
-#endif
</del><ins>+
</ins><span class="cx"> settings.setForceSoftwareWebGLRendering([preferences forceSoftwareWebGLRendering]);
</span><span class="cx"> settings.setAccelerated2dCanvasEnabled([preferences accelerated2dCanvasEnabled]);
</span><span class="cx"> settings.setLoadDeferringEnabled(shouldEnableLoadDeferring());
</span><span class="lines">@@ -2314,31 +2279,14 @@
</span><span class="cx"> settings.setPaginateDuringLayoutEnabled([preferences paginateDuringLayoutEnabled]);
</span><span class="cx"> RuntimeEnabledFeatures::sharedFeatures().setCSSRegionsEnabled([preferences cssRegionsEnabled]);
</span><span class="cx"> RuntimeEnabledFeatures::sharedFeatures().setCSSCompositingEnabled([preferences cssCompositingEnabled]);
</span><del>-#if ENABLE(WEB_AUDIO)
- settings.setWebAudioEnabled([preferences webAudioEnabled]);
-#endif
-#if ENABLE(FULLSCREEN_API)
- settings.setFullScreenEnabled([preferences fullScreenEnabled]);
-#endif
</del><ins>+
</ins><span class="cx"> settings.setAsynchronousSpellCheckingEnabled([preferences asynchronousSpellCheckingEnabled]);
</span><span class="cx"> settings.setHyperlinkAuditingEnabled([preferences hyperlinkAuditingEnabled]);
</span><span class="cx"> settings.setUsePreHTML5ParserQuirks([self _needsPreHTML5ParserQuirks]);
</span><span class="cx"> settings.setCrossOriginCheckInGetMatchedCSSRulesDisabled([self _needsUnrestrictedGetMatchedCSSRules]);
</span><span class="cx"> settings.setInteractiveFormValidationEnabled([self interactiveFormValidationEnabled]);
</span><span class="cx"> settings.setValidationMessageTimerMagnification([self validationMessageTimerMagnification]);
</span><del>-#if USE(AVFOUNDATION)
- settings.setAVFoundationEnabled([preferences isAVFoundationEnabled]);
-#endif
-#if PLATFORM(MAC)
- settings.setQTKitEnabled([preferences isQTKitEnabled]);
-#endif
-#if PLATFORM(IOS)
- settings.setMediaPlaybackAllowsAirPlay([preferences mediaPlaybackAllowsAirPlay]);
- settings.setAudioSessionCategoryOverride([preferences audioSessionCategoryOverride]);
- settings.setNetworkDataUsageTrackingEnabled([preferences networkDataUsageTrackingEnabled]);
- settings.setNetworkInterfaceName([preferences networkInterfaceName]);
- settings.setAVKitEnabled([preferences avKitEnabled]);
-#endif
</del><ins>+
</ins><span class="cx"> settings.setMediaPlaybackRequiresUserGesture([preferences mediaPlaybackRequiresUserGesture]);
</span><span class="cx"> settings.setMediaPlaybackAllowsInline([preferences mediaPlaybackAllowsInline]);
</span><span class="cx"> settings.setSuppressesIncrementalRendering([preferences suppressesIncrementalRendering]);
</span><span class="lines">@@ -2347,32 +2295,15 @@
</span><span class="cx"> settings.setWantsBalancedSetDefersLoadingBehavior([preferences wantsBalancedSetDefersLoadingBehavior]);
</span><span class="cx"> settings.setMockScrollbarsEnabled([preferences mockScrollbarsEnabled]);
</span><span class="cx">
</span><del>-#if ENABLE(VIDEO_TRACK)
- settings.setShouldDisplaySubtitles([preferences shouldDisplaySubtitles]);
- settings.setShouldDisplayCaptions([preferences shouldDisplayCaptions]);
- settings.setShouldDisplayTextDescriptions([preferences shouldDisplayTextDescriptions]);
-#endif
-
</del><span class="cx"> settings.setShouldRespectImageOrientation([preferences shouldRespectImageOrientation]);
</span><del>-#if !PLATFORM(IOS)
- settings.setNeedsIsLoadingInAPISenseQuirk([self _needsIsLoadingInAPISenseQuirk]);
-#endif
</del><ins>+
</ins><span class="cx"> settings.setRequestAnimationFrameEnabled([preferences requestAnimationFrameEnabled]);
</span><span class="cx"> settings.setDiagnosticLoggingEnabled([preferences diagnosticLoggingEnabled]);
</span><span class="cx"> settings.setLowPowerVideoAudioBufferSizeEnabled([preferences lowPowerVideoAudioBufferSizeEnabled]);
</span><span class="cx">
</span><span class="cx"> settings.setUseLegacyTextAlignPositionedElementBehavior([preferences useLegacyTextAlignPositionedElementBehavior]);
</span><span class="cx">
</span><del>-#if ENABLE(MEDIA_SOURCE)
- settings.setMediaSourceEnabled([preferences mediaSourceEnabled]);
-#endif
-
-#if ENABLE(SERVICE_CONTROLS)
- settings.setImageControlsEnabled([preferences imageControlsEnabled]);
-#endif
-
</del><span class="cx"> settings.setShouldConvertPositionStyleOnCopy([preferences shouldConvertPositionStyleOnCopy]);
</span><del>-
</del><span class="cx"> settings.setEnableInheritURIQueryComponent([preferences isInheritURIQueryComponentEnabled]);
</span><span class="cx">
</span><span class="cx"> switch ([preferences storageBlockingPolicy]) {
</span><span class="lines">@@ -2389,18 +2320,97 @@
</span><span class="cx">
</span><span class="cx"> settings.setPlugInSnapshottingEnabled([preferences plugInSnapshottingEnabled]);
</span><span class="cx">
</span><ins>+ settings.setFixedPositionCreatesStackingContext(true);
+
+#if PLATFORM(IOS)
+ settings.setStandalone([preferences _standalone]);
+ settings.setTelephoneNumberParsingEnabled([preferences _telephoneNumberParsingEnabled]);
+ settings.setAlwaysUseBaselineOfPrimaryFont([preferences _alwaysUseBaselineOfPrimaryFont]);
+ settings.setAllowMultiElementImplicitSubmission([preferences _allowMultiElementImplicitFormSubmission]);
+ settings.setLayoutInterval(std::chrono::milliseconds([preferences _layoutInterval]));
+ settings.setMaxParseDuration([preferences _maxParseDuration]);
+ settings.setAlwaysUseAcceleratedOverflowScroll([preferences _alwaysUseAcceleratedOverflowScroll]);
+ settings.setMediaPlaybackAllowsAirPlay([preferences mediaPlaybackAllowsAirPlay]);
+ settings.setAudioSessionCategoryOverride([preferences audioSessionCategoryOverride]);
+ settings.setNetworkDataUsageTrackingEnabled([preferences networkDataUsageTrackingEnabled]);
+ settings.setNetworkInterfaceName([preferences networkInterfaceName]);
+ settings.setAVKitEnabled([preferences avKitEnabled]);
+ settings.setShouldTransformsAffectOverflow(shouldTransformsAffectOverflow());
+ settings.setShouldDispatchJavaScriptWindowOnErrorEvents(shouldDispatchJavaScriptWindowOnErrorEvents());
+
+ settings.setPasswordEchoEnabled([preferences _allowPasswordEcho]);
+ settings.setPasswordEchoDurationInSeconds([preferences _passwordEchoDuration]);
+
+ ASSERT_WITH_MESSAGE(settings.pageCacheSupportsPlugins(), "PageCacheSupportsPlugins should be enabled on iOS.");
+ settings.setDelegatesPageScaling(true);
+
+#if ENABLE(IOS_TEXT_AUTOSIZING)
+ settings.setMinimumZoomFontSize([preferences _minimumZoomFontSize]);
+#endif
+#endif // PLATFORM(IOS)
+
+#if PLATFORM(MAC)
+ if ([preferences userStyleSheetEnabled]) {
+ NSString* location = [[preferences userStyleSheetLocation] _web_originalDataAsString];
+ if ([location isEqualToString:@"apple-dashboard://stylesheet"])
+ location = @"file:///System/Library/PrivateFrameworks/DashboardClient.framework/Resources/widget.css";
+ settings.setUserStyleSheetLocation([NSURL URLWithString:(location ? location : @"")]);
+ } else
+ settings.setUserStyleSheetLocation([NSURL URLWithString:@""]);
+
+ settings.setNeedsAdobeFrameReloadingQuirk([self _needsAdobeFrameReloadingQuirk]);
+ settings.setTreatsAnyTextCSSLinkAsStylesheet([self _needsLinkElementTextCSSQuirk]);
+ settings.setNeedsKeyboardEventDisambiguationQuirks([self _needsKeyboardEventDisambiguationQuirks]);
+ settings.setEnforceCSSMIMETypeInNoQuirksMode(!WKAppVersionCheckLessThan(@"com.apple.iWeb", -1, 2.1));
+ settings.setNeedsIsLoadingInAPISenseQuirk([self _needsIsLoadingInAPISenseQuirk]);
+ settings.setTextAreasAreResizable([preferences textAreasAreResizable]);
+ settings.setExperimentalNotificationsEnabled([preferences experimentalNotificationsEnabled]);
+ settings.setShowsURLsInToolTips([preferences showsURLsInToolTips]);
+ settings.setShowsToolTipOverTruncatedText([preferences showsToolTipOverTruncatedText]);
+ settings.setQTKitEnabled([preferences isQTKitEnabled]);
+
+ // FIXME: Should we enable this following <rdar://problem/15290404>?
+ settings.setMultithreadedWebGLEnabled([preferences multithreadedWebGLEnabled]);
+#endif // PLATFORM(MAC)
+
+#if ENABLE(SQL_DATABASE)
+ DatabaseManager::manager().setIsAvailable([preferences databasesEnabled]);
+#endif
+
+#if ENABLE(MEDIA_SOURCE)
+ settings.setMediaSourceEnabled([preferences mediaSourceEnabled]);
+#endif
+
+#if ENABLE(SERVICE_CONTROLS)
+ settings.setImageControlsEnabled([preferences imageControlsEnabled]);
+#endif
+
+#if ENABLE(VIDEO_TRACK)
+ settings.setShouldDisplaySubtitles([preferences shouldDisplaySubtitles]);
+ settings.setShouldDisplayCaptions([preferences shouldDisplayCaptions]);
+ settings.setShouldDisplayTextDescriptions([preferences shouldDisplayTextDescriptions]);
+#endif
+
+#if USE(AVFOUNDATION)
+ settings.setAVFoundationEnabled([preferences isAVFoundationEnabled]);
+#endif
+
+#if ENABLE(WEB_AUDIO)
+ settings.setWebAudioEnabled([preferences webAudioEnabled]);
+#endif
+
+#if ENABLE(FULLSCREEN_API)
+ settings.setFullScreenEnabled([preferences fullScreenEnabled]);
+#endif
+
</ins><span class="cx"> #if ENABLE(HIDDEN_PAGE_DOM_TIMER_THROTTLING)
</span><span class="cx"> settings.setHiddenPageDOMTimerThrottlingEnabled([preferences hiddenPageDOMTimerThrottlingEnabled]);
</span><span class="cx"> #endif
</span><ins>+
</ins><span class="cx"> #if ENABLE(PAGE_VISIBILITY_API)
</span><span class="cx"> settings.setHiddenPageCSSAnimationSuspensionEnabled([preferences hiddenPageCSSAnimationSuspensionEnabled]);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- // We have enabled this setting in WebKit2 for the sake of some ScrollingCoordinator work.
- // To avoid possible rendering differences, we should enable it for WebKit1 too. We also
- // want to keep this setting enabled for iOS. See <rdar://problem/9813262> for more details.
- settings.setFixedPositionCreatesStackingContext(true);
-
</del><span class="cx"> NSTimeInterval timeout = [preferences incrementalRenderingSuppressionTimeoutInSeconds];
</span><span class="cx"> if (timeout > 0)
</span><span class="cx"> settings.setIncrementalRenderingSuppressionTimeoutInSeconds(timeout);
</span><span class="lines">@@ -2412,10 +2422,6 @@
</span><span class="cx"> if (_private->zoomsTextOnly != zoomsTextOnly)
</span><span class="cx"> [self _setZoomMultiplier:_private->zoomMultiplier isTextOnly:zoomsTextOnly];
</span><span class="cx">
</span><del>-#if ENABLE(IOS_TEXT_AUTOSIZING)
- settings.setMinimumZoomFontSize([preferences _minimumZoomFontSize]);
-#endif
-
</del><span class="cx"> #if ENABLE(DISK_IMAGE_CACHE) && PLATFORM(IOS)
</span><span class="cx"> DiskImageCache& diskImageCache = WebCore::diskImageCache();
</span><span class="cx"> diskImageCache.setEnabled([preferences diskImageCacheEnabled]);
</span><span class="lines">@@ -2428,15 +2434,6 @@
</span><span class="cx"> [[self window] setTilePaintCountsVisible:[preferences showRepaintCounter]];
</span><span class="cx"> [[self window] setAcceleratedDrawingEnabled:[preferences acceleratedDrawingEnabled]];
</span><span class="cx"> [WAKView _setInterpolationQuality:[preferences _interpolationQuality]];
</span><del>- settings.setDelegatesPageScaling(true);
-
- settings.setShouldTransformsAffectOverflow(shouldTransformsAffectOverflow());
- settings.setShouldDispatchJavaScriptWindowOnErrorEvents(shouldDispatchJavaScriptWindowOnErrorEvents());
- ASSERT_WITH_MESSAGE(settings.pageCacheSupportsPlugins(), "PageCacheSupportsPlugins should be enabled on iOS.");
-
- // Password echo
- settings.setPasswordEchoEnabled([preferences _allowPasswordEcho]);
- settings.setPasswordEchoDurationInSeconds([preferences _passwordEchoDuration]);
</del><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>