<!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>[169394] 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/169394">169394</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2014-05-27 11:35:12 -0700 (Tue, 27 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebKit2] Move WebPreferences macro definitions and key names into their own files
https://bugs.webkit.org/show_bug.cgi?id=133315
Reviewed by Anders Carlsson.
* CMakeLists.txt:
* Shared/WebPreferencesDefinitions.h: Copied from Source/WebKit2/Shared/WebPreferencesStore.h.
* Shared/WebPreferencesKeys.cpp: Copied from Source/WebKit2/Shared/WebPreferencesStore.cpp.
* Shared/WebPreferencesKeys.h: Copied from Source/WebKit2/Shared/WebPreferencesStore.h.
* Shared/WebPreferencesStore.cpp:
* Shared/WebPreferencesStore.h:
* UIProcess/WebPreferences.cpp:
* UIProcess/WebPreferences.h:
* UIProcess/mac/WebContextMac.mm:
* UIProcess/mac/WebPreferencesMac.mm:
* UIProcess/mac/WebProcessProxyMac.mm:
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/InjectedBundle/InjectedBundle.cpp:
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
* WebProcess/WebPage/WebPage.cpp:
* WebProcess/WebProcess.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<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="#trunkSourceWebKit2UIProcessWebPreferencescpp">trunk/Source/WebKit2/UIProcess/WebPreferences.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPreferencesh">trunk/Source/WebKit2/UIProcess/WebPreferences.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebContextMacmm">trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebPreferencesMacmm">trunk/Source/WebKit2/UIProcess/mac/WebPreferencesMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebProcessProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebProcessProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedDrawingAreacpp">trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageDrawingAreaImplcpp">trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedWebPreferencesDefinitionsh">trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPreferencesKeyscpp">trunk/Source/WebKit2/Shared/WebPreferencesKeys.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPreferencesKeysh">trunk/Source/WebKit2/Shared/WebPreferencesKeys.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (169393 => 169394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2014-05-27 18:31:56 UTC (rev 169393)
+++ trunk/Source/WebKit2/CMakeLists.txt 2014-05-27 18:35:12 UTC (rev 169394)
</span><span class="lines">@@ -233,6 +233,7 @@
</span><span class="cx"> Shared/WebPageGroupData.cpp
</span><span class="cx"> Shared/WebPlatformTouchPoint.cpp
</span><span class="cx"> Shared/WebPopupItem.cpp
</span><ins>+ Shared/WebPreferencesKeys.cpp
</ins><span class="cx"> Shared/WebPreferencesStore.cpp
</span><span class="cx"> Shared/WebProcessCreationParameters.cpp
</span><span class="cx"> Shared/WebRenderLayer.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169393 => 169394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-27 18:31:56 UTC (rev 169393)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-27 18:35:12 UTC (rev 169394)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-05-27 Sam Weinig <sam@webkit.org>
+
+ [WebKit2] Move WebPreferences macro definitions and key names into their own files
+ https://bugs.webkit.org/show_bug.cgi?id=133315
+
+ Reviewed by Anders Carlsson.
+
+ * CMakeLists.txt:
+ * Shared/WebPreferencesDefinitions.h: Copied from Source/WebKit2/Shared/WebPreferencesStore.h.
+ * Shared/WebPreferencesKeys.cpp: Copied from Source/WebKit2/Shared/WebPreferencesStore.cpp.
+ * Shared/WebPreferencesKeys.h: Copied from Source/WebKit2/Shared/WebPreferencesStore.h.
+ * Shared/WebPreferencesStore.cpp:
+ * Shared/WebPreferencesStore.h:
+ * UIProcess/WebPreferences.cpp:
+ * UIProcess/WebPreferences.h:
+ * UIProcess/mac/WebContextMac.mm:
+ * UIProcess/mac/WebPreferencesMac.mm:
+ * UIProcess/mac/WebProcessProxyMac.mm:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ * WebProcess/WebPage/WebPage.cpp:
+ * WebProcess/WebProcess.cpp:
+
</ins><span class="cx"> 2014-05-27 Gavin Barraclough <baraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> Add UI process watchdog on iOS to ensure WebProcess connections close
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesDefinitionshfromrev169357trunkSourceWebKit2SharedWebPreferencesStoreh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (from rev 169357, trunk/Source/WebKit2/Shared/WebPreferencesStore.h) (0 => 169394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (rev 0)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2014-05-27 18:35:12 UTC (rev 169394)
</span><span class="lines">@@ -0,0 +1,294 @@
</span><ins>+/*
+ * Copyright (C) 2010, 2011, 2012 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebPreferencesDefinitions_h
+#define WebPreferencesDefinitions_h
+
+// macro(KeyUpper, KeyLower, TypeNameUpper, TypeName, DefaultValue)
+
+#if PLATFORM(GTK)
+#define DEFAULT_WEBKIT_TABSTOLINKS_ENABLED true
+#else
+#define DEFAULT_WEBKIT_TABSTOLINKS_ENABLED false
+#endif
+
+#if ENABLE(SMOOTH_SCROLLING)
+#define DEFAULT_WEBKIT_SCROLL_ANIMATOR_ENABLED true
+#else
+#define DEFAULT_WEBKIT_SCROLL_ANIMATOR_ENABLED false
+#endif
+
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#define DEFAULT_SCREEN_FONT_SUBSTITUTION_ENABLED false
+#else
+#define DEFAULT_SCREEN_FONT_SUBSTITUTION_ENABLED true
+#endif
+
+#if PLATFORM(COCOA)
+#define DEFAULT_HIDDEN_PAGE_DOM_TIMER_THROTTLING_ENABLED true
+#define DEFAULT_HIDDEN_PAGE_CSS_ANIMATION_SUSPENSION_ENABLED true
+#define DEFAULT_PDFPLUGIN_ENABLED true
+#else
+#define DEFAULT_HIDDEN_PAGE_DOM_TIMER_THROTTLING_ENABLED false
+#define DEFAULT_HIDDEN_PAGE_CSS_ANIMATION_SUSPENSION_ENABLED false
+#define DEFAULT_PDFPLUGIN_ENABLED false
+#endif
+
+#if PLATFORM(IOS)
+#define DEFAULT_FRAME_FLATTENING_ENABLED true
+#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
+#define DEFAULT_MEDIA_PLAYBACK_ALLOWS_INLINE false
+#define DEFAULT_MEDIA_PLAYBACK_REQUIRES_USER_GESTURE true
+#define DEFAULT_TEMPORARY_TILE_COHORT_RETENTION_ENABLED false
+#else
+#define DEFAULT_FRAME_FLATTENING_ENABLED false
+#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
+#define DEFAULT_MEDIA_PLAYBACK_ALLOWS_INLINE true
+#define DEFAULT_MEDIA_PLAYBACK_REQUIRES_USER_GESTURE false
+#define DEFAULT_TEMPORARY_TILE_COHORT_RETENTION_ENABLED true
+#endif
+
+#if PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR)
+#define DEFAULT_ACCELERATED_DRAWING_ENABLED true
+#else
+#define DEFAULT_ACCELERATED_DRAWING_ENABLED false
+#endif
+
+#if PLATFORM(IOS) && PLATFORM(IOS_SIMULATOR)
+#define DEFAULT_CANVAS_USES_ACCELERATED_DRAWING false
+#else
+#define DEFAULT_CANVAS_USES_ACCELERATED_DRAWING true
+#endif
+
+#define FOR_EACH_WEBKIT_BOOL_PREFERENCE(macro) \
+ macro(JavaScriptEnabled, javaScriptEnabled, Bool, bool, true) \
+ macro(JavaScriptMarkupEnabled, javaScriptMarkupEnabled, Bool, bool, true) \
+ macro(LoadsImagesAutomatically, loadsImagesAutomatically, Bool, bool, true) \
+ macro(LoadsSiteIconsIgnoringImageLoadingPreference, loadsSiteIconsIgnoringImageLoadingPreference, Bool, bool, false) \
+ macro(PluginsEnabled, pluginsEnabled, Bool, bool, false) \
+ macro(JavaEnabled, javaEnabled, Bool, bool, false) \
+ macro(JavaEnabledForLocalFiles, javaEnabledForLocalFiles, Bool, bool, false) \
+ macro(OfflineWebApplicationCacheEnabled, offlineWebApplicationCacheEnabled, Bool, bool, false) \
+ macro(LocalStorageEnabled, localStorageEnabled, Bool, bool, true) \
+ macro(DatabasesEnabled, databasesEnabled, Bool, bool, true) \
+ macro(XSSAuditorEnabled, xssAuditorEnabled, Bool, bool, true) \
+ macro(FrameFlatteningEnabled, frameFlatteningEnabled, Bool, bool, DEFAULT_FRAME_FLATTENING_ENABLED) \
+ macro(DeveloperExtrasEnabled, developerExtrasEnabled, Bool, bool, false) \
+ macro(JavaScriptExperimentsEnabled, javaScriptExperimentsEnabled, Bool, bool, false) \
+ macro(PrivateBrowsingEnabled, privateBrowsingEnabled, Bool, bool, false) \
+ macro(TextAreasAreResizable, textAreasAreResizable, Bool, bool, DEFAULT_TEXT_AREAS_ARE_RESIZABLE) \
+ macro(JavaScriptCanOpenWindowsAutomatically, javaScriptCanOpenWindowsAutomatically, Bool, bool, DEFAULT_JAVASCRIPT_CAN_OPEN_WINDOWS_AUTOMATICALLY) \
+ macro(HyperlinkAuditingEnabled, hyperlinkAuditingEnabled, Bool, bool, true) \
+ macro(NeedsSiteSpecificQuirks, needsSiteSpecificQuirks, Bool, bool, false) \
+ macro(AcceleratedCompositingEnabled, acceleratedCompositingEnabled, Bool, bool, true) \
+ macro(ForceCompositingMode, forceCompositingMode, Bool, bool, false) \
+ macro(AcceleratedDrawingEnabled, acceleratedDrawingEnabled, Bool, bool, DEFAULT_ACCELERATED_DRAWING_ENABLED) \
+ macro(CanvasUsesAcceleratedDrawing, canvasUsesAcceleratedDrawing, Bool, bool, DEFAULT_CANVAS_USES_ACCELERATED_DRAWING) \
+ macro(CompositingBordersVisible, compositingBordersVisible, Bool, bool, false) \
+ macro(CompositingRepaintCountersVisible, compositingRepaintCountersVisible, Bool, bool, false) \
+ macro(TiledScrollingIndicatorVisible, tiledScrollingIndicatorVisible, Bool, bool, false) \
+ macro(WebGLEnabled, webGLEnabled, Bool, bool, true) \
+ macro(MultithreadedWebGLEnabled, multithreadedWebGLEnabled, Bool, bool, false) \
+ macro(ForceSoftwareWebGLRendering, forceSoftwareWebGLRendering, Bool, bool, false) \
+ macro(Accelerated2dCanvasEnabled, accelerated2dCanvasEnabled, Bool, bool, false) \
+ macro(CSSRegionsEnabled, cssRegionsEnabled, Bool, bool, true) \
+ macro(CSSCompositingEnabled, cssCompositingEnabled, Bool, bool, true) \
+ macro(ForceFTPDirectoryListings, forceFTPDirectoryListings, Bool, bool, false) \
+ macro(TabsToLinks, tabsToLinks, Bool, bool, DEFAULT_WEBKIT_TABSTOLINKS_ENABLED) \
+ macro(DNSPrefetchingEnabled, dnsPrefetchingEnabled, Bool, bool, false) \
+ macro(WebArchiveDebugModeEnabled, webArchiveDebugModeEnabled, Bool, bool, false) \
+ macro(LocalFileContentSniffingEnabled, localFileContentSniffingEnabled, Bool, bool, false) \
+ macro(UsesPageCache, usesPageCache, Bool, bool, true) \
+ macro(PageCacheSupportsPlugins, pageCacheSupportsPlugins, Bool, bool, true) \
+ macro(AuthorAndUserStylesEnabled, authorAndUserStylesEnabled, Bool, bool, true) \
+ macro(PaginateDuringLayoutEnabled, paginateDuringLayoutEnabled, Bool, bool, false) \
+ macro(DOMPasteAllowed, domPasteAllowed, Bool, bool, false) \
+ macro(JavaScriptCanAccessClipboard, javaScriptCanAccessClipboard, Bool, bool, false) \
+ macro(ShouldPrintBackgrounds, shouldPrintBackgrounds, Bool, bool, DEFAULT_SHOULD_PRINT_BACKGROUNDS) \
+ macro(FullScreenEnabled, fullScreenEnabled, Bool, bool, false) \
+ macro(AsynchronousSpellCheckingEnabled, asynchronousSpellCheckingEnabled, Bool, bool, false) \
+ macro(WebSecurityEnabled, webSecurityEnabled, Bool, bool, true) \
+ macro(AllowUniversalAccessFromFileURLs, allowUniversalAccessFromFileURLs, Bool, bool, false) \
+ macro(AllowFileAccessFromFileURLs, allowFileAccessFromFileURLs, Bool, bool, false) \
+ macro(AVFoundationEnabled, isAVFoundationEnabled, Bool, bool, true) \
+ macro(MediaPlaybackRequiresUserGesture, mediaPlaybackRequiresUserGesture, Bool, bool, DEFAULT_MEDIA_PLAYBACK_REQUIRES_USER_GESTURE) \
+ macro(MediaPlaybackAllowsInline, mediaPlaybackAllowsInline, Bool, bool, DEFAULT_MEDIA_PLAYBACK_ALLOWS_INLINE) \
+ macro(MediaPlaybackAllowsAirPlay, mediaPlaybackAllowsAirPlay, Bool, bool, true) \
+ macro(InspectorStartsAttached, inspectorStartsAttached, Bool, bool, true) \
+ macro(ShowsToolTipOverTruncatedText, showsToolTipOverTruncatedText, Bool, bool, false) \
+ macro(MockScrollbarsEnabled, mockScrollbarsEnabled, Bool, bool, false) \
+ macro(WebAudioEnabled, webAudioEnabled, Bool, bool, true) \
+ macro(ApplicationChromeModeEnabled, applicationChromeMode, Bool, bool, false) \
+ macro(SuppressesIncrementalRendering, suppressesIncrementalRendering, Bool, bool, false) \
+ macro(BackspaceKeyNavigationEnabled, backspaceKeyNavigationEnabled, Bool, bool, true) \
+ macro(CaretBrowsingEnabled, caretBrowsingEnabled, Bool, bool, false) \
+ macro(ShouldDisplaySubtitles, shouldDisplaySubtitles, Bool, bool, false) \
+ macro(ShouldDisplayCaptions, shouldDisplayCaptions, Bool, bool, false) \
+ macro(ShouldDisplayTextDescriptions, shouldDisplayTextDescriptions, Bool, bool, false) \
+ macro(NotificationsEnabled, notificationsEnabled, Bool, bool, true) \
+ macro(ShouldRespectImageOrientation, shouldRespectImageOrientation, Bool, bool, DEFAULT_SHOULD_RESPECT_IMAGE_ORIENTATION) \
+ macro(WantsBalancedSetDefersLoadingBehavior, wantsBalancedSetDefersLoadingBehavior, Bool, bool, false) \
+ macro(RequestAnimationFrameEnabled, requestAnimationFrameEnabled, Bool, bool, true) \
+ macro(DiagnosticLoggingEnabled, diagnosticLoggingEnabled, Bool, bool, false) \
+ macro(AsynchronousPluginInitializationEnabled, asynchronousPluginInitializationEnabled, Bool, bool, false) \
+ macro(AsynchronousPluginInitializationEnabledForAllPlugins, asynchronousPluginInitializationEnabledForAllPlugins, Bool, bool, false) \
+ macro(ArtificialPluginInitializationDelayEnabled, artificialPluginInitializationDelayEnabled, Bool, bool, false) \
+ macro(TabToLinksEnabled, tabToLinksEnabled, Bool, bool, false) \
+ macro(InteractiveFormValidationEnabled, interactiveFormValidationEnabled, Bool, bool, false) \
+ macro(ScrollingPerformanceLoggingEnabled, scrollingPerformanceLoggingEnabled, Bool, bool, false) \
+ macro(ScrollAnimatorEnabled, scrollAnimatorEnabled, Bool, bool, DEFAULT_WEBKIT_SCROLL_ANIMATOR_ENABLED) \
+ macro(ScreenFontSubstitutionEnabled, screenFontSubstitutionEnabled, Bool, bool, DEFAULT_SCREEN_FONT_SUBSTITUTION_ENABLED) \
+ macro(CookieEnabled, cookieEnabled, Bool, bool, true) \
+ macro(PlugInSnapshottingEnabled, plugInSnapshottingEnabled, Bool, bool, false) \
+ macro(SnapshotAllPlugIns, snapshotAllPlugIns, Bool, bool, false) \
+ macro(AutostartOriginPlugInSnapshottingEnabled, autostartOriginPlugInSnapshottingEnabled, Bool, bool, true) \
+ macro(PrimaryPlugInSnapshotDetectionEnabled, primaryPlugInSnapshotDetectionEnabled, Bool, bool, true) \
+ macro(PDFPluginEnabled, pdfPluginEnabled, Bool, bool, DEFAULT_PDFPLUGIN_ENABLED) \
+ macro(UsesEncodingDetector, usesEncodingDetector, Bool, bool, false) \
+ macro(TextAutosizingEnabled, textAutosizingEnabled, Bool, bool, false) \
+ macro(AggressiveTileRetentionEnabled, aggressiveTileRetentionEnabled, Bool, bool, false) \
+ macro(TemporaryTileCohortRetentionEnabled, temporaryTileCohortRetentionEnabled, Bool, bool, DEFAULT_TEMPORARY_TILE_COHORT_RETENTION_ENABLED) \
+ macro(QTKitEnabled, isQTKitEnabled, Bool, bool, true) \
+ macro(LogsPageMessagesToSystemConsoleEnabled, logsPageMessagesToSystemConsoleEnabled, Bool, bool, false) \
+ macro(PageVisibilityBasedProcessSuppressionEnabled, pageVisibilityBasedProcessSuppressionEnabled, Bool, bool, true) \
+ macro(SmartInsertDeleteEnabled, smartInsertDeleteEnabled, Bool, bool, true) \
+ macro(SelectTrailingWhitespaceEnabled, selectTrailingWhitespaceEnabled, Bool, bool, false) \
+ macro(ShowsURLsInToolTipsEnabled, showsURLsInToolTipsEnabled, Bool, bool, false) \
+ macro(AcceleratedCompositingForOverflowScrollEnabled, acceleratedCompositingForOverflowScrollEnabled, Bool, bool, false) \
+ macro(HiddenPageDOMTimerThrottlingEnabled, hiddenPageDOMTimerThrottlingEnabled, Bool, bool, DEFAULT_HIDDEN_PAGE_DOM_TIMER_THROTTLING_ENABLED) \
+ macro(HiddenPageCSSAnimationSuspensionEnabled, hiddenPageCSSAnimationSuspensionEnabled, Bool, bool, DEFAULT_HIDDEN_PAGE_CSS_ANIMATION_SUSPENSION_ENABLED) \
+ macro(LowPowerVideoAudioBufferSizeEnabled, lowPowerVideoAudioBufferSizeEnabled, Bool, bool, false) \
+ macro(ThreadedScrollingEnabled, threadedScrollingEnabled, Bool, bool, true) \
+ macro(SimpleLineLayoutEnabled, simpleLineLayoutEnabled, Bool, bool, true) \
+ macro(SimpleLineLayoutDebugBordersEnabled, simpleLineLayoutDebugBordersEnabled, Bool, bool, false) \
+ macro(SubpixelCSSOMElementMetricsEnabled, subpixelCSSOMElementMetricsEnabled, Bool, bool, true) \
+ macro(BackgroundShouldExtendBeyondPage, backgroundShouldExtendBeyondPage, Bool, bool, false) \
+ macro(MediaStreamEnabled, mediaStreamEnabled, Bool, bool, false) \
+ macro(UseLegacyTextAlignPositionedElementBehavior, useLegacyTextAlignPositionedElementBehavior, Bool, bool, false) \
+ macro(SpatialNavigationEnabled, spatialNavigationEnabled, Bool, bool, false) \
+ macro(MediaSourceEnabled, mediaSourceEnabled, Bool, bool, true) \
+ macro(ViewGestureDebuggingEnabled, viewGestureDebuggingEnabled, Bool, bool, false) \
+ macro(ShouldConvertPositionStyleOnCopy, shouldConvertPositionStyleOnCopy, Bool, bool, false) \
+ 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) \
+ macro(ImageControlsEnabled, imageControlsEnabled, Bool, bool, false) \
+ macro(EnableInheritURIQueryComponent, enableInheritURIQueryComponent, Bool, bool, false) \
+ macro(ServiceControlsEnabled, serviceControlsEnabled, Bool, bool, false) \
+
+#define FOR_EACH_WEBKIT_DOUBLE_PREFERENCE(macro) \
+ macro(PDFScaleFactor, pdfScaleFactor, Double, double, 0) \
+ macro(IncrementalRenderingSuppressionTimeout, incrementalRenderingSuppressionTimeout, Double, double, 5) \
+ macro(MinimumFontSize, minimumFontSize, Double, double, 0) \
+ macro(MinimumLogicalFontSize, minimumLogicalFontSize, Double, double, 9) \
+ macro(MinimumZoomFontSize, minimumZoomFontSize, Double, double, DEFAULT_MINIMUM_FONT_ZOOM_SIZE) \
+ macro(DefaultFontSize, defaultFontSize, Double, double, 16) \
+ macro(DefaultFixedFontSize, defaultFixedFontSize, Double, double, 13) \
+ macro(LayoutInterval, layoutInterval, Double, double, -1) \
+ macro(MaxParseDuration, maxParseDuration, Double, double, -1) \
+ macro(PasswordEchoDuration, passwordEchoDuration, Double, double, 2) \
+ \
+
+#define FOR_EACH_WEBKIT_UINT32_PREFERENCE(macro) \
+ macro(FontSmoothingLevel, fontSmoothingLevel, UInt32, uint32_t, FontSmoothingLevelMedium) \
+ macro(LayoutFallbackWidth, layoutFallbackWidth, UInt32, uint32_t, 980) \
+ macro(DeviceWidth, deviceWidth, UInt32, uint32_t, 0) \
+ macro(DeviceHeight, deviceHeight, UInt32, uint32_t, 0) \
+ macro(PDFDisplayMode, pdfDisplayMode, UInt32, uint32_t, 1) \
+ macro(EditableLinkBehavior, editableLinkBehavior, UInt32, uint32_t, WebCore::EditableLinkNeverLive) \
+ macro(InspectorAttachedHeight, inspectorAttachedHeight, UInt32, uint32_t, 300) \
+ macro(InspectorAttachedWidth, inspectorAttachedWidth, UInt32, uint32_t, 750) \
+ macro(InspectorAttachmentSide, inspectorAttachmentSide, UInt32, uint32_t, 0) \
+ macro(StorageBlockingPolicy, storageBlockingPolicy, UInt32, uint32_t, WebCore::SecurityOrigin::BlockThirdPartyStorage) \
+ \
+
+#if PLATFORM(COCOA)
+
+#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
+
+
+#define FOR_EACH_WEBKIT_FONT_FAMILY_PREFERENCE(macro) \
+ macro(StandardFontFamily, standardFontFamily, String, String, "Times") \
+ macro(CursiveFontFamily, cursiveFontFamily, String, String, DEFAULT_CURSIVE_FONT_FAMILY) \
+ macro(FantasyFontFamily, fantasyFontFamily, String, String, "Papyrus") \
+ macro(FixedFontFamily, fixedFontFamily, String, String, "Courier") \
+ macro(SansSerifFontFamily, sansSerifFontFamily, String, String, "Helvetica") \
+ macro(SerifFontFamily, serifFontFamily, String, String, "Times") \
+ macro(PictographFontFamily, pictographFontFamily, String, String, "Apple Color Emoji") \
+ \
+
+#elif PLATFORM(GTK) || PLATFORM(EFL)
+
+#define FOR_EACH_WEBKIT_FONT_FAMILY_PREFERENCE(macro) \
+ macro(StandardFontFamily, standardFontFamily, String, String, "Times") \
+ macro(CursiveFontFamily, cursiveFontFamily, String, String, "Comic Sans MS") \
+ macro(FantasyFontFamily, fantasyFontFamily, String, String, "Impact") \
+ macro(FixedFontFamily, fixedFontFamily, String, String, "Courier New") \
+ macro(SansSerifFontFamily, sansSerifFontFamily, String, String, "Helvetica") \
+ macro(SerifFontFamily, serifFontFamily, String, String, "Times") \
+ macro(PictographFontFamily, pictographFontFamily, String, String, "Times") \
+ \
+
+#endif
+
+#define FOR_EACH_WEBKIT_STRING_PREFERENCE(macro) \
+ FOR_EACH_WEBKIT_FONT_FAMILY_PREFERENCE(macro) \
+ macro(DefaultTextEncodingName, defaultTextEncodingName, String, String, "ISO-8859-1") \
+ macro(FTPDirectoryTemplatePath, ftpDirectoryTemplatePath, String, String, "") \
+ \
+
+#define FOR_EACH_WEBKIT_STRING_PREFERENCE_NOT_IN_WEBCORE(macro) \
+ macro(InspectorWindowFrame, inspectorWindowFrame, String, String, "") \
+ \
+
+#define FOR_EACH_WEBKIT_PREFERENCE(macro) \
+ FOR_EACH_WEBKIT_BOOL_PREFERENCE(macro) \
+ FOR_EACH_WEBKIT_DOUBLE_PREFERENCE(macro) \
+ FOR_EACH_WEBKIT_UINT32_PREFERENCE(macro) \
+ FOR_EACH_WEBKIT_STRING_PREFERENCE(macro) \
+ FOR_EACH_WEBKIT_STRING_PREFERENCE_NOT_IN_WEBCORE(macro) \
+ \
+
+
+#endif // WebPreferencesDefinitions_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesKeyscppfromrev169356trunkSourceWebKit2SharedWebPreferencesStorecpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Shared/WebPreferencesKeys.cpp (from rev 169356, trunk/Source/WebKit2/Shared/WebPreferencesStore.cpp) (0 => 169394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesKeys.cpp (rev 0)
+++ trunk/Source/WebKit2/Shared/WebPreferencesKeys.cpp 2014-05-27 18:35:12 UTC (rev 169394)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+/*
+ * Copyright (C) 2010, 2011 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "WebPreferencesKeys.h"
+
+#include <wtf/NeverDestroyed.h>
+
+namespace WebKit {
+namespace WebPreferencesKey {
+
+#define DEFINE_KEY_GETTERS(KeyUpper, KeyLower, TypeName, Type, DefaultValue) \
+ const String& KeyLower##Key() \
+ { \
+ static NeverDestroyed<String> key(ASCIILiteral(#KeyUpper)); \
+ return key; \
+ }
+
+ FOR_EACH_WEBKIT_PREFERENCE(DEFINE_KEY_GETTERS)
+
+#undef DEFINE_KEY_GETTERS
+
+} // namespace WebPreferencesKey
+} // namespace WebKit
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesKeyshfromrev169357trunkSourceWebKit2SharedWebPreferencesStoreh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Shared/WebPreferencesKeys.h (from rev 169357, trunk/Source/WebKit2/Shared/WebPreferencesStore.h) (0 => 169394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesKeys.h (rev 0)
+++ trunk/Source/WebKit2/Shared/WebPreferencesKeys.h 2014-05-27 18:35:12 UTC (rev 169394)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+/*
+ * Copyright (C) 2010, 2011, 2012 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebPreferencesKeys_h
+#define WebPreferencesKeys_h
+
+#include "WebPreferencesDefinitions.h"
+#include <wtf/text/WTFString.h>
+
+namespace WebKit {
+namespace WebPreferencesKey {
+
+#define DECLARE_KEY_GETTERS(KeyUpper, KeyLower, TypeName, Type, DefaultValue) const String& KeyLower##Key();
+
+FOR_EACH_WEBKIT_PREFERENCE(DECLARE_KEY_GETTERS)
+
+#undef DECLARE_KEY_GETTERS
+
+} // namespace WebPreferencesKey
+} // namespace WebKit
+
+#endif // WebPreferencesKeys_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesStore.cpp (169393 => 169394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesStore.cpp 2014-05-27 18:31:56 UTC (rev 169393)
+++ trunk/Source/WebKit2/Shared/WebPreferencesStore.cpp 2014-05-27 18:35:12 UTC (rev 169394)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "FontSmoothingLevel.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><ins>+#include "WebPreferencesKeys.h"
</ins><span class="cx"> #include <WebCore/Settings.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><span class="lines">@@ -37,21 +38,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-namespace WebPreferencesKey {
-
-#define DEFINE_KEY_GETTERS(KeyUpper, KeyLower, TypeName, Type, DefaultValue) \
- const String& KeyLower##Key() \
- { \
- static NeverDestroyed<String> key(ASCIILiteral(#KeyUpper)); \
- return key; \
- }
-
- FOR_EACH_WEBKIT_PREFERENCE(DEFINE_KEY_GETTERS)
-
-#undef DEFINE_KEY_GETTERS
-
-} // namespace WebPreferencesKey
-
</del><span class="cx"> typedef HashMap<String, bool> BoolOverridesMap;
</span><span class="cx">
</span><span class="cx"> static BoolOverridesMap& boolTestRunnerOverridesMap()
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesStore.h (169393 => 169394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2014-05-27 18:31:56 UTC (rev 169393)
+++ trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2014-05-27 18:35:12 UTC (rev 169394)
</span><span class="lines">@@ -28,287 +28,12 @@
</span><span class="cx">
</span><span class="cx"> #include "ArgumentDecoder.h"
</span><span class="cx"> #include "ArgumentEncoder.h"
</span><del>-#include <WebCore/SecurityOrigin.h>
</del><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-// macro(KeyUpper, KeyLower, TypeNameUpper, TypeName, DefaultValue)
-
-#if PLATFORM(GTK)
-#define DEFAULT_WEBKIT_TABSTOLINKS_ENABLED true
-#else
-#define DEFAULT_WEBKIT_TABSTOLINKS_ENABLED false
-#endif
-
-#if ENABLE(SMOOTH_SCROLLING)
-#define DEFAULT_WEBKIT_SCROLL_ANIMATOR_ENABLED true
-#else
-#define DEFAULT_WEBKIT_SCROLL_ANIMATOR_ENABLED false
-#endif
-
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
-#define DEFAULT_SCREEN_FONT_SUBSTITUTION_ENABLED false
-#else
-#define DEFAULT_SCREEN_FONT_SUBSTITUTION_ENABLED true
-#endif
-
-#if PLATFORM(COCOA)
-#define DEFAULT_HIDDEN_PAGE_DOM_TIMER_THROTTLING_ENABLED true
-#define DEFAULT_HIDDEN_PAGE_CSS_ANIMATION_SUSPENSION_ENABLED true
-#define DEFAULT_PDFPLUGIN_ENABLED true
-#else
-#define DEFAULT_HIDDEN_PAGE_DOM_TIMER_THROTTLING_ENABLED false
-#define DEFAULT_HIDDEN_PAGE_CSS_ANIMATION_SUSPENSION_ENABLED false
-#define DEFAULT_PDFPLUGIN_ENABLED false
-#endif
-
-#if PLATFORM(IOS)
-#define DEFAULT_FRAME_FLATTENING_ENABLED true
-#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
-#define DEFAULT_MEDIA_PLAYBACK_ALLOWS_INLINE false
-#define DEFAULT_MEDIA_PLAYBACK_REQUIRES_USER_GESTURE true
-#define DEFAULT_TEMPORARY_TILE_COHORT_RETENTION_ENABLED false
-#else
-#define DEFAULT_FRAME_FLATTENING_ENABLED false
-#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
-#define DEFAULT_MEDIA_PLAYBACK_ALLOWS_INLINE true
-#define DEFAULT_MEDIA_PLAYBACK_REQUIRES_USER_GESTURE false
-#define DEFAULT_TEMPORARY_TILE_COHORT_RETENTION_ENABLED true
-#endif
-
-#if PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR)
-#define DEFAULT_ACCELERATED_DRAWING_ENABLED true
-#else
-#define DEFAULT_ACCELERATED_DRAWING_ENABLED false
-#endif
-
-#if PLATFORM(IOS) && PLATFORM(IOS_SIMULATOR)
-#define DEFAULT_CANVAS_USES_ACCELERATED_DRAWING false
-#else
-#define DEFAULT_CANVAS_USES_ACCELERATED_DRAWING true
-#endif
-
-#define FOR_EACH_WEBKIT_BOOL_PREFERENCE(macro) \
- macro(JavaScriptEnabled, javaScriptEnabled, Bool, bool, true) \
- macro(JavaScriptMarkupEnabled, javaScriptMarkupEnabled, Bool, bool, true) \
- macro(LoadsImagesAutomatically, loadsImagesAutomatically, Bool, bool, true) \
- macro(LoadsSiteIconsIgnoringImageLoadingPreference, loadsSiteIconsIgnoringImageLoadingPreference, Bool, bool, false) \
- macro(PluginsEnabled, pluginsEnabled, Bool, bool, false) \
- macro(JavaEnabled, javaEnabled, Bool, bool, false) \
- macro(JavaEnabledForLocalFiles, javaEnabledForLocalFiles, Bool, bool, false) \
- macro(OfflineWebApplicationCacheEnabled, offlineWebApplicationCacheEnabled, Bool, bool, false) \
- macro(LocalStorageEnabled, localStorageEnabled, Bool, bool, true) \
- macro(DatabasesEnabled, databasesEnabled, Bool, bool, true) \
- macro(XSSAuditorEnabled, xssAuditorEnabled, Bool, bool, true) \
- macro(FrameFlatteningEnabled, frameFlatteningEnabled, Bool, bool, DEFAULT_FRAME_FLATTENING_ENABLED) \
- macro(DeveloperExtrasEnabled, developerExtrasEnabled, Bool, bool, false) \
- macro(JavaScriptExperimentsEnabled, javaScriptExperimentsEnabled, Bool, bool, false) \
- macro(PrivateBrowsingEnabled, privateBrowsingEnabled, Bool, bool, false) \
- macro(TextAreasAreResizable, textAreasAreResizable, Bool, bool, DEFAULT_TEXT_AREAS_ARE_RESIZABLE) \
- macro(JavaScriptCanOpenWindowsAutomatically, javaScriptCanOpenWindowsAutomatically, Bool, bool, DEFAULT_JAVASCRIPT_CAN_OPEN_WINDOWS_AUTOMATICALLY) \
- macro(HyperlinkAuditingEnabled, hyperlinkAuditingEnabled, Bool, bool, true) \
- macro(NeedsSiteSpecificQuirks, needsSiteSpecificQuirks, Bool, bool, false) \
- macro(AcceleratedCompositingEnabled, acceleratedCompositingEnabled, Bool, bool, true) \
- macro(ForceCompositingMode, forceCompositingMode, Bool, bool, false) \
- macro(AcceleratedDrawingEnabled, acceleratedDrawingEnabled, Bool, bool, DEFAULT_ACCELERATED_DRAWING_ENABLED) \
- macro(CanvasUsesAcceleratedDrawing, canvasUsesAcceleratedDrawing, Bool, bool, DEFAULT_CANVAS_USES_ACCELERATED_DRAWING) \
- macro(CompositingBordersVisible, compositingBordersVisible, Bool, bool, false) \
- macro(CompositingRepaintCountersVisible, compositingRepaintCountersVisible, Bool, bool, false) \
- macro(TiledScrollingIndicatorVisible, tiledScrollingIndicatorVisible, Bool, bool, false) \
- macro(WebGLEnabled, webGLEnabled, Bool, bool, true) \
- macro(MultithreadedWebGLEnabled, multithreadedWebGLEnabled, Bool, bool, false) \
- macro(ForceSoftwareWebGLRendering, forceSoftwareWebGLRendering, Bool, bool, false) \
- macro(Accelerated2dCanvasEnabled, accelerated2dCanvasEnabled, Bool, bool, false) \
- macro(CSSRegionsEnabled, cssRegionsEnabled, Bool, bool, true) \
- macro(CSSCompositingEnabled, cssCompositingEnabled, Bool, bool, true) \
- macro(ForceFTPDirectoryListings, forceFTPDirectoryListings, Bool, bool, false) \
- macro(TabsToLinks, tabsToLinks, Bool, bool, DEFAULT_WEBKIT_TABSTOLINKS_ENABLED) \
- macro(DNSPrefetchingEnabled, dnsPrefetchingEnabled, Bool, bool, false) \
- macro(WebArchiveDebugModeEnabled, webArchiveDebugModeEnabled, Bool, bool, false) \
- macro(LocalFileContentSniffingEnabled, localFileContentSniffingEnabled, Bool, bool, false) \
- macro(UsesPageCache, usesPageCache, Bool, bool, true) \
- macro(PageCacheSupportsPlugins, pageCacheSupportsPlugins, Bool, bool, true) \
- macro(AuthorAndUserStylesEnabled, authorAndUserStylesEnabled, Bool, bool, true) \
- macro(PaginateDuringLayoutEnabled, paginateDuringLayoutEnabled, Bool, bool, false) \
- macro(DOMPasteAllowed, domPasteAllowed, Bool, bool, false) \
- macro(JavaScriptCanAccessClipboard, javaScriptCanAccessClipboard, Bool, bool, false) \
- macro(ShouldPrintBackgrounds, shouldPrintBackgrounds, Bool, bool, DEFAULT_SHOULD_PRINT_BACKGROUNDS) \
- macro(FullScreenEnabled, fullScreenEnabled, Bool, bool, false) \
- macro(AsynchronousSpellCheckingEnabled, asynchronousSpellCheckingEnabled, Bool, bool, false) \
- macro(WebSecurityEnabled, webSecurityEnabled, Bool, bool, true) \
- macro(AllowUniversalAccessFromFileURLs, allowUniversalAccessFromFileURLs, Bool, bool, false) \
- macro(AllowFileAccessFromFileURLs, allowFileAccessFromFileURLs, Bool, bool, false) \
- macro(AVFoundationEnabled, isAVFoundationEnabled, Bool, bool, true) \
- macro(MediaPlaybackRequiresUserGesture, mediaPlaybackRequiresUserGesture, Bool, bool, DEFAULT_MEDIA_PLAYBACK_REQUIRES_USER_GESTURE) \
- macro(MediaPlaybackAllowsInline, mediaPlaybackAllowsInline, Bool, bool, DEFAULT_MEDIA_PLAYBACK_ALLOWS_INLINE) \
- macro(MediaPlaybackAllowsAirPlay, mediaPlaybackAllowsAirPlay, Bool, bool, true) \
- macro(InspectorStartsAttached, inspectorStartsAttached, Bool, bool, true) \
- macro(ShowsToolTipOverTruncatedText, showsToolTipOverTruncatedText, Bool, bool, false) \
- macro(MockScrollbarsEnabled, mockScrollbarsEnabled, Bool, bool, false) \
- macro(WebAudioEnabled, webAudioEnabled, Bool, bool, true) \
- macro(ApplicationChromeModeEnabled, applicationChromeMode, Bool, bool, false) \
- macro(SuppressesIncrementalRendering, suppressesIncrementalRendering, Bool, bool, false) \
- macro(BackspaceKeyNavigationEnabled, backspaceKeyNavigationEnabled, Bool, bool, true) \
- macro(CaretBrowsingEnabled, caretBrowsingEnabled, Bool, bool, false) \
- macro(ShouldDisplaySubtitles, shouldDisplaySubtitles, Bool, bool, false) \
- macro(ShouldDisplayCaptions, shouldDisplayCaptions, Bool, bool, false) \
- macro(ShouldDisplayTextDescriptions, shouldDisplayTextDescriptions, Bool, bool, false) \
- macro(NotificationsEnabled, notificationsEnabled, Bool, bool, true) \
- macro(ShouldRespectImageOrientation, shouldRespectImageOrientation, Bool, bool, DEFAULT_SHOULD_RESPECT_IMAGE_ORIENTATION) \
- macro(WantsBalancedSetDefersLoadingBehavior, wantsBalancedSetDefersLoadingBehavior, Bool, bool, false) \
- macro(RequestAnimationFrameEnabled, requestAnimationFrameEnabled, Bool, bool, true) \
- macro(DiagnosticLoggingEnabled, diagnosticLoggingEnabled, Bool, bool, false) \
- macro(AsynchronousPluginInitializationEnabled, asynchronousPluginInitializationEnabled, Bool, bool, false) \
- macro(AsynchronousPluginInitializationEnabledForAllPlugins, asynchronousPluginInitializationEnabledForAllPlugins, Bool, bool, false) \
- macro(ArtificialPluginInitializationDelayEnabled, artificialPluginInitializationDelayEnabled, Bool, bool, false) \
- macro(TabToLinksEnabled, tabToLinksEnabled, Bool, bool, false) \
- macro(InteractiveFormValidationEnabled, interactiveFormValidationEnabled, Bool, bool, false) \
- macro(ScrollingPerformanceLoggingEnabled, scrollingPerformanceLoggingEnabled, Bool, bool, false) \
- macro(ScrollAnimatorEnabled, scrollAnimatorEnabled, Bool, bool, DEFAULT_WEBKIT_SCROLL_ANIMATOR_ENABLED) \
- macro(ScreenFontSubstitutionEnabled, screenFontSubstitutionEnabled, Bool, bool, DEFAULT_SCREEN_FONT_SUBSTITUTION_ENABLED) \
- macro(CookieEnabled, cookieEnabled, Bool, bool, true) \
- macro(PlugInSnapshottingEnabled, plugInSnapshottingEnabled, Bool, bool, false) \
- macro(SnapshotAllPlugIns, snapshotAllPlugIns, Bool, bool, false) \
- macro(AutostartOriginPlugInSnapshottingEnabled, autostartOriginPlugInSnapshottingEnabled, Bool, bool, true) \
- macro(PrimaryPlugInSnapshotDetectionEnabled, primaryPlugInSnapshotDetectionEnabled, Bool, bool, true) \
- macro(PDFPluginEnabled, pdfPluginEnabled, Bool, bool, DEFAULT_PDFPLUGIN_ENABLED) \
- macro(UsesEncodingDetector, usesEncodingDetector, Bool, bool, false) \
- macro(TextAutosizingEnabled, textAutosizingEnabled, Bool, bool, false) \
- macro(AggressiveTileRetentionEnabled, aggressiveTileRetentionEnabled, Bool, bool, false) \
- macro(TemporaryTileCohortRetentionEnabled, temporaryTileCohortRetentionEnabled, Bool, bool, DEFAULT_TEMPORARY_TILE_COHORT_RETENTION_ENABLED) \
- macro(QTKitEnabled, isQTKitEnabled, Bool, bool, true) \
- macro(LogsPageMessagesToSystemConsoleEnabled, logsPageMessagesToSystemConsoleEnabled, Bool, bool, false) \
- macro(PageVisibilityBasedProcessSuppressionEnabled, pageVisibilityBasedProcessSuppressionEnabled, Bool, bool, true) \
- macro(SmartInsertDeleteEnabled, smartInsertDeleteEnabled, Bool, bool, true) \
- macro(SelectTrailingWhitespaceEnabled, selectTrailingWhitespaceEnabled, Bool, bool, false) \
- macro(ShowsURLsInToolTipsEnabled, showsURLsInToolTipsEnabled, Bool, bool, false) \
- macro(AcceleratedCompositingForOverflowScrollEnabled, acceleratedCompositingForOverflowScrollEnabled, Bool, bool, false) \
- macro(HiddenPageDOMTimerThrottlingEnabled, hiddenPageDOMTimerThrottlingEnabled, Bool, bool, DEFAULT_HIDDEN_PAGE_DOM_TIMER_THROTTLING_ENABLED) \
- macro(HiddenPageCSSAnimationSuspensionEnabled, hiddenPageCSSAnimationSuspensionEnabled, Bool, bool, DEFAULT_HIDDEN_PAGE_CSS_ANIMATION_SUSPENSION_ENABLED) \
- macro(LowPowerVideoAudioBufferSizeEnabled, lowPowerVideoAudioBufferSizeEnabled, Bool, bool, false) \
- macro(ThreadedScrollingEnabled, threadedScrollingEnabled, Bool, bool, true) \
- macro(SimpleLineLayoutEnabled, simpleLineLayoutEnabled, Bool, bool, true) \
- macro(SimpleLineLayoutDebugBordersEnabled, simpleLineLayoutDebugBordersEnabled, Bool, bool, false) \
- macro(SubpixelCSSOMElementMetricsEnabled, subpixelCSSOMElementMetricsEnabled, Bool, bool, true) \
- macro(BackgroundShouldExtendBeyondPage, backgroundShouldExtendBeyondPage, Bool, bool, false) \
- macro(MediaStreamEnabled, mediaStreamEnabled, Bool, bool, false) \
- macro(UseLegacyTextAlignPositionedElementBehavior, useLegacyTextAlignPositionedElementBehavior, Bool, bool, false) \
- macro(SpatialNavigationEnabled, spatialNavigationEnabled, Bool, bool, false) \
- macro(MediaSourceEnabled, mediaSourceEnabled, Bool, bool, true) \
- macro(ViewGestureDebuggingEnabled, viewGestureDebuggingEnabled, Bool, bool, false) \
- macro(ShouldConvertPositionStyleOnCopy, shouldConvertPositionStyleOnCopy, Bool, bool, false) \
- 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) \
- macro(ImageControlsEnabled, imageControlsEnabled, Bool, bool, false) \
- macro(EnableInheritURIQueryComponent, enableInheritURIQueryComponent, Bool, bool, false) \
- macro(ServiceControlsEnabled, serviceControlsEnabled, Bool, bool, false) \
-
-#define FOR_EACH_WEBKIT_DOUBLE_PREFERENCE(macro) \
- macro(PDFScaleFactor, pdfScaleFactor, Double, double, 0) \
- macro(IncrementalRenderingSuppressionTimeout, incrementalRenderingSuppressionTimeout, Double, double, 5) \
- macro(MinimumFontSize, minimumFontSize, Double, double, 0) \
- macro(MinimumLogicalFontSize, minimumLogicalFontSize, Double, double, 9) \
- macro(MinimumZoomFontSize, minimumZoomFontSize, Double, double, DEFAULT_MINIMUM_FONT_ZOOM_SIZE) \
- macro(DefaultFontSize, defaultFontSize, Double, double, 16) \
- macro(DefaultFixedFontSize, defaultFixedFontSize, Double, double, 13) \
- macro(LayoutInterval, layoutInterval, Double, double, -1) \
- macro(MaxParseDuration, maxParseDuration, Double, double, -1) \
- macro(PasswordEchoDuration, passwordEchoDuration, Double, double, 2) \
- \
-
-#define FOR_EACH_WEBKIT_UINT32_PREFERENCE(macro) \
- macro(FontSmoothingLevel, fontSmoothingLevel, UInt32, uint32_t, FontSmoothingLevelMedium) \
- macro(LayoutFallbackWidth, layoutFallbackWidth, UInt32, uint32_t, 980) \
- macro(DeviceWidth, deviceWidth, UInt32, uint32_t, 0) \
- macro(DeviceHeight, deviceHeight, UInt32, uint32_t, 0) \
- macro(PDFDisplayMode, pdfDisplayMode, UInt32, uint32_t, 1) \
- macro(EditableLinkBehavior, editableLinkBehavior, UInt32, uint32_t, WebCore::EditableLinkNeverLive) \
- macro(InspectorAttachedHeight, inspectorAttachedHeight, UInt32, uint32_t, 300) \
- macro(InspectorAttachedWidth, inspectorAttachedWidth, UInt32, uint32_t, 750) \
- macro(InspectorAttachmentSide, inspectorAttachmentSide, UInt32, uint32_t, 0) \
- macro(StorageBlockingPolicy, storageBlockingPolicy, UInt32, uint32_t, WebCore::SecurityOrigin::BlockThirdPartyStorage) \
- \
-
-#if PLATFORM(COCOA)
-
-#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
-
-
-#define FOR_EACH_WEBKIT_FONT_FAMILY_PREFERENCE(macro) \
- macro(StandardFontFamily, standardFontFamily, String, String, "Times") \
- macro(CursiveFontFamily, cursiveFontFamily, String, String, DEFAULT_CURSIVE_FONT_FAMILY) \
- macro(FantasyFontFamily, fantasyFontFamily, String, String, "Papyrus") \
- macro(FixedFontFamily, fixedFontFamily, String, String, "Courier") \
- macro(SansSerifFontFamily, sansSerifFontFamily, String, String, "Helvetica") \
- macro(SerifFontFamily, serifFontFamily, String, String, "Times") \
- macro(PictographFontFamily, pictographFontFamily, String, String, "Apple Color Emoji") \
- \
-
-#elif PLATFORM(GTK) || PLATFORM(EFL)
-
-#define FOR_EACH_WEBKIT_FONT_FAMILY_PREFERENCE(macro) \
- macro(StandardFontFamily, standardFontFamily, String, String, "Times") \
- macro(CursiveFontFamily, cursiveFontFamily, String, String, "Comic Sans MS") \
- macro(FantasyFontFamily, fantasyFontFamily, String, String, "Impact") \
- macro(FixedFontFamily, fixedFontFamily, String, String, "Courier New") \
- macro(SansSerifFontFamily, sansSerifFontFamily, String, String, "Helvetica") \
- macro(SerifFontFamily, serifFontFamily, String, String, "Times") \
- macro(PictographFontFamily, pictographFontFamily, String, String, "Times") \
- \
-
-#endif
-
-#define FOR_EACH_WEBKIT_STRING_PREFERENCE(macro) \
- FOR_EACH_WEBKIT_FONT_FAMILY_PREFERENCE(macro) \
- macro(DefaultTextEncodingName, defaultTextEncodingName, String, String, "ISO-8859-1") \
- macro(FTPDirectoryTemplatePath, ftpDirectoryTemplatePath, String, String, "") \
- \
-
-#define FOR_EACH_WEBKIT_STRING_PREFERENCE_NOT_IN_WEBCORE(macro) \
- macro(InspectorWindowFrame, inspectorWindowFrame, String, String, "") \
- \
-
-#define FOR_EACH_WEBKIT_PREFERENCE(macro) \
- FOR_EACH_WEBKIT_BOOL_PREFERENCE(macro) \
- FOR_EACH_WEBKIT_DOUBLE_PREFERENCE(macro) \
- FOR_EACH_WEBKIT_UINT32_PREFERENCE(macro) \
- FOR_EACH_WEBKIT_STRING_PREFERENCE(macro) \
- FOR_EACH_WEBKIT_STRING_PREFERENCE_NOT_IN_WEBCORE(macro) \
- \
-
-namespace WebPreferencesKey {
-
-#define DECLARE_KEY_GETTERS(KeyUpper, KeyLower, TypeName, Type, DefaultValue) const String& KeyLower##Key();
-
-FOR_EACH_WEBKIT_PREFERENCE(DECLARE_KEY_GETTERS)
-
-#undef DECLARE_KEY_GETTERS
-
-} // namespace WebPreferencesKey
-
</del><span class="cx"> struct WebPreferencesStore {
</span><span class="cx"> WebPreferencesStore();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPreferences.cpp (169393 => 169394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPreferences.cpp 2014-05-27 18:31:56 UTC (rev 169393)
+++ trunk/Source/WebKit2/UIProcess/WebPreferences.cpp 2014-05-27 18:35:12 UTC (rev 169394)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "WebContext.h"
</span><span class="cx"> #include "WebPageGroup.h"
</span><ins>+#include "WebPreferencesKeys.h"
</ins><span class="cx"> #include <wtf/ThreadingPrimitives.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPreferencesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPreferences.h (169393 => 169394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPreferences.h 2014-05-27 18:31:56 UTC (rev 169393)
+++ trunk/Source/WebKit2/UIProcess/WebPreferences.h 2014-05-27 18:35:12 UTC (rev 169394)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "APIObject.h"
</span><span class="cx"> #include "FontSmoothingLevel.h"
</span><ins>+#include "WebPreferencesDefinitions.h"
</ins><span class="cx"> #include "WebPreferencesStore.h"
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm (169393 => 169394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-05-27 18:31:56 UTC (rev 169393)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-05-27 18:35:12 UTC (rev 169394)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #import "WebKitSystemInterface.h"
</span><span class="cx"> #import "WebMemoryPressureHandlerIOS.h"
</span><span class="cx"> #import "WebPageGroup.h"
</span><ins>+#import "WebPreferencesKeys.h"
</ins><span class="cx"> #import "WebProcessCreationParameters.h"
</span><span class="cx"> #import "WebProcessMessages.h"
</span><span class="cx"> #import "WindowServerConnection.h"
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebPreferencesMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebPreferencesMac.mm (169393 => 169394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebPreferencesMac.mm 2014-05-27 18:31:56 UTC (rev 169393)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPreferencesMac.mm 2014-05-27 18:35:12 UTC (rev 169394)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #import "WebPreferences.h"
</span><span class="cx">
</span><span class="cx"> #import "StringUtilities.h"
</span><ins>+#import "WebPreferencesKeys.h"
</ins><span class="cx"> #import <wtf/text/StringConcatenate.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebProcessProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebProcessProxyMac.mm (169393 => 169394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebProcessProxyMac.mm 2014-05-27 18:31:56 UTC (rev 169393)
+++ trunk/Source/WebKit2/UIProcess/mac/WebProcessProxyMac.mm 2014-05-27 18:35:12 UTC (rev 169394)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx">
</span><span class="cx"> #import "WebContext.h"
</span><span class="cx"> #import "WebPageGroup.h"
</span><del>-#import "WebPreferences.h"
</del><span class="cx"> #import "WebProcessMessages.h"
</span><span class="cx"> #import "WKFullKeyboardAccessWatcher.h"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (169393 => 169394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-05-27 18:31:56 UTC (rev 169393)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-05-27 18:35:12 UTC (rev 169394)
</span><span class="lines">@@ -1002,6 +1002,9 @@
</span><span class="cx"> 7C3F8C91173AF52D007B7F39 /* PluginInformation.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C3F8C8F173AF52D007B7F39 /* PluginInformation.h */; };
</span><span class="cx"> 7C6D37FC172F555F009D2847 /* PageBannerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C6D37FA172F555F009D2847 /* PageBannerMac.mm */; };
</span><span class="cx"> 7C6E70FB18B2DC7A00F24E2E /* WebProcessCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C6E70F918B2D4A000F24E2E /* WebProcessCocoa.mm */; };
</span><ins>+ 7C85FD7C193415A8000177C4 /* WebPreferencesDefinitions.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C85FD7B193415A8000177C4 /* WebPreferencesDefinitions.h */; };
+ 7C85FD7F19341665000177C4 /* WebPreferencesKeys.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C85FD7D19341665000177C4 /* WebPreferencesKeys.cpp */; };
+ 7C85FD8019341665000177C4 /* WebPreferencesKeys.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C85FD7E19341665000177C4 /* WebPreferencesKeys.h */; };
</ins><span class="cx"> 7C8EB11718DB6A19007917C2 /* WKPreferencesPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C8EB11618DB6A19007917C2 /* WKPreferencesPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 7C9D1537184584DA009D3918 /* WKBrowsingContextGroupInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C9D1536184584DA009D3918 /* WKBrowsingContextGroupInternal.h */; };
</span><span class="cx"> 7CA254EB182993CE00FC8A41 /* WKBrowsingContextPolicyDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CA254EA182993CE00FC8A41 /* WKBrowsingContextPolicyDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -2999,6 +3002,9 @@
</span><span class="cx"> 7C3F8C8F173AF52D007B7F39 /* PluginInformation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginInformation.h; sourceTree = "<group>"; };
</span><span class="cx"> 7C6D37FA172F555F009D2847 /* PageBannerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PageBannerMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> 7C6E70F918B2D4A000F24E2E /* WebProcessCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebProcessCocoa.mm; sourceTree = "<group>"; };
</span><ins>+ 7C85FD7B193415A8000177C4 /* WebPreferencesDefinitions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPreferencesDefinitions.h; sourceTree = "<group>"; };
+ 7C85FD7D19341665000177C4 /* WebPreferencesKeys.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPreferencesKeys.cpp; sourceTree = "<group>"; };
+ 7C85FD7E19341665000177C4 /* WebPreferencesKeys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPreferencesKeys.h; sourceTree = "<group>"; };
</ins><span class="cx"> 7C8EB11618DB6A19007917C2 /* WKPreferencesPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPreferencesPrivate.h; sourceTree = "<group>"; };
</span><span class="cx"> 7C9D1536184584DA009D3918 /* WKBrowsingContextGroupInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBrowsingContextGroupInternal.h; sourceTree = "<group>"; };
</span><span class="cx"> 7CA254EA182993CE00FC8A41 /* WKBrowsingContextPolicyDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBrowsingContextPolicyDelegate.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -4395,6 +4401,9 @@
</span><span class="cx"> C0337DDC127A521C008FF4F4 /* WebPlatformTouchPoint.cpp */,
</span><span class="cx"> BC5744ED12638FB3006F0F12 /* WebPopupItem.cpp */,
</span><span class="cx"> BC5744EE12638FB3006F0F12 /* WebPopupItem.h */,
</span><ins>+ 7C85FD7B193415A8000177C4 /* WebPreferencesDefinitions.h */,
+ 7C85FD7D19341665000177C4 /* WebPreferencesKeys.cpp */,
+ 7C85FD7E19341665000177C4 /* WebPreferencesKeys.h */,
</ins><span class="cx"> BCD598AB112B7FDF00EC8C23 /* WebPreferencesStore.cpp */,
</span><span class="cx"> BCD598AA112B7FDF00EC8C23 /* WebPreferencesStore.h */,
</span><span class="cx"> BC306823125A6B9400E71278 /* WebProcessCreationParameters.cpp */,
</span><span class="lines">@@ -6906,6 +6915,7 @@
</span><span class="cx"> 1A5B1C5518987EDF004FCF9B /* WebDocumentLoader.h in Headers */,
</span><span class="cx"> E1A31732134CEA6C007C9A4F /* AttributedString.h in Headers */,
</span><span class="cx"> 51BA24441858EE3000EA2811 /* AsyncTask.h in Headers */,
</span><ins>+ 7C85FD8019341665000177C4 /* WebPreferencesKeys.h in Headers */,
</ins><span class="cx"> 512F589712A8838800629530 /* AuthenticationChallengeProxy.h in Headers */,
</span><span class="cx"> 1A445B9F184D5FB5004B3414 /* WKContextInjectedBundleClient.h in Headers */,
</span><span class="cx"> 512F589912A8838800629530 /* AuthenticationDecisionListener.h in Headers */,
</span><span class="lines">@@ -7107,6 +7117,7 @@
</span><span class="cx"> E152551B17011819003D7ADB /* NetworkResourceLoaderMessages.h in Headers */,
</span><span class="cx"> 51CBBA10165219B6005BE8FD /* NetworkResourceLoadParameters.h in Headers */,
</span><span class="cx"> A1DF631318E0B7C8003A3E2A /* DownloadClient.h in Headers */,
</span><ins>+ 7C85FD7C193415A8000177C4 /* WebPreferencesDefinitions.h in Headers */,
</ins><span class="cx"> 51829DA61637C70C000953D6 /* NetworkResourceLoadScheduler.h in Headers */,
</span><span class="cx"> 31A2EC5614899C0900810D71 /* NotificationPermissionRequest.h in Headers */,
</span><span class="cx"> 3131261F148FF82C00BA2A39 /* NotificationPermissionRequestManager.h in Headers */,
</span><span class="lines">@@ -8582,6 +8593,7 @@
</span><span class="cx"> 1A2D957012848564001EB962 /* ChildProcess.cpp in Sources */,
</span><span class="cx"> BC82837B16B36A4F00A278FE /* ChildProcessEntryPoint.mm in Sources */,
</span><span class="cx"> 9F54F88F16488E87007DF81A /* ChildProcessMac.mm in Sources */,
</span><ins>+ 7C85FD7F19341665000177C4 /* WebPreferencesKeys.cpp in Sources */,
</ins><span class="cx"> 1AA2E56618D77508003814BD /* WKWebProcessBundleParameters.mm in Sources */,
</span><span class="cx"> E1513C66166EABB200149FCB /* ChildProcessProxy.cpp in Sources */,
</span><span class="cx"> 1A2A4B0E1586A2240090C9E9 /* ColorSpaceData.mm in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (169393 => 169394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2014-05-27 18:31:56 UTC (rev 169393)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2014-05-27 18:35:12 UTC (rev 169394)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> #include "WebFrame.h"
</span><span class="cx"> #include "WebFrameNetworkingContext.h"
</span><span class="cx"> #include "WebPage.h"
</span><ins>+#include "WebPreferencesKeys.h"
</ins><span class="cx"> #include "WebPreferencesStore.h"
</span><span class="cx"> #include "WebProcess.h"
</span><span class="cx"> #include "WebProcessCreationParameters.h"
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (169393 => 169394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2014-05-27 18:31:56 UTC (rev 169393)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2014-05-27 18:35:12 UTC (rev 169394)
</span><span class="lines">@@ -45,7 +45,6 @@
</span><span class="cx"> #include "WebPageCreationParameters.h"
</span><span class="cx"> #include "WebPageProxyMessages.h"
</span><span class="cx"> #include "WebPopupMenu.h"
</span><del>-#include "WebPreferencesStore.h"
</del><span class="cx"> #include "WebProcess.h"
</span><span class="cx"> #include "WebProcessProxyMessages.h"
</span><span class="cx"> #include "WebSearchPopupMenu.h"
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedDrawingAreacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp (169393 => 169394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp 2014-05-27 18:31:56 UTC (rev 169393)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp 2014-05-27 18:35:12 UTC (rev 169394)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #include "UpdateInfo.h"
</span><span class="cx"> #include "WebPage.h"
</span><span class="cx"> #include "WebPageCreationParameters.h"
</span><ins>+#include "WebPreferencesKeys.h"
</ins><span class="cx"> #include "WebProcess.h"
</span><span class="cx"> #include <WebCore/GraphicsContext.h>
</span><span class="cx"> #include <WebCore/Page.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageDrawingAreaImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp (169393 => 169394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2014-05-27 18:31:56 UTC (rev 169393)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2014-05-27 18:35:12 UTC (rev 169394)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "UpdateInfo.h"
</span><span class="cx"> #include "WebPage.h"
</span><span class="cx"> #include "WebPageCreationParameters.h"
</span><ins>+#include "WebPreferencesKeys.h"
</ins><span class="cx"> #include "WebProcess.h"
</span><span class="cx"> #include <WebCore/GraphicsContext.h>
</span><span class="cx"> #include <WebCore/Page.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (169393 => 169394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-05-27 18:31:56 UTC (rev 169393)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-05-27 18:35:12 UTC (rev 169394)
</span><span class="lines">@@ -87,6 +87,8 @@
</span><span class="cx"> #include "WebPageProxyMessages.h"
</span><span class="cx"> #include "WebPlugInClient.h"
</span><span class="cx"> #include "WebPopupMenu.h"
</span><ins>+#include "WebPreferencesDefinitions.h"
+#include "WebPreferencesKeys.h"
</ins><span class="cx"> #include "WebPreferencesStore.h"
</span><span class="cx"> #include "WebProcess.h"
</span><span class="cx"> #include "WebProcessProxyMessages.h"
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (169393 => 169394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-05-27 18:31:56 UTC (rev 169393)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-05-27 18:35:12 UTC (rev 169394)
</span><span class="lines">@@ -51,7 +51,6 @@
</span><span class="cx"> #include "WebPageCreationParameters.h"
</span><span class="cx"> #include "WebPageGroupProxyMessages.h"
</span><span class="cx"> #include "WebPlatformStrategies.h"
</span><del>-#include "WebPreferencesStore.h"
</del><span class="cx"> #include "WebProcessCreationParameters.h"
</span><span class="cx"> #include "WebProcessMessages.h"
</span><span class="cx"> #include "WebProcessProxyMessages.h"
</span></span></pre>
</div>
</div>
</body>
</html>