Changeset 153927 in webkit

Timestamp:

Aug 11, 2013 1:30:48 PM (11 years ago)

Author:

akling@apple.com

Message:

Make Page::settings() return a reference.
<​http://webkit.org/b/119662>

Reviewed by Anders Carlsson.

...and remove some pointless null checks that were exposed by doing this.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/Modules/webdatabase/DatabaseContext.cpp (modified) (1 diff)
• WebCore/css/StyleResolver.cpp (modified) (1 diff)
• WebCore/dom/Document.cpp (modified) (6 diffs)
• WebCore/history/CachedPage.cpp (modified) (1 diff)
• WebCore/history/PageCache.cpp (modified) (4 diffs)
• WebCore/html/HTMLFormElement.cpp (modified) (1 diff)
• WebCore/html/HTMLLinkElement.cpp (modified) (1 diff)
• WebCore/html/HTMLMediaElement.cpp (modified) (1 diff)
• WebCore/html/HTMLObjectElement.cpp (modified) (1 diff)
• WebCore/html/HTMLPlugInImageElement.cpp (modified) (5 diffs)
• WebCore/html/ImageDocument.cpp (modified) (1 diff)
• WebCore/html/ValidationMessage.cpp (modified) (1 diff)
• WebCore/html/canvas/WebGLRenderingContext.cpp (modified) (2 diffs)
• WebCore/html/shadow/MediaControls.cpp (modified) (1 diff)
• WebCore/inspector/InspectorAgent.cpp (modified) (1 diff)
• WebCore/inspector/InspectorFrontendClientLocal.cpp (modified) (1 diff)
• WebCore/inspector/InspectorOverlay.cpp (modified) (1 diff)
• WebCore/inspector/InspectorPageAgent.cpp (modified) (1 diff)
• WebCore/loader/SubframeLoader.cpp (modified) (1 diff)
• WebCore/loader/archive/cf/LegacyWebArchive.cpp (modified) (1 diff)
• WebCore/loader/icon/IconController.cpp (modified) (1 diff)
• WebCore/page/CaptionUserPreferences.cpp (modified) (6 diffs)
• WebCore/page/Chrome.cpp (modified) (2 diffs)
• WebCore/page/Console.cpp (modified) (2 diffs)
• WebCore/page/ContextMenuController.cpp (modified) (1 diff)
• WebCore/page/DOMWindow.cpp (modified) (1 diff)
• WebCore/page/EventHandler.cpp (modified) (1 diff)
• WebCore/page/Frame.cpp (modified) (3 diffs)
• WebCore/page/FrameView.cpp (modified) (3 diffs)
• WebCore/page/Navigator.cpp (modified) (1 diff)
• WebCore/page/Page.h (modified) (2 diffs)
• WebCore/page/PageConsole.cpp (modified) (1 diff)
• WebCore/page/Settings.cpp (modified) (1 diff)
• WebCore/page/make_settings.pl (modified) (3 diffs)
• WebCore/platform/blackberry/PlatformScreenBlackBerry.cpp (modified) (1 diff)
• WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp (modified) (1 diff)
• WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp (modified) (1 diff)
• WebCore/plugins/PluginView.cpp (modified) (1 diff)
• WebCore/rendering/RenderLayer.cpp (modified) (2 diffs)
• WebCore/rendering/svg/RenderSVGResourceFilter.cpp (modified) (1 diff)
• WebCore/storage/Storage.cpp (modified) (1 diff)
• WebCore/storage/StorageNamespaceImpl.cpp (modified) (2 diffs)
• WebCore/svg/graphics/SVGImage.cpp (modified) (1 diff)
• WebCore/testing/InternalSettings.cpp (modified) (5 diffs)
• WebCore/testing/InternalSettings.h (modified) (1 diff)
• WebCore/xml/parser/XMLDocumentParserLibxml2.cpp (modified) (1 diff)
• WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp (modified) (1 diff)
• WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp (modified) (7 diffs)
• WebKit/efl/WebCoreSupport/EditorClientEfl.cpp (modified) (2 diffs)
• WebKit/efl/ewk/ewk_view.cpp (modified) (1 diff)
• WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp (modified) (1 diff)
• WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp (modified) (2 diffs)
• WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp (modified) (2 diffs)
• WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp (modified) (1 diff)
• WebKit/gtk/webkit/webkitwebview.cpp (modified) (12 diffs)
• WebKit/mac/WebCoreSupport/WebEditorClient.mm (modified) (2 diffs)
• WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (modified) (1 diff)
• WebKit/mac/WebView/WebView.mm (modified) (15 diffs)
• WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp (modified) (4 diffs)
• WebKit/qt/WebCoreSupport/EditorClientQt.cpp (modified) (4 diffs)
• WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp (modified) (3 diffs)
• WebKit/win/WebCoreSupport/WebEditorClient.cpp (modified) (2 diffs)
• WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (1 diff)
• WebKit/win/WebView.cpp (modified) (36 diffs)
• WebKit/wince/WebCoreSupport/EditorClientWinCE.cpp (modified) (2 diffs)
• WebKit2/WebProcess/FullScreen/WebFullScreenManager.cpp (modified) (1 diff)
• WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (modified) (14 diffs)
• WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.cpp (modified) (1 diff)
• WebKit2/WebProcess/Notifications/WebNotificationManager.cpp (modified) (2 diffs)
• WebKit2/WebProcess/Storage/StorageNamespaceImpl.cpp (modified) (1 diff)
• WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (modified) (2 diffs)
• WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (1 diff)
• WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp (modified) (2 diffs)
• WebKit2/WebProcess/WebPage/WebPage.cpp (modified) (11 diffs)
• WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp (modified) (2 diffs)
• WebKit2/WebProcess/WebPage/mac/LayerTreeHostMac.mm (modified) (2 diffs)
• WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (modified) (6 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-08-11  Andreas Kling  <akling@apple.com>
+
+        Make Page::settings() return a reference.
+        <http://webkit.org/b/119662>
+
+        Reviewed by Anders Carlsson.
+
+        ...and remove some pointless null checks that were exposed by doing this.
+
 2013-08-11  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/Modules/webdatabase/DatabaseContext.cpp

@@ -207 +207 @@
     if (m_scriptExecutionContext->isDocument()) {
         Document* document = toDocument(m_scriptExecutionContext);
-        if (!document->page() || (document->page()->settings()->privateBrowsingEnabled() && !SchemeRegistry::allowsDatabaseAccessInPrivateBrowsing(document->securityOrigin()->protocol())))
+        if (!document->page() || (document->page()->settings().privateBrowsingEnabled() && !SchemeRegistry::allowsDatabaseAccessInPrivateBrowsing(document->securityOrigin()->protocol())))
             return false;
         return true;

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -1293 +1293 @@
         || style->hasBlendMode()
         || style->position() == StickyPosition
-        || (style->position() == FixedPosition && e && e->document()->page() && e->document()->page()->settings()->fixedPositionCreatesStackingContext())
+        || (style->position() == FixedPosition && e && e->document()->page() && e->document()->page()->settings().fixedPositionCreatesStackingContext())
 #if ENABLE(DIALOG_ELEMENT)
         || (e && e->isInTopLayer())

trunk/Source/WebCore/dom/Document.cpp

@@ -2564 +2564 @@
     if (!p)
         return ScriptExecutionContext::minimumTimerInterval();
-    return p->settings()->minDOMTimerInterval();
+    return p->settings().minDOMTimerInterval();
 }
 
@@ -2572 +2572 @@
     if (!p)
         return ScriptExecutionContext::timerAlignmentInterval();
-    return p->settings()->domTimerAlignmentInterval();
+    return p->settings().domTimerAlignmentInterval();
 }
 
@@ -3689 +3689 @@
 String Document::cookie(ExceptionCode& ec) const
 {
-    if (page() && !page()->settings()->cookieEnabled())
+    if (page() && !page()->settings().cookieEnabled())
         return String();
 
@@ -3710 +3710 @@
 void Document::setCookie(const String& value, ExceptionCode& ec)
 {
-    if (page() && !page()->settings()->cookieEnabled())
+    if (page() && !page()->settings().cookieEnabled())
         return;
 
@@ -4998 +4998 @@
 
         // There is a previously-established user preference, security risk, or platform limitation.
-        if (!page() || !page()->settings()->fullScreenEnabled())
+        if (!page() || !page()->settings().fullScreenEnabled())
             break;
 
@@ -5180 +5180 @@
         return;
 
-    ASSERT(page()->settings()->fullScreenEnabled());
+    ASSERT(page()->settings().fullScreenEnabled());
 
     if (m_fullScreenRenderer)

trunk/Source/WebCore/history/CachedPage.cpp

@@ -53 +53 @@
 CachedPage::CachedPage(Page* page)
     : m_timeStamp(currentTime())
-    , m_expirationTime(m_timeStamp + page->settings()->backForwardCacheExpirationInterval())
+    , m_expirationTime(m_timeStamp + page->settings().backForwardCacheExpirationInterval())
     , m_cachedMainFrame(CachedFrame::create(page->mainFrame()))
     , m_needStyleRecalcForVisitedLinks(false)

trunk/Source/WebCore/history/PageCache.cpp

@@ -111 +111 @@
         rejectReasons |= 1 << IsErrorPage;
     }
-    if (frame->loader()->subframeLoader()->containsPlugins() && !frame->page()->settings()->pageCacheSupportsPlugins()) {
+    if (frame->loader()->subframeLoader()->containsPlugins() && !frame->page()->settings().pageCacheSupportsPlugins()) {
         PCLOG("   -Frame contains plugins");
         rejectReasons |= 1 << HasPlugins;
@@ -221 +221 @@
         rejectReasons |= 1 << DisabledBackForwardList;
     }
-    if (!page->settings()->usesPageCache()) {
+    if (!page->settings().usesPageCache()) {
         PCLOG("   -Page settings says b/f cache disabled");
         rejectReasons |= 1 << DisabledPageCache;
@@ -317 +317 @@
         // Do not cache error pages (these can be recognized as pages with substitute data or unreachable URLs).
         && !(documentLoader->substituteData().isValid() && !documentLoader->substituteData().failingURL().isEmpty())
-        && (!frameLoader->subframeLoader()->containsPlugins() || frame->page()->settings()->pageCacheSupportsPlugins())
+        && (!frameLoader->subframeLoader()->containsPlugins() || frame->page()->settings().pageCacheSupportsPlugins())
         && (!document->url().protocolIs("https") || (!documentLoader->response().cacheControlContainsNoCache() && !documentLoader->response().cacheControlContainsNoStore()))
         && (!document->domWindow() || !document->domWindow()->hasEventListeners(eventNames().unloadEvent))
@@ -356 +356 @@
         && canCachePageContainingThisFrame(page->mainFrame())
         && page->backForward()->isActive()
-        && page->settings()->usesPageCache()
+        && page->settings().usesPageCache()
 #if ENABLE(DEVICE_ORIENTATION)
         && !DeviceMotionController::isActiveAt(page)

trunk/Source/WebCore/html/HTMLFormElement.cpp

@@ -203 +203 @@
 {
     ASSERT(event);
-    if (!document()->page() || !document()->page()->settings()->interactiveFormValidationEnabled() || noValidate())
+    if (!document()->page() || !document()->page()->settings().interactiveFormValidationEnabled() || noValidate())
         return true;
 

trunk/Source/WebCore/html/HTMLLinkElement.cpp

@@ -185 +185 @@
         return;
 
-    bool acceptIfTypeContainsTextCSS = document()->page() && document()->page()->settings() && document()->page()->settings()->treatsAnyTextCSSLinkAsStylesheet();
+    bool acceptIfTypeContainsTextCSS = document()->page() && document()->page()->settings().treatsAnyTextCSSLinkAsStylesheet();
 
     if (m_disabledState != Disabled && (m_relAttribute.m_isStyleSheet || (acceptIfTypeContainsTextCSS && type.contains("text/css")))

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -1685 +1685 @@
 static void logMediaLoadRequest(Page* page, const String& mediaEngine, const String& errorMessage, bool succeeded)
 {
-    if (!page || !page->settings()->diagnosticLoggingEnabled())
+    if (!page || !page->settings().diagnosticLoggingEnabled())
         return;
 

trunk/Source/WebCore/html/HTMLObjectElement.cpp

@@ -238 +238 @@
     // Server is updated to generate an alternate embed tag as fallback content.
     if (!document()->page()
-        || !document()->page()->settings()->needsSiteSpecificQuirks()
+        || !document()->page()->settings().needsSiteSpecificQuirks()
         || hasFallbackContent()
         || !equalIgnoringCase(classId(), "clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B"))

trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp

@@ -489 +489 @@
 
     String plugInOrigin = m_loadedUrl.host();
-    if (document()->page() && !SchemeRegistry::shouldTreatURLSchemeAsLocal(document()->page()->mainFrame()->document()->baseURL().protocol()) && document()->page()->settings()->autostartOriginPlugInSnapshottingEnabled())
+    if (document()->page() && !SchemeRegistry::shouldTreatURLSchemeAsLocal(document()->page()->mainFrame()->document()->baseURL().protocol()) && document()->page()->settings().autostartOriginPlugInSnapshottingEnabled())
         document()->page()->plugInClient()->didStartFromOrigin(document()->page()->mainFrame()->document()->baseURL().host(), plugInOrigin, loadedMimeType());
 
@@ -501 +501 @@
 void HTMLPlugInImageElement::setIsPrimarySnapshottedPlugIn(bool isPrimarySnapshottedPlugIn)
 {
-    if (!document()->page() || !document()->page()->settings()->primaryPlugInSnapshotDetectionEnabled() || document()->page()->settings()->snapshotAllPlugIns())
+    if (!document()->page() || !document()->page()->settings().primaryPlugInSnapshotDetectionEnabled() || document()->page()->settings().snapshotAllPlugIns())
         return;
 
@@ -586 +586 @@
     m_deferredPromotionToPrimaryPlugIn = false;
 
-    if (!document()->page() || !document()->page()->settings()->plugInSnapshottingEnabled()) {
+    if (!document()->page() || !document()->page()->settings().plugInSnapshottingEnabled()) {
         m_snapshotDecision = NeverSnapshot;
         return;
@@ -635 +635 @@
     }
 
-    if (document()->page()->settings()->snapshotAllPlugIns()) {
+    if (document()->page()->settings().snapshotAllPlugIns()) {
         LOG(Plugins, "%p Plug-in forced to snapshot by user preference", this);
         m_snapshotDecision = Snapshotted;
@@ -642 +642 @@
     }
 
-    if (document()->page()->settings()->autostartOriginPlugInSnapshottingEnabled() && document()->page()->plugInClient() && document()->page()->plugInClient()->shouldAutoStartFromOrigin(document()->page()->mainFrame()->document()->baseURL().host(), url.host(), loadedMimeType())) {
+    if (document()->page()->settings().autostartOriginPlugInSnapshottingEnabled() && document()->page()->plugInClient() && document()->page()->plugInClient()->shouldAutoStartFromOrigin(document()->page()->mainFrame()->document()->baseURL().host(), url.host(), loadedMimeType())) {
         LOG(Plugins, "%p Plug-in from (%s, %s) is marked to auto-start, set to play", this, document()->page()->mainFrame()->document()->baseURL().host().utf8().data(), url.host().utf8().data());
         m_snapshotDecision = NeverSnapshot;

trunk/Source/WebCore/html/ImageDocument.cpp

@@ -375 +375 @@
 bool ImageDocument::shouldShrinkToFit() const
 {
-    return frame()->page()->settings()->shrinksStandaloneImagesToFit() &&
-        frame()->page()->mainFrame() == frame();
-}
-
-// --------
+    return frame()->page()->settings().shrinksStandaloneImagesToFit() && frame()->page()->mainFrame() == frame();
+}
 
 void ImageEventListener::handleEvent(ScriptExecutionContext*, Event* event)

trunk/Source/WebCore/html/ValidationMessage.cpp

@@ -140 +140 @@
     }
 
-    int magnification = doc->page() ? doc->page()->settings()->validationMessageTimerMagnification() : -1;
+    int magnification = doc->page() ? doc->page()->settings().validationMessageTimerMagnification() : -1;
     if (magnification <= 0)
         m_timer.clear();

trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp

@@ -563 +563 @@
     ASSERT(m_context);
 
-    Page* p = canvas()->document()->page();
-    if (p)
-        m_synthesizedErrorsToConsole = p->settings()->webGLErrorsToConsoleEnabled();
+    if (Page* page = canvas()->document()->page())
+        m_synthesizedErrorsToConsole = page->settings().webGLErrorsToConsoleEnabled();
 
     m_isGLES2Compliant = m_context->isGLES2Compliant();
@@ -582 +581 @@
 bool WebGLRenderingContext::allowPrivilegedExtensions() const
 {
-    Page* p = canvas()->document()->page();
-    if (p && p->settings())
-        return p->settings()->privilegedWebGLExtensionsEnabled();
+    if (Page* page = canvas()->document()->page())
+        return page->settings().privilegedWebGLExtensionsEnabled();
     return false;
 }

trunk/Source/WebCore/html/shadow/MediaControls.cpp

@@ -356 +356 @@
         return;
 
-    m_hideFullscreenControlsTimer.startOneShot(page->settings()->timeWithoutMouseMovementBeforeHidingControls());
+    m_hideFullscreenControlsTimer.startOneShot(page->settings().timeWithoutMouseMovementBeforeHidingControls());
 }
 

trunk/Source/WebCore/inspector/InspectorAgent.cpp

@@ -186 +186 @@
     if (!m_inspectedPage)
         return false;
-    return m_inspectedPage->settings()->developerExtrasEnabled();
+    return m_inspectedPage->settings().developerExtrasEnabled();
 }
 

trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp

@@ -122 +122 @@
     , m_dockSide(UNDOCKED)
 {
-    m_frontendPage->settings()->setAllowFileAccessFromFileURLs(true);
+    m_frontendPage->settings().setAllowFileAccessFromFileURLs(true);
     m_dispatchTask = adoptPtr(new InspectorBackendDispatchTask(inspectorController));
 }

trunk/Source/WebCore/inspector/InspectorOverlay.cpp

@@ -437 +437 @@
     m_overlayPage = adoptPtr(new Page(pageClients));
 
-    Settings* settings = m_page->settings();
-    Settings* overlaySettings = m_overlayPage->settings();
-
-    overlaySettings->setStandardFontFamily(settings->standardFontFamily());
-    overlaySettings->setSerifFontFamily(settings->serifFontFamily());
-    overlaySettings->setSansSerifFontFamily(settings->sansSerifFontFamily());
-    overlaySettings->setCursiveFontFamily(settings->cursiveFontFamily());
-    overlaySettings->setFantasyFontFamily(settings->fantasyFontFamily());
-    overlaySettings->setPictographFontFamily(settings->pictographFontFamily());
-    overlaySettings->setMinimumFontSize(settings->minimumFontSize());
-    overlaySettings->setMinimumLogicalFontSize(settings->minimumLogicalFontSize());
-    overlaySettings->setMediaEnabled(false);
-    overlaySettings->setScriptEnabled(true);
-    overlaySettings->setPluginsEnabled(false);
+    Settings& settings = m_page->settings();
+    Settings& overlaySettings = m_overlayPage->settings();
+
+    overlaySettings.setStandardFontFamily(settings.standardFontFamily());
+    overlaySettings.setSerifFontFamily(settings.serifFontFamily());
+    overlaySettings.setSansSerifFontFamily(settings.sansSerifFontFamily());
+    overlaySettings.setCursiveFontFamily(settings.cursiveFontFamily());
+    overlaySettings.setFantasyFontFamily(settings.fantasyFontFamily());
+    overlaySettings.setPictographFontFamily(settings.pictographFontFamily());
+    overlaySettings.setMinimumFontSize(settings.minimumFontSize());
+    overlaySettings.setMinimumLogicalFontSize(settings.minimumLogicalFontSize());
+    overlaySettings.setMediaEnabled(false);
+    overlaySettings.setScriptEnabled(true);
+    overlaySettings.setPluginsEnabled(false);
 
     RefPtr<Frame> frame = Frame::create(m_overlayPage.get(), 0, dummyFrameLoaderClient);

trunk/Source/WebCore/inspector/InspectorPageAgent.cpp

@@ -1311 +1311 @@
 }
 
-void InspectorPageAgent::getCompositingBordersVisible(ErrorString* error, bool* outParam)
-{
-    Settings* settings = m_page->settings();
-    if (!settings) {
-        *error = "Internal error: unable to read settings";
-        return;
-    }
-
-    *outParam = settings->showDebugBorders() || settings->showRepaintCounter();
+void InspectorPageAgent::getCompositingBordersVisible(ErrorString*, bool* outParam)
+{
+    *outParam = m_page->settings().showDebugBorders() || m_page->settings().showRepaintCounter();
 }
 
 void InspectorPageAgent::setCompositingBordersVisible(ErrorString*, bool visible)
 {
-    Settings* settings = m_page->settings();
-    if (!settings)
-        return;
-
-    settings->setShowDebugBorders(visible);
-    settings->setShowRepaintCounter(visible);
+    m_page->settings().setShowDebugBorders(visible);
+    m_page->settings().setShowRepaintCounter(visible);
 }
 

trunk/Source/WebCore/loader/SubframeLoader.cpp

@@ -189 +189 @@
 static void logPluginRequest(Page* page, const String& mimeType, const String& url, bool success)
 {
-    if (!page || !page->settings()->diagnosticLoggingEnabled())
+    if (!page || !page->settings().diagnosticLoggingEnabled())
         return;
 

trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp

@@ -437 +437 @@
     // but we can approximate that by checking if scripting is enabled right now.
     OwnPtr<Vector<QualifiedName> > tagNamesToFilter;
-    if (frame->page() && frame->page()->settings()->isScriptEnabled()) {
+    if (frame->page() && frame->page()->settings().isScriptEnabled()) {
         tagNamesToFilter = adoptPtr(new Vector<QualifiedName>);
         tagNamesToFilter->append(HTMLNames::noscriptTag);

trunk/Source/WebCore/loader/icon/IconController.cpp

@@ -204 +204 @@
 
     //  FIXME (<rdar://problem/9168605>) - We should support in-memory-only private browsing icons in asynchronous icon database mode.
-    if (iconDatabase().supportsAsynchronousMode() && m_frame->page()->settings()->privateBrowsingEnabled())
+    if (iconDatabase().supportsAsynchronousMode() && m_frame->page()->settings().privateBrowsingEnabled())
         return;
 

trunk/Source/WebCore/page/CaptionUserPreferences.cpp

@@ -85 +85 @@
         return false;
 
-    return page->settings()->shouldDisplayCaptions();
+    return page->settings().shouldDisplayCaptions();
 }
 
@@ -94 +94 @@
         return;
 
-    page->settings()->setShouldDisplayCaptions(preference);
+    page->settings().setShouldDisplayCaptions(preference);
     notify();
 }
@@ -104 +104 @@
         return false;
 
-    return page->settings()->shouldDisplaySubtitles();
+    return page->settings().shouldDisplaySubtitles();
 }
 
@@ -113 +113 @@
         return;
 
-    page->settings()->setShouldDisplaySubtitles(preference);
+    page->settings().setShouldDisplaySubtitles(preference);
     notify();
 }
@@ -123 +123 @@
         return false;
     
-    return page->settings()->shouldDisplayTextDescriptions();
+    return page->settings().shouldDisplayTextDescriptions();
 }
 
@@ -132 +132 @@
         return;
     
-    page->settings()->setShouldDisplayTextDescriptions(preference);
+    page->settings().setShouldDisplayTextDescriptions(preference);
     notify();
 }

trunk/Source/WebCore/page/Chrome.cpp

@@ -405 +405 @@
 
     // Next priority is a toolTip from a URL beneath the mouse (if preference is set to show those).
-    if (toolTip.isEmpty() && m_page->settings()->showsURLsInToolTips()) {
+    if (toolTip.isEmpty() && m_page->settings().showsURLsInToolTips()) {
         if (Node* node = result.innerNonSharedNode()) {
             // Get tooltip representing form action, if relevant
@@ -434 +434 @@
         toolTip = result.title(toolTipDirection);
 
-    if (toolTip.isEmpty() && m_page->settings()->showsToolTipOverTruncatedText())
+    if (toolTip.isEmpty() && m_page->settings().showsToolTipOverTruncatedText())
         toolTip = result.innerTextIfTruncated(toolTipDirection);
 

trunk/Source/WebCore/page/Console.cpp

@@ -84 +84 @@
     InspectorInstrumentation::addMessageToConsole(page, ConsoleAPIMessageSource, type, level, message, state, arguments);
 
-    if (page->settings()->privateBrowsingEnabled())
+    if (page->settings().privateBrowsingEnabled())
         return;
 
@@ -90 +90 @@
         page->chrome().client()->addMessageToConsole(ConsoleAPIMessageSource, type, level, message, lastCaller.lineNumber(), lastCaller.columnNumber(), lastCaller.sourceURL());
 
-    if (!page->settings()->logsPageMessagesToSystemConsoleEnabled() && !PageConsole::shouldPrintExceptions())
+    if (!page->settings().logsPageMessagesToSystemConsoleEnabled() && !PageConsole::shouldPrintExceptions())
         return;
 

trunk/Source/WebCore/page/ContextMenuController.cpp

@@ -1109 +1109 @@
             appendItem(WritingDirectionMenuItem, m_contextMenu.get());
             if (Page* page = frame->page()) {
-                if (Settings* settings = page->settings()) {
-                    bool includeTextDirectionSubmenu = settings->textDirectionSubmenuInclusionBehavior() == TextDirectionSubmenuAlwaysIncluded
-                        || (settings->textDirectionSubmenuInclusionBehavior() == TextDirectionSubmenuAutomaticallyIncluded && frame->editor().hasBidiSelection());
-                    if (includeTextDirectionSubmenu) {
-                        ContextMenuItem TextDirectionMenuItem(SubmenuType, ContextMenuItemTagTextDirectionMenu, 
-                            contextMenuItemTagTextDirectionMenu());
-                        createAndAppendTextDirectionSubMenu(TextDirectionMenuItem);
-                        appendItem(TextDirectionMenuItem, m_contextMenu.get());
-                    }
+                bool includeTextDirectionSubmenu = page->settings().textDirectionSubmenuInclusionBehavior() == TextDirectionSubmenuAlwaysIncluded
+                    || (page->settings().textDirectionSubmenuInclusionBehavior() == TextDirectionSubmenuAutomaticallyIncluded && frame->editor().hasBidiSelection());
+                if (includeTextDirectionSubmenu) {
+                    ContextMenuItem TextDirectionMenuItem(SubmenuType, ContextMenuItemTagTextDirectionMenu, contextMenuItemTagTextDirectionMenu());
+                    createAndAppendTextDirectionSubMenu(TextDirectionMenuItem);
+                    appendItem(TextDirectionMenuItem, m_contextMenu.get());
                 }
             }

trunk/Source/WebCore/page/DOMWindow.cpp

@@ -796 +796 @@
         return 0;
 
-    if (!page->settings()->localStorageEnabled())
+    if (!page->settings().localStorageEnabled())
         return 0;
 

trunk/Source/WebCore/page/EventHandler.cpp

@@ -1468 +1468 @@
         return;
 
-    m_autoHideCursorTimer.startOneShot(page->settings()->timeWithoutMouseMovementBeforeHidingControls());
+    m_autoHideCursorTimer.startOneShot(page->settings().timeWithoutMouseMovementBeforeHidingControls());
 
     // The fake mouse move event screws up the auto-hide feature (by resetting the auto-hide timer)

trunk/Source/WebCore/page/Frame.cpp

@@ -184 +184 @@
 #if USE(TILED_BACKING_STORE)
         // Top level frame only for now.
-        setTiledBackingStoreEnabled(page->settings()->tiledBackingStoreEnabled());
+        setTiledBackingStoreEnabled(page->settings().tiledBackingStoreEnabled());
 #endif
     } else {
@@ -330 +330 @@
 Settings* Frame::settings() const
 {
-    return m_page ? m_page->settings() : 0;
+    return m_page ? &m_page->settings() : 0;
 }
 
@@ -949 +949 @@
 
     // Main frame is scaled with respect to he container but inner frames are not scaled with respect to the main frame.
-    if (!page || page->mainFrame() != this || page->settings()->applyPageScaleFactorInCompositor())
+    if (!page || page->mainFrame() != this || page->settings().applyPageScaleFactorInCompositor())
         return 1;
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -464 +464 @@
     if (newRect.width() != oldRect.width()) {
         Page* page = m_frame ? m_frame->page() : 0;
-        if (page && page->mainFrame() == m_frame && page->settings()->textAutosizingEnabled()) {
+        if (page && page->mainFrame() == m_frame && page->settings().textAutosizingEnabled()) {
             for (Frame* frame = page->mainFrame(); frame; frame = frame->tree()->traverseNext())
                 m_frame->document()->textAutosizer()->recalculateMultipliers();
@@ -1992 +1992 @@
     if (offset != scrollOffset()) {
         repaintFixedElementsAfterScrolling();
-        if (m_frame->page()->settings()->acceleratedCompositingForFixedPositionEnabled())
+        if (m_frame->page()->settings().acceleratedCompositingForFixedPositionEnabled())
             updateFixedElementsAfterScrolling();
         scrollAnimator()->setCurrentPosition(scrollPosition());
@@ -3287 +3287 @@
 #if ENABLE(SMOOTH_SCROLLING)
     if (Page* page = m_frame->page())
-        return page->settings()->scrollAnimatorEnabled();
+        return page->settings().scrollAnimatorEnabled();
 #endif
 

trunk/Source/WebCore/page/Navigator.cpp

@@ -117 +117 @@
         return false;
 
-    if (m_frame->page() && !m_frame->page()->settings()->cookieEnabled())
+    if (m_frame->page() && !m_frame->page()->settings().cookieEnabled())
         return false;
 

trunk/Source/WebCore/page/Page.h

@@ -208 +208 @@
     PassRefPtr<ClientRectList> nonFastScrollableRects(const Frame*);
 
-    Settings* settings() const { return m_settings.get(); }
+    Settings& settings() const { return *m_settings; }
     ProgressTracker* progress() const { return m_progress.get(); }
     BackForwardController* backForward() const { return m_backForwardController.get(); }
@@ -458 +458 @@
     RefPtr<ScrollingCoordinator> m_scrollingCoordinator;
 
-    OwnPtr<Settings> m_settings;
+    const OwnPtr<Settings> m_settings;
     OwnPtr<ProgressTracker> m_progress;
 

trunk/Source/WebCore/page/PageConsole.cpp

@@ -169 +169 @@
         return;
 
-    if (page->settings()->privateBrowsingEnabled())
+    if (page->settings().privateBrowsingEnabled())
         return;
 
     page->chrome().client()->addMessageToConsole(source, level, message, lineNumber, columnNumber, url);
 
-    if (!page->settings()->logsPageMessagesToSystemConsoleEnabled() && !shouldPrintExceptions())
+    if (!page->settings().logsPageMessagesToSystemConsoleEnabled() && !shouldPrintExceptions())
         return;
 

trunk/Source/WebCore/page/Settings.cpp

@@ -54 +54 @@
 {
     for (Frame* frame = page->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
-        frame->document()->cachedResourceLoader()->setImagesEnabled(page->settings()->areImagesEnabled());
-        frame->document()->cachedResourceLoader()->setAutoLoadImages(page->settings()->loadsImagesAutomatically());
+        frame->document()->cachedResourceLoader()->setImagesEnabled(page->settings().areImagesEnabled());
+        frame->document()->cachedResourceLoader()->setAutoLoadImages(page->settings().loadsImagesAutomatically());
     }
 }

trunk/Source/WebCore/page/make_settings.pl

@@ -468 +468 @@
             print $file "#if " . $InCompiler->conditionalStringFromAttributeValue($conditional) . "\n";
         }
-        print $file "    , m_$settingName(page->settings()->$settingName())\n";
+        print $file "    , m_$settingName(page->settings().$settingName())\n";
         if ($conditional) {
             print $file "#endif\n";
@@ -495 +495 @@
             print $file "#if " . $InCompiler->conditionalStringFromAttributeValue($conditional) . "\n";
         }
-        print $file "    m_page->settings()->$setterFunctionName(m_$settingName);\n";
+        print $file "    m_page->settings().$setterFunctionName(m_$settingName);\n";
         if ($conditional) {
             print $file "#endif\n";
@@ -518 +518 @@
             print $file "#if " . $InCompiler->conditionalStringFromAttributeValue($conditional) . "\n";
         }
-        print $file "    m_page->settings()->$setterFunctionName($settingName);\n";
+        print $file "    m_page->settings().$setterFunctionName($settingName);\n";
         if ($conditional) {
             print $file "#else\n";

trunk/Source/WebCore/platform/blackberry/PlatformScreenBlackBerry.cpp

@@ -53 +53 @@
     if (widget->isFrameView()) {
         Page* page = toFrameView(widget)->frame()->page();
-        if (page && !page->settings()->applyDeviceScaleFactorInCompositor()) {
+        if (page && !page->settings().applyDeviceScaleFactorInCompositor()) {
             rect.scale(1 / page->deviceScaleFactor());
             rect.setSize(expandedIntSize(rect.size()));

trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp

@@ -68 +68 @@
 #endif
 {
-    m_page->settings()->setApplyDeviceScaleFactorInCompositor(true);
+    m_page->settings().setApplyDeviceScaleFactorInCompositor(true);
 
     // This is a temporary way to enable this only in the GL case, until TextureMapperImageBuffer is removed.

trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp

@@ -199 +199 @@
 #if USE(ACCELERATED_COMPOSITING)
     Document* document = m_player->mediaPlayerClient()->mediaPlayerOwningDocument(); 
-    if (document && document->settings())
-        return document->settings()->acceleratedCompositingEnabled();
+    if (document)
+        return document->settings().acceleratedCompositingEnabled();
 #endif
     return false;

trunk/Source/WebCore/plugins/PluginView.cpp

@@ -1356 +1356 @@
         if (!page)
             return NPERR_GENERIC_ERROR;
-        *((NPBool*)value) = !page->settings() || page->settings()->privateBrowsingEnabled();
+        *((NPBool*)value) = page->settings().privateBrowsingEnabled();
         return NPERR_NO_ERROR;
     }

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -564 +564 @@
     return renderer()->frame()
         && renderer()->frame()->page()
-        && renderer()->frame()->page()->settings()->acceleratedCompositingForOverflowScrollEnabled();
+        && renderer()->frame()->page()->settings().acceleratedCompositingForOverflowScrollEnabled();
 }
 
@@ -6447 +6447 @@
     if (!filterInfo->renderer()) {
         RefPtr<FilterEffectRenderer> filterRenderer = FilterEffectRenderer::create();
-        RenderingMode renderingMode = renderer()->frame()->page()->settings()->acceleratedFiltersEnabled() ? Accelerated : Unaccelerated;
+        RenderingMode renderingMode = renderer()->frame()->page()->settings().acceleratedFiltersEnabled() ? Accelerated : Unaccelerated;
         filterRenderer->setRenderingMode(renderingMode);
         filterInfo->setRenderer(filterRenderer.release());

trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp

@@ -234 +234 @@
 
     OwnPtr<ImageBuffer> sourceGraphic;
-    RenderingMode renderingMode = object->document()->page()->settings()->acceleratedFiltersEnabled() ? Accelerated : Unaccelerated;
+    RenderingMode renderingMode = object->document()->page()->settings().acceleratedFiltersEnabled() ? Accelerated : Unaccelerated;
     if (!SVGRenderingContext::createImageBuffer(filterData->drawingRegion, effectiveTransform, sourceGraphic, ColorSpaceLinearRGB, renderingMode)) {
         ASSERT(!m_filter.contains(object));

trunk/Source/WebCore/storage/Storage.cpp

@@ -159 +159 @@
 bool Storage::isDisabledByPrivateBrowsing() const
 {
-    if (!m_frame->page()->settings()->privateBrowsingEnabled())
+    if (!m_frame->page()->settings().privateBrowsingEnabled())
         return false;
 

trunk/Source/WebCore/storage/StorageNamespaceImpl.cpp

@@ -57 +57 @@
     // at this point we're stuck with it.
     Page* page = *pageGroup->pages().begin();
-    const String& path = page->settings()->localStorageDatabasePath();
+    const String& path = page->settings().localStorageDatabasePath();
     unsigned quota = pageGroup->groupSettings()->localStorageQuotaBytes();
     const String lookupPath = path.isNull() ? emptyString() : path;
@@ -73 +73 @@
 PassRefPtr<StorageNamespace> StorageNamespaceImpl::sessionStorageNamespace(Page* page)
 {
-    return adoptRef(new StorageNamespaceImpl(SessionStorage, String(), page->settings()->sessionStorageQuota()));
+    return adoptRef(new StorageNamespaceImpl(SessionStorage, String(), page->settings().sessionStorageQuota()));
 }
 

trunk/Source/WebCore/svg/graphics/SVGImage.cpp

@@ -364 +364 @@
         // loaded by a top-level document.
         m_page = adoptPtr(new Page(pageClients));
-        m_page->settings()->setMediaEnabled(false);
-        m_page->settings()->setScriptEnabled(false);
-        m_page->settings()->setPluginsEnabled(false);
+        m_page->settings().setMediaEnabled(false);
+        m_page->settings().setScriptEnabled(false);
+        m_page->settings().setPluginsEnabled(false);
 
         RefPtr<Frame> frame = Frame::create(m_page.get(), 0, dummyFrameLoaderClient);

trunk/Source/WebCore/testing/InternalSettings.cpp

@@ -66 +66 @@
 namespace WebCore {
 
-InternalSettings::Backup::Backup(Settings* settings)
+InternalSettings::Backup::Backup(Settings& settings)
     : m_originalCSSExclusionsEnabled(RuntimeEnabledFeatures::cssExclusionsEnabled())
     , m_originalCSSShapesEnabled(RuntimeEnabledFeatures::cssShapesEnabled())
-    , m_originalCSSVariablesEnabled(settings->cssVariablesEnabled())
+    , m_originalCSSVariablesEnabled(settings.cssVariablesEnabled())
 #if ENABLE(SHADOW_DOM)
     , m_originalShadowDOMEnabled(RuntimeEnabledFeatures::shadowDOMEnabled())
@@ -77 +77 @@
     , m_originalStyleScoped(RuntimeEnabledFeatures::styleScopedEnabled())
 #endif
-    , m_originalEditingBehavior(settings->editingBehaviorType())
+    , m_originalEditingBehavior(settings.editingBehaviorType())
 #if ENABLE(TEXT_AUTOSIZING)
-    , m_originalTextAutosizingEnabled(settings->textAutosizingEnabled())
-    , m_originalTextAutosizingWindowSizeOverride(settings->textAutosizingWindowSizeOverride())
-    , m_originalTextAutosizingFontScaleFactor(settings->textAutosizingFontScaleFactor())
-#endif
-    , m_originalMediaTypeOverride(settings->mediaTypeOverride())
+    , m_originalTextAutosizingEnabled(settings.textAutosizingEnabled())
+    , m_originalTextAutosizingWindowSizeOverride(settings.textAutosizingWindowSizeOverride())
+    , m_originalTextAutosizingFontScaleFactor(settings.textAutosizingFontScaleFactor())
+#endif
+    , m_originalMediaTypeOverride(settings.mediaTypeOverride())
 #if ENABLE(DIALOG_ELEMENT)
     , m_originalDialogElementEnabled(RuntimeEnabledFeatures::dialogElementEnabled())
 #endif
-    , m_originalCanvasUsesAcceleratedDrawing(settings->canvasUsesAcceleratedDrawing())
-    , m_originalMockScrollbarsEnabled(settings->mockScrollbarsEnabled())
+    , m_originalCanvasUsesAcceleratedDrawing(settings.canvasUsesAcceleratedDrawing())
+    , m_originalMockScrollbarsEnabled(settings.mockScrollbarsEnabled())
     , m_langAttributeAwareFormControlUIEnabled(RuntimeEnabledFeatures::langAttributeAwareFormControlUIEnabled())
-    , m_imagesEnabled(settings->areImagesEnabled())
-    , m_minimumTimerInterval(settings->minDOMTimerInterval())
+    , m_imagesEnabled(settings.areImagesEnabled())
+    , m_minimumTimerInterval(settings.minDOMTimerInterval())
 #if ENABLE(VIDEO_TRACK)
-    , m_shouldDisplaySubtitles(settings->shouldDisplaySubtitles())
-    , m_shouldDisplayCaptions(settings->shouldDisplayCaptions())
-    , m_shouldDisplayTextDescriptions(settings->shouldDisplayTextDescriptions())
-#endif
-    , m_defaultVideoPosterURL(settings->defaultVideoPosterURL())
-    , m_originalTimeWithoutMouseMovementBeforeHidingControls(settings->timeWithoutMouseMovementBeforeHidingControls())
-    , m_useLegacyBackgroundSizeShorthandBehavior(settings->useLegacyBackgroundSizeShorthandBehavior())
-{
-}
-
-void InternalSettings::Backup::restoreTo(Settings* settings)
+    , m_shouldDisplaySubtitles(settings.shouldDisplaySubtitles())
+    , m_shouldDisplayCaptions(settings.shouldDisplayCaptions())
+    , m_shouldDisplayTextDescriptions(settings.shouldDisplayTextDescriptions())
+#endif
+    , m_defaultVideoPosterURL(settings.defaultVideoPosterURL())
+    , m_originalTimeWithoutMouseMovementBeforeHidingControls(settings.timeWithoutMouseMovementBeforeHidingControls())
+    , m_useLegacyBackgroundSizeShorthandBehavior(settings.useLegacyBackgroundSizeShorthandBehavior())
+{
+}
+
+void InternalSettings::Backup::restoreTo(Settings& settings)
 {
     RuntimeEnabledFeatures::setCSSExclusionsEnabled(m_originalCSSExclusionsEnabled);
     RuntimeEnabledFeatures::setCSSShapesEnabled(m_originalCSSShapesEnabled);
-    settings->setCSSVariablesEnabled(m_originalCSSVariablesEnabled);
+    settings.setCSSVariablesEnabled(m_originalCSSVariablesEnabled);
 #if ENABLE(SHADOW_DOM)
     RuntimeEnabledFeatures::setShadowDOMEnabled(m_originalShadowDOMEnabled);
@@ -115 +115 @@
     RuntimeEnabledFeatures::setStyleScopedEnabled(m_originalStyleScoped);
 #endif
-    settings->setEditingBehaviorType(m_originalEditingBehavior);
+    settings.setEditingBehaviorType(m_originalEditingBehavior);
 #if ENABLE(TEXT_AUTOSIZING)
-    settings->setTextAutosizingEnabled(m_originalTextAutosizingEnabled);
-    settings->setTextAutosizingWindowSizeOverride(m_originalTextAutosizingWindowSizeOverride);
-    settings->setTextAutosizingFontScaleFactor(m_originalTextAutosizingFontScaleFactor);
-#endif
-    settings->setMediaTypeOverride(m_originalMediaTypeOverride);
+    settings.setTextAutosizingEnabled(m_originalTextAutosizingEnabled);
+    settings.setTextAutosizingWindowSizeOverride(m_originalTextAutosizingWindowSizeOverride);
+    settings.setTextAutosizingFontScaleFactor(m_originalTextAutosizingFontScaleFactor);
+#endif
+    settings.setMediaTypeOverride(m_originalMediaTypeOverride);
 #if ENABLE(DIALOG_ELEMENT)
     RuntimeEnabledFeatures::setDialogElementEnabled(m_originalDialogElementEnabled);
 #endif
-    settings->setCanvasUsesAcceleratedDrawing(m_originalCanvasUsesAcceleratedDrawing);
-    settings->setMockScrollbarsEnabled(m_originalMockScrollbarsEnabled);
+    settings.setCanvasUsesAcceleratedDrawing(m_originalCanvasUsesAcceleratedDrawing);
+    settings.setMockScrollbarsEnabled(m_originalMockScrollbarsEnabled);
     RuntimeEnabledFeatures::setLangAttributeAwareFormControlUIEnabled(m_langAttributeAwareFormControlUIEnabled);
-    settings->setImagesEnabled(m_imagesEnabled);
-    settings->setMinDOMTimerInterval(m_minimumTimerInterval);
+    settings.setImagesEnabled(m_imagesEnabled);
+    settings.setMinDOMTimerInterval(m_minimumTimerInterval);
 #if ENABLE(VIDEO_TRACK)
-    settings->setShouldDisplaySubtitles(m_shouldDisplaySubtitles);
-    settings->setShouldDisplayCaptions(m_shouldDisplayCaptions);
-    settings->setShouldDisplayTextDescriptions(m_shouldDisplayTextDescriptions);
-#endif
-    settings->setDefaultVideoPosterURL(m_defaultVideoPosterURL);
-    settings->setTimeWithoutMouseMovementBeforeHidingControls(m_originalTimeWithoutMouseMovementBeforeHidingControls);
-    settings->setUseLegacyBackgroundSizeShorthandBehavior(m_useLegacyBackgroundSizeShorthandBehavior);
+    settings.setShouldDisplaySubtitles(m_shouldDisplaySubtitles);
+    settings.setShouldDisplayCaptions(m_shouldDisplayCaptions);
+    settings.setShouldDisplayTextDescriptions(m_shouldDisplayTextDescriptions);
+#endif
+    settings.setDefaultVideoPosterURL(m_defaultVideoPosterURL);
+    settings.setTimeWithoutMouseMovementBeforeHidingControls(m_originalTimeWithoutMouseMovementBeforeHidingControls);
+    settings.setUseLegacyBackgroundSizeShorthandBehavior(m_useLegacyBackgroundSizeShorthandBehavior);
 }
 
@@ -185 +185 @@
     page()->setCanStartMedia(true);
 
-    m_backup.restoreTo(settings());
-    m_backup = Backup(settings());
+    m_backup.restoreTo(*settings());
+    m_backup = Backup(*settings());
 
     InternalSettingsGenerated::resetToConsistentState();
@@ -195 +195 @@
     if (!page())
         return 0;
-    return page()->settings();
+    return &page()->settings();
 }
 

trunk/Source/WebCore/testing/InternalSettings.h

@@ -48 +48 @@
     class Backup {
     public:
-        explicit Backup(Settings*);
-        void restoreTo(Settings*);
+        explicit Backup(Settings&);
+        void restoreTo(Settings&);
 
         bool m_originalCSSExclusionsEnabled;

trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp

@@ -88 +88 @@
         return false;
 
-    if (!document->frame()->page()->settings()->developerExtrasEnabled())
+    if (!document->frame()->page()->settings().developerExtrasEnabled())
         return false;
 

trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp

@@ -637 +637 @@
     if (!element->document()->page())
         return false;
-    return element->document()->page()->settings()->fullScreenEnabled();
+    return element->document()->page()->settings().fullScreenEnabled();
 }
 

trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp

@@ -248 +248 @@
     DRT_SUPPRT_PAGE_GET_OR_RETURN(ewkView, page);
 
-    page->settings()->setLoadsSiteIconsIgnoringImageLoadingSetting(loadsSiteIconsIgnoringImageLoadingPreferences);
+    page->settings().setLoadsSiteIconsIgnoringImageLoadingSetting(loadsSiteIconsIgnoringImageLoadingPreferences);
 }
 
@@ -255 +255 @@
     DRT_SUPPRT_PAGE_GET_OR_RETURN(ewkView, page);
 
-    page->settings()->setMinimumLogicalFontSize(size);
+    page->settings().setMinimumLogicalFontSize(size);
 }
 
@@ -306 +306 @@
     DRT_SUPPRT_PAGE_GET_OR_RETURN(ewkView, page);
 
-    page->settings()->setCSSGridLayoutEnabled(enabled);
+    page->settings().setCSSGridLayoutEnabled(enabled);
 }
 
@@ -330 +330 @@
     DRT_SUPPRT_PAGE_GET_OR_RETURN(ewkView, page);
 
-    page->settings()->setWebAudioEnabled(enabled);
+    page->settings().setWebAudioEnabled(enabled);
 #else
     UNUSED_PARAM(ewkView);
@@ -529 +529 @@
     DRT_SUPPRT_PAGE_GET_OR_RETURN(ewkView, page);
 
-    page->settings()->setInteractiveFormValidationEnabled(enabled);
+    page->settings().setInteractiveFormValidationEnabled(enabled);
 }
 
@@ -536 +536 @@
     DRT_SUPPRT_PAGE_GET_OR_RETURN(ewkView, page);
 
-    page->settings()->setValidationMessageTimerMagnification(value);
+    page->settings().setValidationMessageTimerMagnification(value);
 }
 
@@ -543 +543 @@
     DRT_SUPPRT_PAGE_GET_OR_RETURN(ewkView, page);
 
-    page->settings()->setAuthorAndUserStylesEnabled(enabled);
+    page->settings().setAuthorAndUserStylesEnabled(enabled);
 }
 

trunk/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp

@@ -250 +250 @@
     if (!corePage)
         return false;
-    return corePage->settings()->smartInsertDeleteEnabled();
+    return corePage->settings().smartInsertDeleteEnabled();
 }
 
@@ -258 +258 @@
     if (!corePage)
         return false;
-    return corePage->settings()->selectTrailingWhitespaceEnabled();
+    return corePage->settings().selectTrailingWhitespaceEnabled();
 }
 

trunk/Source/WebKit/efl/ewk/ewk_view.cpp

@@ -724 +724 @@
 #endif
 
-    priv->pageSettings = priv->page->settings();
+    priv->pageSettings = &priv->page->settings();
 
     WebCore::LayoutMilestones layoutMilestones = WebCore::DidFirstLayout | WebCore::DidFirstVisuallyNonEmptyLayout;

trunk/Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp

@@ -101 +101 @@
     m_nonCompositedContentLayer->setContentsOpaque(!m_webView->priv->transparent);
     m_nonCompositedContentLayer->setSize(pageSize);
-    if (core(m_webView)->settings()->acceleratedDrawingEnabled())
+    if (core(m_webView)->settings().acceleratedDrawingEnabled())
         m_nonCompositedContentLayer->setAcceleratesDrawing(true);
 

trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp

@@ -598 +598 @@
 void DumpRenderTreeSupportGtk::setPageCacheSupportsPlugins(WebKitWebView* webView, bool enabled)
 {
-    core(webView)->settings()->setPageCacheSupportsPlugins(enabled);
+    core(webView)->settings().setPageCacheSupportsPlugins(enabled);
 }
 
 void DumpRenderTreeSupportGtk::setCSSGridLayoutEnabled(WebKitWebView* webView, bool enabled)
 {
-    core(webView)->settings()->setCSSGridLayoutEnabled(enabled);
+    core(webView)->settings().setCSSGridLayoutEnabled(enabled);
 }
 
@@ -614 +614 @@
 {
 #if ENABLE(CSS_SHADERS)
-    core(webView)->settings()->setCSSCustomFilterEnabled(enabled);
+    core(webView)->settings().setCSSCustomFilterEnabled(enabled);
 #endif
 }

trunk/Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp

@@ -366 +366 @@
     if (!corePage)
         return false;
-    return corePage->settings()->smartInsertDeleteEnabled();
+    return corePage->settings().smartInsertDeleteEnabled();
 }
 
@@ -374 +374 @@
     if (!corePage)
         return false;
-    return corePage->settings()->selectTrailingWhitespaceEnabled();
+    return corePage->settings().selectTrailingWhitespaceEnabled();
 }
 

trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp

@@ -208 +208 @@
 
     CredentialStorageMode credentialStorageMode;
-    if (core(view)->settings()->privateBrowsingEnabled())
+    if (core(view)->settings().privateBrowsingEnabled())
         credentialStorageMode = DisallowPersistentStorage;
     else

trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp

@@ -1466 +1466 @@
 
     WebKitWebSettings* webSettings = priv->webSettings.get();
-    Settings* settings = core(webView)->settings();
+    Settings& settings = core(webView)->settings();
     guint defaultFontSize, defaultMonospaceFontSize, minimumFontSize, minimumLogicalFontSize;
 
@@ -1476 +1476 @@
                  NULL);
 
-    settings->setDefaultFontSize(webViewConvertFontSizeToPixels(webView, defaultFontSize));
-    settings->setDefaultFixedFontSize(webViewConvertFontSizeToPixels(webView, defaultMonospaceFontSize));
-    settings->setMinimumFontSize(webViewConvertFontSizeToPixels(webView, minimumFontSize));
-    settings->setMinimumLogicalFontSize(webViewConvertFontSizeToPixels(webView, minimumLogicalFontSize));
+    settings.setDefaultFontSize(webViewConvertFontSizeToPixels(webView, defaultFontSize));
+    settings.setDefaultFixedFontSize(webViewConvertFontSizeToPixels(webView, defaultMonospaceFontSize));
+    settings.setMinimumFontSize(webViewConvertFontSizeToPixels(webView, minimumFontSize));
+    settings.setMinimumLogicalFontSize(webViewConvertFontSizeToPixels(webView, minimumLogicalFontSize));
 }
 
@@ -3499 +3499 @@
 {
     WebKitWebSettingsPrivate* settingsPrivate = webView->priv->webSettings->priv;
-    Settings* coreSettings = core(webView)->settings();
-
-    coreSettings->setDefaultTextEncodingName(settingsPrivate->defaultEncoding.data());
-    coreSettings->setCursiveFontFamily(settingsPrivate->cursiveFontFamily.data());
-    coreSettings->setStandardFontFamily(settingsPrivate->defaultFontFamily.data());
-    coreSettings->setFantasyFontFamily(settingsPrivate->fantasyFontFamily.data());
-    coreSettings->setFixedFontFamily(settingsPrivate->monospaceFontFamily.data());
-    coreSettings->setSansSerifFontFamily(settingsPrivate->sansSerifFontFamily.data());
-    coreSettings->setSerifFontFamily(settingsPrivate->serifFontFamily.data());
-    coreSettings->setLoadsImagesAutomatically(settingsPrivate->autoLoadImages);
-    coreSettings->setShrinksStandaloneImagesToFit(settingsPrivate->autoShrinkImages);
-    coreSettings->setShouldRespectImageOrientation(settingsPrivate->respectImageOrientation);
-    coreSettings->setShouldPrintBackgrounds(settingsPrivate->printBackgrounds);
-    coreSettings->setScriptEnabled(settingsPrivate->enableScripts);
-    coreSettings->setPluginsEnabled(settingsPrivate->enablePlugins);
-    coreSettings->setTextAreasAreResizable(settingsPrivate->resizableTextAreas);
-    coreSettings->setUserStyleSheetLocation(KURL(KURL(), settingsPrivate->userStylesheetURI.data()));
-    coreSettings->setDeveloperExtrasEnabled(settingsPrivate->enableDeveloperExtras);
-    coreSettings->setPrivateBrowsingEnabled(settingsPrivate->enablePrivateBrowsing);
-    coreSettings->setCaretBrowsingEnabled(settingsPrivate->enableCaretBrowsing);
-    coreSettings->setLocalStorageEnabled(settingsPrivate->enableHTML5LocalStorage);
-    coreSettings->setLocalStorageDatabasePath(settingsPrivate->html5LocalStorageDatabasePath.data());
-    coreSettings->setXSSAuditorEnabled(settingsPrivate->enableXSSAuditor);
-    coreSettings->setSpatialNavigationEnabled(settingsPrivate->enableSpatialNavigation);
-    coreSettings->setFrameFlatteningEnabled(settingsPrivate->enableFrameFlattening);
-    coreSettings->setJavaScriptCanOpenWindowsAutomatically(settingsPrivate->javascriptCanOpenWindowsAutomatically);
-    coreSettings->setJavaScriptCanAccessClipboard(settingsPrivate->javascriptCanAccessClipboard);
-    coreSettings->setOfflineWebApplicationCacheEnabled(settingsPrivate->enableOfflineWebApplicationCache);
-    coreSettings->setEditingBehaviorType(static_cast<WebCore::EditingBehaviorType>(settingsPrivate->editingBehavior));
-    coreSettings->setAllowUniversalAccessFromFileURLs(settingsPrivate->enableUniversalAccessFromFileURIs);
-    coreSettings->setAllowFileAccessFromFileURLs(settingsPrivate->enableFileAccessFromFileURIs);
-    coreSettings->setDOMPasteAllowed(settingsPrivate->enableDOMPaste);
-    coreSettings->setNeedsSiteSpecificQuirks(settingsPrivate->enableSiteSpecificQuirks);
-    coreSettings->setUsesPageCache(settingsPrivate->enablePageCache);
-    coreSettings->setJavaEnabled(settingsPrivate->enableJavaApplet);
-    coreSettings->setHyperlinkAuditingEnabled(settingsPrivate->enableHyperlinkAuditing);
-    coreSettings->setDNSPrefetchingEnabled(settingsPrivate->enableDNSPrefetching);
-    coreSettings->setMediaPlaybackRequiresUserGesture(settingsPrivate->mediaPlaybackRequiresUserGesture);
-    coreSettings->setMediaPlaybackAllowsInline(settingsPrivate->mediaPlaybackAllowsInline);
-    coreSettings->setAllowDisplayOfInsecureContent(settingsPrivate->enableDisplayOfInsecureContent);
-    coreSettings->setAllowRunningOfInsecureContent(settingsPrivate->enableRunningOfInsecureContent);
+    Settings& coreSettings = core(webView)->settings();
+
+    coreSettings.setDefaultTextEncodingName(settingsPrivate->defaultEncoding.data());
+    coreSettings.setCursiveFontFamily(settingsPrivate->cursiveFontFamily.data());
+    coreSettings.setStandardFontFamily(settingsPrivate->defaultFontFamily.data());
+    coreSettings.setFantasyFontFamily(settingsPrivate->fantasyFontFamily.data());
+    coreSettings.setFixedFontFamily(settingsPrivate->monospaceFontFamily.data());
+    coreSettings.setSansSerifFontFamily(settingsPrivate->sansSerifFontFamily.data());
+    coreSettings.setSerifFontFamily(settingsPrivate->serifFontFamily.data());
+    coreSettings.setLoadsImagesAutomatically(settingsPrivate->autoLoadImages);
+    coreSettings.setShrinksStandaloneImagesToFit(settingsPrivate->autoShrinkImages);
+    coreSettings.setShouldRespectImageOrientation(settingsPrivate->respectImageOrientation);
+    coreSettings.setShouldPrintBackgrounds(settingsPrivate->printBackgrounds);
+    coreSettings.setScriptEnabled(settingsPrivate->enableScripts);
+    coreSettings.setPluginsEnabled(settingsPrivate->enablePlugins);
+    coreSettings.setTextAreasAreResizable(settingsPrivate->resizableTextAreas);
+    coreSettings.setUserStyleSheetLocation(KURL(KURL(), settingsPrivate->userStylesheetURI.data()));
+    coreSettings.setDeveloperExtrasEnabled(settingsPrivate->enableDeveloperExtras);
+    coreSettings.setPrivateBrowsingEnabled(settingsPrivate->enablePrivateBrowsing);
+    coreSettings.setCaretBrowsingEnabled(settingsPrivate->enableCaretBrowsing);
+    coreSettings.setLocalStorageEnabled(settingsPrivate->enableHTML5LocalStorage);
+    coreSettings.setLocalStorageDatabasePath(settingsPrivate->html5LocalStorageDatabasePath.data());
+    coreSettings.setXSSAuditorEnabled(settingsPrivate->enableXSSAuditor);
+    coreSettings.setSpatialNavigationEnabled(settingsPrivate->enableSpatialNavigation);
+    coreSettings.setFrameFlatteningEnabled(settingsPrivate->enableFrameFlattening);
+    coreSettings.setJavaScriptCanOpenWindowsAutomatically(settingsPrivate->javascriptCanOpenWindowsAutomatically);
+    coreSettings.setJavaScriptCanAccessClipboard(settingsPrivate->javascriptCanAccessClipboard);
+    coreSettings.setOfflineWebApplicationCacheEnabled(settingsPrivate->enableOfflineWebApplicationCache);
+    coreSettings.setEditingBehaviorType(static_cast<WebCore::EditingBehaviorType>(settingsPrivate->editingBehavior));
+    coreSettings.setAllowUniversalAccessFromFileURLs(settingsPrivate->enableUniversalAccessFromFileURIs);
+    coreSettings.setAllowFileAccessFromFileURLs(settingsPrivate->enableFileAccessFromFileURIs);
+    coreSettings.setDOMPasteAllowed(settingsPrivate->enableDOMPaste);
+    coreSettings.setNeedsSiteSpecificQuirks(settingsPrivate->enableSiteSpecificQuirks);
+    coreSettings.setUsesPageCache(settingsPrivate->enablePageCache);
+    coreSettings.setJavaEnabled(settingsPrivate->enableJavaApplet);
+    coreSettings.setHyperlinkAuditingEnabled(settingsPrivate->enableHyperlinkAuditing);
+    coreSettings.setDNSPrefetchingEnabled(settingsPrivate->enableDNSPrefetching);
+    coreSettings.setMediaPlaybackRequiresUserGesture(settingsPrivate->mediaPlaybackRequiresUserGesture);
+    coreSettings.setMediaPlaybackAllowsInline(settingsPrivate->mediaPlaybackAllowsInline);
+    coreSettings.setAllowDisplayOfInsecureContent(settingsPrivate->enableDisplayOfInsecureContent);
+    coreSettings.setAllowRunningOfInsecureContent(settingsPrivate->enableRunningOfInsecureContent);
 
 #if ENABLE(SQL_DATABASE)
@@ -3546 +3546 @@
 
 #if ENABLE(FULLSCREEN_API)
-    coreSettings->setFullScreenEnabled(settingsPrivate->enableFullscreen);
+    coreSettings.setFullScreenEnabled(settingsPrivate->enableFullscreen);
 #endif
 
@@ -3557 +3557 @@
 
 #if ENABLE(WEBGL)
-    coreSettings->setWebGLEnabled(settingsPrivate->enableWebgl);
+    coreSettings.setWebGLEnabled(settingsPrivate->enableWebgl);
 #endif
 
@@ -3565 +3565 @@
 
 #if USE(ACCELERATED_COMPOSITING)
-    coreSettings->setAcceleratedCompositingEnabled(settingsPrivate->enableAcceleratedCompositing);
+    coreSettings.setAcceleratedCompositingEnabled(settingsPrivate->enableAcceleratedCompositing);
     char* debugVisualsEnvironment = getenv("WEBKIT_SHOW_COMPOSITING_DEBUG_VISUALS");
     bool showDebugVisuals = debugVisualsEnvironment && !strcmp(debugVisualsEnvironment, "1");
-    coreSettings->setShowDebugBorders(showDebugVisuals);
-    coreSettings->setShowRepaintCounter(showDebugVisuals);
+    coreSettings.setShowDebugBorders(showDebugVisuals);
+    coreSettings.setShowRepaintCounter(showDebugVisuals);
 #endif
 
 #if ENABLE(WEB_AUDIO)
-    coreSettings->setWebAudioEnabled(settingsPrivate->enableWebAudio);
+    coreSettings.setWebAudioEnabled(settingsPrivate->enableWebAudio);
 #endif
 
 #if ENABLE(SMOOTH_SCROLLING)
-    coreSettings->setScrollAnimatorEnabled(settingsPrivate->enableSmoothScrolling);
+    coreSettings.setScrollAnimatorEnabled(settingsPrivate->enableSmoothScrolling);
 #endif
 
 #if ENABLE(CSS_SHADERS)
-    coreSettings->setCSSCustomFilterEnabled(settingsPrivate->enableCSSShaders);
+    coreSettings.setCSSCustomFilterEnabled(settingsPrivate->enableCSSShaders);
 #endif
 
     // Use mock scrollbars if in DumpRenderTree mode (i.e. testing layout tests).
-    coreSettings->setMockScrollbarsEnabled(DumpRenderTreeSupportGtk::dumpRenderTreeModeEnabled());
+    coreSettings.setMockScrollbarsEnabled(DumpRenderTreeSupportGtk::dumpRenderTreeModeEnabled());
 
     if (Page* page = core(webView))
@@ -3595 +3595 @@
 static void webkit_web_view_settings_notify(WebKitWebSettings* webSettings, GParamSpec* pspec, WebKitWebView* webView)
 {
-    Settings* settings = core(webView)->settings();
+    Settings& settings = core(webView)->settings();
 
     const gchar* name = g_intern_string(pspec->name);
@@ -3603 +3603 @@
 
     if (name == g_intern_string("default-encoding"))
-        settings->setDefaultTextEncodingName(g_value_get_string(&value));
+        settings.setDefaultTextEncodingName(g_value_get_string(&value));
     else if (name == g_intern_string("cursive-font-family"))
-        settings->setCursiveFontFamily(g_value_get_string(&value));
+        settings.setCursiveFontFamily(g_value_get_string(&value));
     else if (name == g_intern_string("default-font-family"))
-        settings->setStandardFontFamily(g_value_get_string(&value));
+        settings.setStandardFontFamily(g_value_get_string(&value));
     else if (name == g_intern_string("fantasy-font-family"))
-        settings->setFantasyFontFamily(g_value_get_string(&value));
+        settings.setFantasyFontFamily(g_value_get_string(&value));
     else if (name == g_intern_string("monospace-font-family"))
-        settings->setFixedFontFamily(g_value_get_string(&value));
+        settings.setFixedFontFamily(g_value_get_string(&value));
     else if (name == g_intern_string("sans-serif-font-family"))
-        settings->setSansSerifFontFamily(g_value_get_string(&value));
+        settings.setSansSerifFontFamily(g_value_get_string(&value));
     else if (name == g_intern_string("serif-font-family"))
-        settings->setSerifFontFamily(g_value_get_string(&value));
+        settings.setSerifFontFamily(g_value_get_string(&value));
     else if (name == g_intern_string("default-font-size"))
-        settings->setDefaultFontSize(webViewConvertFontSizeToPixels(webView, g_value_get_int(&value)));
+        settings.setDefaultFontSize(webViewConvertFontSizeToPixels(webView, g_value_get_int(&value)));
     else if (name == g_intern_string("default-monospace-font-size"))
-        settings->setDefaultFixedFontSize(webViewConvertFontSizeToPixels(webView, g_value_get_int(&value)));
+        settings.setDefaultFixedFontSize(webViewConvertFontSizeToPixels(webView, g_value_get_int(&value)));
     else if (name == g_intern_string("minimum-font-size"))
-        settings->setMinimumFontSize(webViewConvertFontSizeToPixels(webView, g_value_get_int(&value)));
+        settings.setMinimumFontSize(webViewConvertFontSizeToPixels(webView, g_value_get_int(&value)));
     else if (name == g_intern_string("minimum-logical-font-size"))
-        settings->setMinimumLogicalFontSize(webViewConvertFontSizeToPixels(webView, g_value_get_int(&value)));
+        settings.setMinimumLogicalFontSize(webViewConvertFontSizeToPixels(webView, g_value_get_int(&value)));
     else if (name == g_intern_string("enforce-96-dpi"))
         webkit_web_view_screen_changed(GTK_WIDGET(webView), NULL);
     else if (name == g_intern_string("auto-load-images"))
-        settings->setLoadsImagesAutomatically(g_value_get_boolean(&value));
+        settings.setLoadsImagesAutomatically(g_value_get_boolean(&value));
     else if (name == g_intern_string("auto-shrink-images"))
-        settings->setShrinksStandaloneImagesToFit(g_value_get_boolean(&value));
+        settings.setShrinksStandaloneImagesToFit(g_value_get_boolean(&value));
     else if (name == g_intern_string("respect-image-orientation"))
-        settings->setShouldRespectImageOrientation(g_value_get_boolean(&value));
+        settings.setShouldRespectImageOrientation(g_value_get_boolean(&value));
     else if (name == g_intern_string("print-backgrounds"))
-        settings->setShouldPrintBackgrounds(g_value_get_boolean(&value));
+        settings.setShouldPrintBackgrounds(g_value_get_boolean(&value));
     else if (name == g_intern_string("enable-scripts"))
-        settings->setScriptEnabled(g_value_get_boolean(&value));
+        settings.setScriptEnabled(g_value_get_boolean(&value));
     else if (name == g_intern_string("enable-plugins"))
-        settings->setPluginsEnabled(g_value_get_boolean(&value));
+        settings.setPluginsEnabled(g_value_get_boolean(&value));
     else if (name == g_intern_string("enable-dns-prefetching"))
-        settings->setDNSPrefetchingEnabled(g_value_get_boolean(&value));
+        settings.setDNSPrefetchingEnabled(g_value_get_boolean(&value));
     else if (name == g_intern_string("resizable-text-areas"))
-        settings->setTextAreasAreResizable(g_value_get_boolean(&value));
+        settings.setTextAreasAreResizable(g_value_get_boolean(&value));
     else if (name == g_intern_string("user-stylesheet-uri"))
-        settings->setUserStyleSheetLocation(KURL(KURL(), g_value_get_string(&value)));
+        settings.setUserStyleSheetLocation(KURL(KURL(), g_value_get_string(&value)));
     else if (name == g_intern_string("enable-developer-extras"))
-        settings->setDeveloperExtrasEnabled(g_value_get_boolean(&value));
+        settings.setDeveloperExtrasEnabled(g_value_get_boolean(&value));
     else if (name == g_intern_string("enable-private-browsing"))
-        settings->setPrivateBrowsingEnabled(g_value_get_boolean(&value));
+        settings.setPrivateBrowsingEnabled(g_value_get_boolean(&value));
     else if (name == g_intern_string("enable-caret-browsing"))
-        settings->setCaretBrowsingEnabled(g_value_get_boolean(&value));
+        settings.setCaretBrowsingEnabled(g_value_get_boolean(&value));
 #if ENABLE(SQL_DATABASE)
     else if (name == g_intern_string("enable-html5-database")) {
@@ -3656 +3656 @@
 #endif
     else if (name == g_intern_string("enable-html5-local-storage"))
-        settings->setLocalStorageEnabled(g_value_get_boolean(&value));
+        settings.setLocalStorageEnabled(g_value_get_boolean(&value));
     else if (name == g_intern_string("html5-local-storage-database-path"))
-        settings->setLocalStorageDatabasePath(g_value_get_string(&value));
+        settings.setLocalStorageDatabasePath(g_value_get_string(&value));
     else if (name == g_intern_string("enable-xss-auditor"))
-        settings->setXSSAuditorEnabled(g_value_get_boolean(&value));
+        settings.setXSSAuditorEnabled(g_value_get_boolean(&value));
     else if (name == g_intern_string("enable-spatial-navigation"))
-        settings->setSpatialNavigationEnabled(g_value_get_boolean(&value));
+        settings.setSpatialNavigationEnabled(g_value_get_boolean(&value));
     else if (name == g_intern_string("enable-frame-flattening"))
-        settings->setFrameFlatteningEnabled(g_value_get_boolean(&value));
+        settings.setFrameFlatteningEnabled(g_value_get_boolean(&value));
     else if (name == g_intern_string("javascript-can-open-windows-automatically"))
-        settings->setJavaScriptCanOpenWindowsAutomatically(g_value_get_boolean(&value));
+        settings.setJavaScriptCanOpenWindowsAutomatically(g_value_get_boolean(&value));
     else if (name == g_intern_string("javascript-can-access-clipboard"))
-        settings->setJavaScriptCanAccessClipboard(g_value_get_boolean(&value));
+        settings.setJavaScriptCanAccessClipboard(g_value_get_boolean(&value));
     else if (name == g_intern_string("enable-offline-web-application-cache"))
-        settings->setOfflineWebApplicationCacheEnabled(g_value_get_boolean(&value));
+        settings.setOfflineWebApplicationCacheEnabled(g_value_get_boolean(&value));
     else if (name == g_intern_string("editing-behavior"))
-        settings->setEditingBehaviorType(static_cast<WebCore::EditingBehaviorType>(g_value_get_enum(&value)));
+        settings.setEditingBehaviorType(static_cast<WebCore::EditingBehaviorType>(g_value_get_enum(&value)));
     else if (name == g_intern_string("enable-universal-access-from-file-uris"))
-        settings->setAllowUniversalAccessFromFileURLs(g_value_get_boolean(&value));
+        settings.setAllowUniversalAccessFromFileURLs(g_value_get_boolean(&value));
     else if (name == g_intern_string("enable-file-access-from-file-uris"))
-        settings->setAllowFileAccessFromFileURLs(g_value_get_boolean(&value));
+        settings.setAllowFileAccessFromFileURLs(g_value_get_boolean(&value));
     else if (name == g_intern_string("enable-dom-paste"))
-        settings->setDOMPasteAllowed(g_value_get_boolean(&value));
+        settings.setDOMPasteAllowed(g_value_get_boolean(&value));
     else if (name == g_intern_string("tab-key-cycles-through-elements")) {
         Page* page = core(webView);
@@ -3684 +3684 @@
             page->setTabKeyCyclesThroughElements(g_value_get_boolean(&value));
     } else if (name == g_intern_string("enable-site-specific-quirks"))
-        settings->setNeedsSiteSpecificQuirks(g_value_get_boolean(&value));
+        settings.setNeedsSiteSpecificQuirks(g_value_get_boolean(&value));
     else if (name == g_intern_string("enable-page-cache"))
-        settings->setUsesPageCache(g_value_get_boolean(&value));
+        settings.setUsesPageCache(g_value_get_boolean(&value));
     else if (name == g_intern_string("enable-java-applet"))
-        settings->setJavaEnabled(g_value_get_boolean(&value));
+        settings.setJavaEnabled(g_value_get_boolean(&value));
     else if (name == g_intern_string("enable-hyperlink-auditing"))
-        settings->setHyperlinkAuditingEnabled(g_value_get_boolean(&value));
+        settings.setHyperlinkAuditingEnabled(g_value_get_boolean(&value));
     else if (name == g_intern_string("media-playback-requires-user-gesture"))
-        settings->setMediaPlaybackRequiresUserGesture(g_value_get_boolean(&value));
+        settings.setMediaPlaybackRequiresUserGesture(g_value_get_boolean(&value));
     else if (name == g_intern_string("media-playback-allows-inline"))
-        settings->setMediaPlaybackAllowsInline(g_value_get_boolean(&value));
+        settings.setMediaPlaybackAllowsInline(g_value_get_boolean(&value));
 
 #if ENABLE(SPELLCHECK)
@@ -3709 +3709 @@
 #if ENABLE(WEBGL)
     else if (name == g_intern_string("enable-webgl"))
-        settings->setWebGLEnabled(g_value_get_boolean(&value));
+        settings.setWebGLEnabled(g_value_get_boolean(&value));
 #endif
 
 #if USE(ACCELERATED_COMPOSITING)
     else if (name == g_intern_string("enable-accelerated-compositing"))
-        settings->setAcceleratedCompositingEnabled(g_value_get_boolean(&value));
+        settings.setAcceleratedCompositingEnabled(g_value_get_boolean(&value));
 #endif
 
 #if ENABLE(WEB_AUDIO)
     else if (name == g_intern_string("enable-webaudio"))
-        settings->setWebAudioEnabled(g_value_get_boolean(&value));
+        settings.setWebAudioEnabled(g_value_get_boolean(&value));
 #endif
 
 #if ENABLE(SMOOTH_SCROLLING)
     else if (name == g_intern_string("enable-smooth-scrolling"))
-        settings->setScrollAnimatorEnabled(g_value_get_boolean(&value));
+        settings.setScrollAnimatorEnabled(g_value_get_boolean(&value));
 #endif
 
 #if ENABLE(CSS_SHADERS)
     else if (name == g_intern_string("enable-css-shaders"))
-        settings->setCSSCustomFilterEnabled(g_value_get_boolean(&value));
+        settings.setCSSCustomFilterEnabled(g_value_get_boolean(&value));
 #endif
 
@@ -3790 +3790 @@
     if (DumpRenderTreeSupportGtk::dumpRenderTreeModeEnabled()) {
         // Set some testing-specific settings
-        priv->corePage->settings()->setInteractiveFormValidationEnabled(true);
-        priv->corePage->settings()->setValidationMessageTimerMagnification(-1);
+        priv->corePage->settings().setInteractiveFormValidationEnabled(true);
+        priv->corePage->settings().setValidationMessageTimerMagnification(-1);
     }
 

trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm

@@ -239 +239 @@
     if (!page)
         return false;
-    return page->settings()->smartInsertDeleteEnabled();
+    return page->settings().smartInsertDeleteEnabled();
 }
 
@@ -247 +247 @@
     if (!page)
         return false;
-    return page->settings()->selectTrailingWhitespaceEnabled();
+    return page->settings().selectTrailingWhitespaceEnabled();
 }
 

trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm

@@ -979 +979 @@
 
     if (Page* page = core(m_webFrame.get())->page()) {
-        if (!page->settings()->privateBrowsingEnabled())
+        if (!page->settings().privateBrowsingEnabled())
             historyItem = page->backForward()->currentItem();
     }

trunk/Source/WebKit/mac/WebView/WebView.mm

@@ -773 +773 @@
 
     _private->page->setCanStartMedia([self window]);
-    _private->page->settings()->setLocalStorageDatabasePath([[self preferences] _localStorageDatabasePath]);
-    _private->page->settings()->setUseLegacyBackgroundSizeShorthandBehavior(shouldUseLegacyBackgroundSizeShorthandBehavior());
+    _private->page->settings().setLocalStorageDatabasePath([[self preferences] _localStorageDatabasePath]);
+    _private->page->settings().setUseLegacyBackgroundSizeShorthandBehavior(shouldUseLegacyBackgroundSizeShorthandBehavior());
 
     if (needsOutlookQuirksScript()) {
-        _private->page->settings()->setShouldInjectUserScriptsInInitialEmptyDocument(true);
+        _private->page->settings().setShouldInjectUserScriptsInInitialEmptyDocument(true);
         [self _injectOutlookQuirksScript];
     }
@@ -1394 +1394 @@
         // Pre-HTML5 parser quirks are required to remain compatible with many
         // Dashboard widgets. See <rdar://problem/8175982>.
-        || (_private->page && _private->page->settings()->usesDashboardBackwardCompatibilityMode())
+        || (_private->page && _private->page->settings().usesDashboardBackwardCompatibilityMode())
 #endif
         || [[self preferences] usePreHTML5ParserQuirks];
@@ -1424 +1424 @@
         return;
     
-    Settings* settings = _private->page->settings();
-    
-    settings->setCursiveFontFamily([preferences cursiveFontFamily]);
-    settings->setDefaultFixedFontSize([preferences defaultFixedFontSize]);
-    settings->setDefaultFontSize([preferences defaultFontSize]);
-    settings->setDefaultTextEncodingName([preferences defaultTextEncodingName]);
-    settings->setUsesEncodingDetector([preferences usesEncodingDetector]);
-    settings->setFantasyFontFamily([preferences fantasyFontFamily]);
-    settings->setFixedFontFamily([preferences fixedFontFamily]);
-    settings->setScreenFontSubstitutionEnabled(
+    Settings& settings = _private->page->settings();
+
+    settings.setCursiveFontFamily([preferences cursiveFontFamily]);
+    settings.setDefaultFixedFontSize([preferences defaultFixedFontSize]);
+    settings.setDefaultFontSize([preferences defaultFontSize]);
+    settings.setDefaultTextEncodingName([preferences defaultTextEncodingName]);
+    settings.setUsesEncodingDetector([preferences usesEncodingDetector]);
+    settings.setFantasyFontFamily([preferences fantasyFontFamily]);
+    settings.setFixedFontFamily([preferences fixedFontFamily]);
+    settings.setScreenFontSubstitutionEnabled(
 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
         [[NSUserDefaults standardUserDefaults] boolForKey:@"NSFontDefaultScreenFontSubstitutionEnabled"] ||
@@ -1439 +1439 @@
         [preferences screenFontSubstitutionEnabled]
     );
-    settings->setForceFTPDirectoryListings([preferences _forceFTPDirectoryListings]);
-    settings->setFTPDirectoryTemplatePath([preferences _ftpDirectoryTemplatePath]);
-    settings->setLocalStorageDatabasePath([preferences _localStorageDatabasePath]);
-    settings->setJavaEnabled([preferences isJavaEnabled]);
-    settings->setScriptEnabled([preferences isJavaScriptEnabled]);
-    settings->setWebSecurityEnabled([preferences isWebSecurityEnabled]);
-    settings->setAllowUniversalAccessFromFileURLs([preferences allowUniversalAccessFromFileURLs]);
-    settings->setAllowFileAccessFromFileURLs([preferences allowFileAccessFromFileURLs]);
-    settings->setJavaScriptCanOpenWindowsAutomatically([preferences javaScriptCanOpenWindowsAutomatically]);
-    settings->setMinimumFontSize([preferences minimumFontSize]);
-    settings->setMinimumLogicalFontSize([preferences minimumLogicalFontSize]);
-    settings->setPictographFontFamily([preferences pictographFontFamily]);
-    settings->setPluginsEnabled([preferences arePlugInsEnabled]);
+    settings.setForceFTPDirectoryListings([preferences _forceFTPDirectoryListings]);
+    settings.setFTPDirectoryTemplatePath([preferences _ftpDirectoryTemplatePath]);
+    settings.setLocalStorageDatabasePath([preferences _localStorageDatabasePath]);
+    settings.setJavaEnabled([preferences isJavaEnabled]);
+    settings.setScriptEnabled([preferences isJavaScriptEnabled]);
+    settings.setWebSecurityEnabled([preferences isWebSecurityEnabled]);
+    settings.setAllowUniversalAccessFromFileURLs([preferences allowUniversalAccessFromFileURLs]);
+    settings.setAllowFileAccessFromFileURLs([preferences allowFileAccessFromFileURLs]);
+    settings.setJavaScriptCanOpenWindowsAutomatically([preferences javaScriptCanOpenWindowsAutomatically]);
+    settings.setMinimumFontSize([preferences minimumFontSize]);
+    settings.setMinimumLogicalFontSize([preferences minimumLogicalFontSize]);
+    settings.setPictographFontFamily([preferences pictographFontFamily]);
+    settings.setPluginsEnabled([preferences arePlugInsEnabled]);
 #if ENABLE(SQL_DATABASE)
     DatabaseManager::manager().setIsAvailable([preferences databasesEnabled]);
 #endif
-    settings->setLocalStorageEnabled([preferences localStorageEnabled]);
-    settings->setExperimentalNotificationsEnabled([preferences experimentalNotificationsEnabled]);
+    settings.setLocalStorageEnabled([preferences localStorageEnabled]);
+    settings.setExperimentalNotificationsEnabled([preferences experimentalNotificationsEnabled]);
 
     bool privateBrowsingEnabled = [preferences privateBrowsingEnabled];
@@ -1465 +1465 @@
         WebFrameNetworkingContext::destroyPrivateBrowsingSession();
 #endif
-    settings->setPrivateBrowsingEnabled(privateBrowsingEnabled);
-
-    settings->setSansSerifFontFamily([preferences sansSerifFontFamily]);
-    settings->setSerifFontFamily([preferences serifFontFamily]);
-    settings->setStandardFontFamily([preferences standardFontFamily]);
-    settings->setLoadsImagesAutomatically([preferences loadsImagesAutomatically]);
-    settings->setLoadsSiteIconsIgnoringImageLoadingSetting([preferences loadsSiteIconsIgnoringImageLoadingPreference]);
-    settings->setShouldPrintBackgrounds([preferences shouldPrintBackgrounds]);
-    settings->setTextAreasAreResizable([preferences textAreasAreResizable]);
-    settings->setShrinksStandaloneImagesToFit([preferences shrinksStandaloneImagesToFit]);
-    settings->setEditableLinkBehavior(core([preferences editableLinkBehavior]));
-    settings->setTextDirectionSubmenuInclusionBehavior(core([preferences textDirectionSubmenuInclusionBehavior]));
-    settings->setDOMPasteAllowed([preferences isDOMPasteAllowed]);
-    settings->setUsesPageCache([self usesPageCache]);
-    settings->setPageCacheSupportsPlugins([preferences pageCacheSupportsPlugins]);
-    settings->setBackForwardCacheExpirationInterval([preferences _backForwardCacheExpirationInterval]);
-    settings->setShowsURLsInToolTips([preferences showsURLsInToolTips]);
-    settings->setShowsToolTipOverTruncatedText([preferences showsToolTipOverTruncatedText]);
-    settings->setDeveloperExtrasEnabled([preferences developerExtrasEnabled]);
-    settings->setJavaScriptExperimentsEnabled([preferences javaScriptExperimentsEnabled]);
-    settings->setAuthorAndUserStylesEnabled([preferences authorAndUserStylesEnabled]);
-    settings->setApplicationChromeMode([preferences applicationChromeModeEnabled]);
+    settings.setPrivateBrowsingEnabled(privateBrowsingEnabled);
+
+    settings.setSansSerifFontFamily([preferences sansSerifFontFamily]);
+    settings.setSerifFontFamily([preferences serifFontFamily]);
+    settings.setStandardFontFamily([preferences standardFontFamily]);
+    settings.setLoadsImagesAutomatically([preferences loadsImagesAutomatically]);
+    settings.setLoadsSiteIconsIgnoringImageLoadingSetting([preferences loadsSiteIconsIgnoringImageLoadingPreference]);
+    settings.setShouldPrintBackgrounds([preferences shouldPrintBackgrounds]);
+    settings.setTextAreasAreResizable([preferences textAreasAreResizable]);
+    settings.setShrinksStandaloneImagesToFit([preferences shrinksStandaloneImagesToFit]);
+    settings.setEditableLinkBehavior(core([preferences editableLinkBehavior]));
+    settings.setTextDirectionSubmenuInclusionBehavior(core([preferences textDirectionSubmenuInclusionBehavior]));
+    settings.setDOMPasteAllowed([preferences isDOMPasteAllowed]);
+    settings.setUsesPageCache([self usesPageCache]);
+    settings.setPageCacheSupportsPlugins([preferences pageCacheSupportsPlugins]);
+    settings.setBackForwardCacheExpirationInterval([preferences _backForwardCacheExpirationInterval]);
+    settings.setShowsURLsInToolTips([preferences showsURLsInToolTips]);
+    settings.setShowsToolTipOverTruncatedText([preferences showsToolTipOverTruncatedText]);
+    settings.setDeveloperExtrasEnabled([preferences developerExtrasEnabled]);
+    settings.setJavaScriptExperimentsEnabled([preferences javaScriptExperimentsEnabled]);
+    settings.setAuthorAndUserStylesEnabled([preferences authorAndUserStylesEnabled]);
+    settings.setApplicationChromeMode([preferences applicationChromeModeEnabled]);
     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 : @"")]);
+        settings.setUserStyleSheetLocation([NSURL URLWithString:(location ? location : @"")]);
     } else
-        settings->setUserStyleSheetLocation([NSURL URLWithString:@""]);
-    settings->setNeedsAdobeFrameReloadingQuirk([self _needsAdobeFrameReloadingQuirk]);
-    settings->setTreatsAnyTextCSSLinkAsStylesheet([self _needsLinkElementTextCSSQuirk]);
-    settings->setNeedsKeyboardEventDisambiguationQuirks([self _needsKeyboardEventDisambiguationQuirks]);
-    settings->setNeedsSiteSpecificQuirks(_private->useSiteSpecificSpoofing);
-    settings->setWebArchiveDebugModeEnabled([preferences webArchiveDebugModeEnabled]);
-    settings->setLocalFileContentSniffingEnabled([preferences localFileContentSniffingEnabled]);
-    settings->setOfflineWebApplicationCacheEnabled([preferences offlineWebApplicationCacheEnabled]);
-    settings->setJavaScriptCanAccessClipboard([preferences javaScriptCanAccessClipboard]);
-    settings->setXSSAuditorEnabled([preferences isXSSAuditorEnabled]);
-    settings->setEnforceCSSMIMETypeInNoQuirksMode(!WKAppVersionCheckLessThan(@"com.apple.iWeb", -1, 2.1));
-    settings->setDNSPrefetchingEnabled([preferences isDNSPrefetchingEnabled]);
+        settings.setUserStyleSheetLocation([NSURL URLWithString:@""]);
+    settings.setNeedsAdobeFrameReloadingQuirk([self _needsAdobeFrameReloadingQuirk]);
+    settings.setTreatsAnyTextCSSLinkAsStylesheet([self _needsLinkElementTextCSSQuirk]);
+    settings.setNeedsKeyboardEventDisambiguationQuirks([self _needsKeyboardEventDisambiguationQuirks]);
+    settings.setNeedsSiteSpecificQuirks(_private->useSiteSpecificSpoofing);
+    settings.setWebArchiveDebugModeEnabled([preferences webArchiveDebugModeEnabled]);
+    settings.setLocalFileContentSniffingEnabled([preferences localFileContentSniffingEnabled]);
+    settings.setOfflineWebApplicationCacheEnabled([preferences offlineWebApplicationCacheEnabled]);
+    settings.setJavaScriptCanAccessClipboard([preferences javaScriptCanAccessClipboard]);
+    settings.setXSSAuditorEnabled([preferences isXSSAuditorEnabled]);
+    settings.setEnforceCSSMIMETypeInNoQuirksMode(!WKAppVersionCheckLessThan(@"com.apple.iWeb", -1, 2.1));
+    settings.setDNSPrefetchingEnabled([preferences isDNSPrefetchingEnabled]);
     
     // FIXME: Enabling accelerated compositing when WebGL is enabled causes tests to fail on Leopard which expect HW compositing to be disabled.
     // Until we fix that, I will comment out the test (CFM)
-    settings->setAcceleratedCompositingEnabled([preferences acceleratedCompositingEnabled]);
-    settings->setAcceleratedDrawingEnabled([preferences acceleratedDrawingEnabled]);
-    settings->setCanvasUsesAcceleratedDrawing([preferences canvasUsesAcceleratedDrawing]);    
-    settings->setShowDebugBorders([preferences showDebugBorders]);
-    settings->setShowRepaintCounter([preferences showRepaintCounter]);
-    settings->setWebGLEnabled([preferences webGLEnabled]);
-    settings->setAccelerated2dCanvasEnabled([preferences accelerated2dCanvasEnabled]);
-    settings->setLoadDeferringEnabled(shouldEnableLoadDeferring());
-    settings->setWindowFocusRestricted(shouldRestrictWindowFocus());
-    settings->setFrameFlatteningEnabled([preferences isFrameFlatteningEnabled]);
-    settings->setSpatialNavigationEnabled([preferences isSpatialNavigationEnabled]);
-    settings->setPaginateDuringLayoutEnabled([preferences paginateDuringLayoutEnabled]);
+    settings.setAcceleratedCompositingEnabled([preferences acceleratedCompositingEnabled]);
+    settings.setAcceleratedDrawingEnabled([preferences acceleratedDrawingEnabled]);
+    settings.setCanvasUsesAcceleratedDrawing([preferences canvasUsesAcceleratedDrawing]);    
+    settings.setShowDebugBorders([preferences showDebugBorders]);
+    settings.setShowRepaintCounter([preferences showRepaintCounter]);
+    settings.setWebGLEnabled([preferences webGLEnabled]);
+    settings.setAccelerated2dCanvasEnabled([preferences accelerated2dCanvasEnabled]);
+    settings.setLoadDeferringEnabled(shouldEnableLoadDeferring());
+    settings.setWindowFocusRestricted(shouldRestrictWindowFocus());
+    settings.setFrameFlatteningEnabled([preferences isFrameFlatteningEnabled]);
+    settings.setSpatialNavigationEnabled([preferences isSpatialNavigationEnabled]);
+    settings.setPaginateDuringLayoutEnabled([preferences paginateDuringLayoutEnabled]);
 #if ENABLE(CSS_SHADERS)
-    settings->setCSSCustomFilterEnabled([preferences cssCustomFilterEnabled]);
+    settings.setCSSCustomFilterEnabled([preferences cssCustomFilterEnabled]);
 #endif
     RuntimeEnabledFeatures::setCSSRegionsEnabled([preferences cssRegionsEnabled]);
     RuntimeEnabledFeatures::setCSSCompositingEnabled([preferences cssCompositingEnabled]);
 #if ENABLE(WEB_AUDIO)
-    settings->setWebAudioEnabled([preferences webAudioEnabled]);
+    settings.setWebAudioEnabled([preferences webAudioEnabled]);
 #endif
 #if ENABLE(IFRAME_SEAMLESS)
     RuntimeEnabledFeatures::setSeamlessIFramesEnabled([preferences seamlessIFramesEnabled]);
 #endif
-    settings->setCSSGridLayoutEnabled([preferences cssGridLayoutEnabled]);
+    settings.setCSSGridLayoutEnabled([preferences cssGridLayoutEnabled]);
 #if ENABLE(FULLSCREEN_API)
-    settings->setFullScreenEnabled([preferences fullScreenEnabled]);
-#endif
-    settings->setAsynchronousSpellCheckingEnabled([preferences asynchronousSpellCheckingEnabled]);
-    settings->setHyperlinkAuditingEnabled([preferences hyperlinkAuditingEnabled]);
-    settings->setUsePreHTML5ParserQuirks([self _needsPreHTML5ParserQuirks]);
-    settings->setCrossOriginCheckInGetMatchedCSSRulesDisabled([self _needsUnrestrictedGetMatchedCSSRules]);
-    settings->setInteractiveFormValidationEnabled([self interactiveFormValidationEnabled]);
-    settings->setValidationMessageTimerMagnification([self validationMessageTimerMagnification]);
+    settings.setFullScreenEnabled([preferences fullScreenEnabled]);
+#endif
+    settings.setAsynchronousSpellCheckingEnabled([preferences asynchronousSpellCheckingEnabled]);
+    settings.setHyperlinkAuditingEnabled([preferences hyperlinkAuditingEnabled]);
+    settings.setUsePreHTML5ParserQuirks([self _needsPreHTML5ParserQuirks]);
+    settings.setCrossOriginCheckInGetMatchedCSSRulesDisabled([self _needsUnrestrictedGetMatchedCSSRules]);
+    settings.setInteractiveFormValidationEnabled([self interactiveFormValidationEnabled]);
+    settings.setValidationMessageTimerMagnification([self validationMessageTimerMagnification]);
 #if USE(AVFOUNDATION)
-    settings->setAVFoundationEnabled([preferences isAVFoundationEnabled]);
+    settings.setAVFoundationEnabled([preferences isAVFoundationEnabled]);
 #endif
 #if PLATFORM(MAC)
-    settings->setQTKitEnabled([preferences isQTKitEnabled]);
-#endif
-    settings->setMediaPlaybackRequiresUserGesture([preferences mediaPlaybackRequiresUserGesture]);
-    settings->setMediaPlaybackAllowsInline([preferences mediaPlaybackAllowsInline]);
-    settings->setSuppressesIncrementalRendering([preferences suppressesIncrementalRendering]);
-    settings->setRegionBasedColumnsEnabled([preferences regionBasedColumnsEnabled]);
-    settings->setBackspaceKeyNavigationEnabled([preferences backspaceKeyNavigationEnabled]);
-    settings->setWantsBalancedSetDefersLoadingBehavior([preferences wantsBalancedSetDefersLoadingBehavior]);
-    settings->setMockScrollbarsEnabled([preferences mockScrollbarsEnabled]);
+    settings.setQTKitEnabled([preferences isQTKitEnabled]);
+#endif
+    settings.setMediaPlaybackRequiresUserGesture([preferences mediaPlaybackRequiresUserGesture]);
+    settings.setMediaPlaybackAllowsInline([preferences mediaPlaybackAllowsInline]);
+    settings.setSuppressesIncrementalRendering([preferences suppressesIncrementalRendering]);
+    settings.setRegionBasedColumnsEnabled([preferences regionBasedColumnsEnabled]);
+    settings.setBackspaceKeyNavigationEnabled([preferences backspaceKeyNavigationEnabled]);
+    settings.setWantsBalancedSetDefersLoadingBehavior([preferences wantsBalancedSetDefersLoadingBehavior]);
+    settings.setMockScrollbarsEnabled([preferences mockScrollbarsEnabled]);
 
 #if ENABLE(VIDEO_TRACK)
-    settings->setShouldDisplaySubtitles([preferences shouldDisplaySubtitles]);
-    settings->setShouldDisplayCaptions([preferences shouldDisplayCaptions]);
-    settings->setShouldDisplayTextDescriptions([preferences shouldDisplayTextDescriptions]);
-#endif
-
-    settings->setShouldRespectImageOrientation([preferences shouldRespectImageOrientation]);
-    settings->setNeedsIsLoadingInAPISenseQuirk([self _needsIsLoadingInAPISenseQuirk]);
-    settings->setRequestAnimationFrameEnabled([preferences requestAnimationFrameEnabled]);
-    settings->setDiagnosticLoggingEnabled([preferences diagnosticLoggingEnabled]);
-    settings->setLowPowerVideoAudioBufferSizeEnabled([preferences lowPowerVideoAudioBufferSizeEnabled]);
+    settings.setShouldDisplaySubtitles([preferences shouldDisplaySubtitles]);
+    settings.setShouldDisplayCaptions([preferences shouldDisplayCaptions]);
+    settings.setShouldDisplayTextDescriptions([preferences shouldDisplayTextDescriptions]);
+#endif
+
+    settings.setShouldRespectImageOrientation([preferences shouldRespectImageOrientation]);
+    settings.setNeedsIsLoadingInAPISenseQuirk([self _needsIsLoadingInAPISenseQuirk]);
+    settings.setRequestAnimationFrameEnabled([preferences requestAnimationFrameEnabled]);
+    settings.setDiagnosticLoggingEnabled([preferences diagnosticLoggingEnabled]);
+    settings.setLowPowerVideoAudioBufferSizeEnabled([preferences lowPowerVideoAudioBufferSizeEnabled]);
 
     switch ([preferences storageBlockingPolicy]) {
     case WebAllowAllStorage:
-        settings->setStorageBlockingPolicy(SecurityOrigin::AllowAllStorage);
+        settings.setStorageBlockingPolicy(SecurityOrigin::AllowAllStorage);
         break;
     case WebBlockThirdPartyStorage:
-        settings->setStorageBlockingPolicy(SecurityOrigin::BlockThirdPartyStorage);
+        settings.setStorageBlockingPolicy(SecurityOrigin::BlockThirdPartyStorage);
         break;
     case WebBlockAllStorage:
-        settings->setStorageBlockingPolicy(SecurityOrigin::BlockAllStorage);
+        settings.setStorageBlockingPolicy(SecurityOrigin::BlockAllStorage);
         break;
     }
 
-    settings->setPlugInSnapshottingEnabled([preferences plugInSnapshottingEnabled]);
+    settings.setPlugInSnapshottingEnabled([preferences plugInSnapshottingEnabled]);
 
 #if ENABLE(HIDDEN_PAGE_DOM_TIMER_THROTTLING)
-    settings->setHiddenPageDOMTimerThrottlingEnabled([preferences hiddenPageDOMTimerThrottlingEnabled]);
+    settings.setHiddenPageDOMTimerThrottlingEnabled([preferences hiddenPageDOMTimerThrottlingEnabled]);
 #endif
 #if ENABLE(PAGE_VISIBILITY_API)
-    settings->setHiddenPageCSSAnimationSuspensionEnabled([preferences hiddenPageCSSAnimationSuspensionEnabled]);
+    settings.setHiddenPageCSSAnimationSuspensionEnabled([preferences hiddenPageCSSAnimationSuspensionEnabled]);
 #endif
 
     // 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.
-    settings->setFixedPositionCreatesStackingContext(true);
+    settings.setFixedPositionCreatesStackingContext(true);
     
     NSTimeInterval timeout = [preferences incrementalRenderingSuppressionTimeoutInSeconds];
     if (timeout > 0)
-        settings->setIncrementalRenderingSuppressionTimeoutInSeconds(timeout);
+        settings.setIncrementalRenderingSuppressionTimeoutInSeconds(timeout);
 
     // Application Cache Preferences are stored on the global cache storage manager, not in Settings.
@@ -2171 +2171 @@
     // specific support for the backward compatibility mode flag.
     if (behavior == WebDashboardBehaviorAllowWheelScrolling && flag == NO && _private->page)
-        _private->page->settings()->setUsesDashboardBackwardCompatibilityMode(true);
+        _private->page->settings().setUsesDashboardBackwardCompatibilityMode(true);
     
     switch (behavior) {
@@ -2192 +2192 @@
         case WebDashboardBehaviorUseBackwardCompatibilityMode: {
             if (_private->page)
-                _private->page->settings()->setUsesDashboardBackwardCompatibilityMode(flag);
+                _private->page->settings().setUsesDashboardBackwardCompatibilityMode(flag);
 #if ENABLE(LEGACY_CSS_VENDOR_PREFIXES)
             RuntimeEnabledFeatures::setLegacyCSSVendorPrefixesEnabled(flag);
@@ -2203 +2203 @@
     // compatibility mode. See <rdar://problem/8175982>.
     if (_private->page)
-        _private->page->settings()->setUsePreHTML5ParserQuirks([self _needsPreHTML5ParserQuirks]);
+        _private->page->settings().setUsePreHTML5ParserQuirks([self _needsPreHTML5ParserQuirks]);
 }
 
@@ -2222 +2222 @@
         }
         case WebDashboardBehaviorUseBackwardCompatibilityMode: {
-            return _private->page && _private->page->settings()->usesDashboardBackwardCompatibilityMode();
+            return _private->page && _private->page->settings().usesDashboardBackwardCompatibilityMode();
         }
     }
@@ -2320 +2320 @@
 {
     if (_private->page)
-        return _private->page->settings()->cookieEnabled();
+        return _private->page->settings().cookieEnabled();
     return YES;
 }
@@ -2327 +2327 @@
 {
     if (_private->page)
-        _private->page->settings()->setCookieEnabled(enable);
+        _private->page->settings().setCookieEnabled(enable);
 }
 
@@ -2468 +2468 @@
 - (void)setSelectTrailingWhitespaceEnabled:(BOOL)flag
 {
-    if (_private->page->settings()->selectTrailingWhitespaceEnabled() != flag) {
-        _private->page->settings()->setSelectTrailingWhitespaceEnabled(flag);
+    if (_private->page->settings().selectTrailingWhitespaceEnabled() != flag) {
+        _private->page->settings().setSelectTrailingWhitespaceEnabled(flag);
         [self setSmartInsertDeleteEnabled:!flag];
     }
@@ -2476 +2476 @@
 - (BOOL)isSelectTrailingWhitespaceEnabled
 {
-    return _private->page->settings()->selectTrailingWhitespaceEnabled();
+    return _private->page->settings().selectTrailingWhitespaceEnabled();
 }
 
@@ -5513 +5513 @@
 - (void)setSmartInsertDeleteEnabled:(BOOL)flag
 {
-    if (_private->page->settings()->smartInsertDeleteEnabled() != flag) {
-        _private->page->settings()->setSmartInsertDeleteEnabled(flag);
-        [[NSUserDefaults standardUserDefaults] setBool:_private->page->settings()->smartInsertDeleteEnabled() forKey:WebSmartInsertDeleteEnabled];
+    if (_private->page->settings().smartInsertDeleteEnabled() != flag) {
+        _private->page->settings().setSmartInsertDeleteEnabled(flag);
+        [[NSUserDefaults standardUserDefaults] setBool:_private->page->settings().smartInsertDeleteEnabled() forKey:WebSmartInsertDeleteEnabled];
         [self setSelectTrailingWhitespaceEnabled:!flag];
     }
@@ -5522 +5522 @@
 - (BOOL)smartInsertDeleteEnabled
 {
-    return _private->page->settings()->smartInsertDeleteEnabled();
+    return _private->page->settings().smartInsertDeleteEnabled();
 }
 

trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp

@@ -220 +220 @@
 void DumpRenderTreeSupportQt::setFrameFlatteningEnabled(QWebPageAdapter* adapter, bool enabled)
 {
-    adapter->page->settings()->setFrameFlatteningEnabled(enabled);
+    adapter->page->settings().setFrameFlatteningEnabled(enabled);
 }
 
@@ -320 +320 @@
 void DumpRenderTreeSupportQt::setCaretBrowsingEnabled(QWebPageAdapter* adapter, bool value)
 {
-    adapter->page->settings()->setCaretBrowsingEnabled(value);
+    adapter->page->settings().setCaretBrowsingEnabled(value);
 }
 
 void DumpRenderTreeSupportQt::setAuthorAndUserStylesEnabled(QWebPageAdapter* adapter, bool value)
 {
-    adapter->page->settings()->setAuthorAndUserStylesEnabled(value);
+    adapter->page->settings().setAuthorAndUserStylesEnabled(value);
 }
 
@@ -385 +385 @@
     if (!corePage)
         return;
-    corePage->settings()->setEditingBehaviorType(EditingWindowsBehavior);
+    corePage->settings().setEditingBehaviorType(EditingWindowsBehavior);
 }
 
@@ -685 +685 @@
     Page* corePage = adapter->page;
     if (corePage)
-        corePage->settings()->setInteractiveFormValidationEnabled(enable);
+        corePage->settings().setInteractiveFormValidationEnabled(enable);
 }
 

trunk/Source/WebKit/qt/WebCoreSupport/EditorClientQt.cpp

@@ -337 +337 @@
     if (!page)
         return false;
-    return page->settings()->smartInsertDeleteEnabled();
+    return page->settings().smartInsertDeleteEnabled();
 }
 
@@ -344 +344 @@
     Page* page = m_page->page;
     if (page) {
-        page->settings()->setSmartInsertDeleteEnabled(!page->settings()->smartInsertDeleteEnabled());
-        page->settings()->setSelectTrailingWhitespaceEnabled(!page->settings()->selectTrailingWhitespaceEnabled());
+        page->settings().setSmartInsertDeleteEnabled(!page->settings().smartInsertDeleteEnabled());
+        page->settings().setSelectTrailingWhitespaceEnabled(!page->settings().selectTrailingWhitespaceEnabled());
     }
 }
@@ -354 +354 @@
     if (!page)
         return false;
-    return page->settings()->selectTrailingWhitespaceEnabled();
+    return page->settings().selectTrailingWhitespaceEnabled();
 }
 
@@ -507 +507 @@
 
     // Non editable content.
-    if (m_page->page->settings()->caretBrowsingEnabled()) {
+    if (m_page->page->settings().caretBrowsingEnabled()) {
         switch (kevent->windowsVirtualKeyCode()) {
         case VK_LEFT:

trunk/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp

@@ -269 +269 @@
     page->addLayoutMilestones(DidFirstVisuallyNonEmptyLayout);
 
-    settings = new QWebSettings(page->settings());
+    settings = new QWebSettings(&page->settings());
 
 #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
@@ -960 +960 @@
     extractContentTypeFromHash(MIMETypeRegistry::getSupportedImageMIMETypes(), &mimeTypes);
     extractContentTypeFromHash(MIMETypeRegistry::getSupportedNonImageMIMETypes(), &mimeTypes);
-    if (page->settings() && page->settings()->arePluginsEnabled())
+    if (page->settings().arePluginsEnabled())
         extractContentTypeFromPluginVector(PluginDatabase::installedPlugins()->plugins(), &mimeTypes);
 
@@ -989 +989 @@
         return true;
 
-    if (page->settings() && page->settings()->arePluginsEnabled()
+    if (page->settings().arePluginsEnabled()
         && PluginDatabase::installedPlugins()->isMIMETypeRegistered(type))
         return true;

trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp

@@ -309 +309 @@
     if (!page)
         return false;
-    return page->settings()->smartInsertDeleteEnabled();
+    return page->settings().smartInsertDeleteEnabled();
 }
 
@@ -317 +317 @@
     if (!page)
         return false;
-    return page->settings()->selectTrailingWhitespaceEnabled();
+    return page->settings().selectTrailingWhitespaceEnabled();
 }
 

trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp

@@ -608 +608 @@
 
     if (Page* page = webView->page()) {
-        if (!page->settings()->privateBrowsingEnabled())
+        if (!page->settings().privateBrowsingEnabled())
             historyItem = page->backForward()->currentItem();
     }

trunk/Source/WebKit/win/WebView.cpp

@@ -2729 +2729 @@
     BString localStoragePath;
     if (SUCCEEDED(m_preferences->localStorageDatabasePath(&localStoragePath)))
-        m_page->settings()->setLocalStorageDatabasePath(toString(localStoragePath));
+        m_page->settings().setLocalStorageDatabasePath(toString(localStoragePath));
 
     if (m_uiDelegate) {
         BString path;
         if (SUCCEEDED(m_uiDelegate->ftpDirectoryTemplatePath(this, &path)))
-            m_page->settings()->setFTPDirectoryTemplatePath(toString(path));
+            m_page->settings().setFTPDirectoryTemplatePath(toString(path));
     }
 
@@ -4148 +4148 @@
         /* [in] */ BOOL flag)
 {
-    if (m_page->settings()->smartInsertDeleteEnabled() != !!flag) {
-        m_page->settings()->setSmartInsertDeleteEnabled(!!flag);
+    if (m_page->settings().smartInsertDeleteEnabled() != !!flag) {
+        m_page->settings().setSmartInsertDeleteEnabled(!!flag);
         setSelectTrailingWhitespaceEnabled(!flag);
     }
@@ -4158 +4158 @@
         /* [retval][out] */ BOOL* enabled)
 {
-    *enabled = m_page->settings()->smartInsertDeleteEnabled() ? TRUE : FALSE;
+    *enabled = m_page->settings().smartInsertDeleteEnabled() ? TRUE : FALSE;
     return S_OK;
 }
@@ -4165 +4165 @@
         /* [in] */ BOOL flag)
 {
-    if (m_page->settings()->selectTrailingWhitespaceEnabled() != !!flag) {
-        m_page->settings()->setSelectTrailingWhitespaceEnabled(!!flag);
+    if (m_page->settings().selectTrailingWhitespaceEnabled() != !!flag) {
+        m_page->settings().setSelectTrailingWhitespaceEnabled(!!flag);
         setSmartInsertDeleteEnabled(!flag);
     }
@@ -4175 +4175 @@
         /* [retval][out] */ BOOL* enabled)
 {
-    *enabled = m_page->settings()->selectTrailingWhitespaceEnabled() ? TRUE : FALSE;
+    *enabled = m_page->settings().selectTrailingWhitespaceEnabled() ? TRUE : FALSE;
     return S_OK;
 }
@@ -4642 +4642 @@
     BOOL enabled;
 
-    Settings* settings = m_page->settings();
+    Settings& settings = m_page->settings();
 
     hr = preferences->cursiveFontFamily(&str);
     if (FAILED(hr))
         return hr;
-    settings->setCursiveFontFamily(toAtomicString(str));
+    settings.setCursiveFontFamily(toAtomicString(str));
     str.clear();
 
@@ -4653 +4653 @@
     if (FAILED(hr))
         return hr;
-    settings->setDefaultFixedFontSize(size);
+    settings.setDefaultFixedFontSize(size);
 
     hr = preferences->defaultFontSize(&size);
     if (FAILED(hr))
         return hr;
-    settings->setDefaultFontSize(size);
+    settings.setDefaultFontSize(size);
 
     hr = preferences->defaultTextEncodingName(&str);
     if (FAILED(hr))
         return hr;
-    settings->setDefaultTextEncodingName(toString(str));
+    settings.setDefaultTextEncodingName(toString(str));
     str.clear();
 
@@ -4669 +4669 @@
     if (FAILED(hr))
         return hr;
-    settings->setFantasyFontFamily(toAtomicString(str));
+    settings.setFantasyFontFamily(toAtomicString(str));
     str.clear();
 
@@ -4675 +4675 @@
     if (FAILED(hr))
         return hr;
-    settings->setFixedFontFamily(toAtomicString(str));
+    settings.setFixedFontFamily(toAtomicString(str));
     str.clear();
 
@@ -4682 +4682 @@
     if (FAILED(hr))
         return hr;
-    settings->setShouldDisplaySubtitles(enabled);
+    settings.setShouldDisplaySubtitles(enabled);
 
     hr = preferences->shouldDisplayCaptions(&enabled);
     if (FAILED(hr))
         return hr;
-    settings->setShouldDisplayCaptions(enabled);
+    settings.setShouldDisplayCaptions(enabled);
 
     hr = preferences->shouldDisplayTextDescriptions(&enabled);
     if (FAILED(hr))
         return hr;
-    settings->setShouldDisplayTextDescriptions(enabled);
+    settings.setShouldDisplayTextDescriptions(enabled);
 #endif
 
@@ -4700 +4700 @@
         if (FAILED(hr))
             return hr;
-        settings->setLocalStorageDatabasePath(toString(str));
+        settings.setLocalStorageDatabasePath(toString(str));
         str.clear();
     }
@@ -4707 +4707 @@
     if (FAILED(hr))
         return hr;
-    settings->setPictographFontFamily(toAtomicString(str));
+    settings.setPictographFontFamily(toAtomicString(str));
     str.clear();
 
@@ -4713 +4713 @@
     if (FAILED(hr))
         return hr;
-    settings->setJavaEnabled(!!enabled);
+    settings.setJavaEnabled(!!enabled);
 
     hr = preferences->isJavaScriptEnabled(&enabled);
     if (FAILED(hr))
         return hr;
-    settings->setScriptEnabled(!!enabled);
+    settings.setScriptEnabled(!!enabled);
 
     hr = preferences->javaScriptCanOpenWindowsAutomatically(&enabled);
     if (FAILED(hr))
         return hr;
-    settings->setJavaScriptCanOpenWindowsAutomatically(!!enabled);
+    settings.setJavaScriptCanOpenWindowsAutomatically(!!enabled);
 
     hr = preferences->minimumFontSize(&size);
     if (FAILED(hr))
         return hr;
-    settings->setMinimumFontSize(size);
+    settings.setMinimumFontSize(size);
 
     hr = preferences->minimumLogicalFontSize(&size);
     if (FAILED(hr))
         return hr;
-    settings->setMinimumLogicalFontSize(size);
+    settings.setMinimumLogicalFontSize(size);
 
     hr = preferences->arePlugInsEnabled(&enabled);
     if (FAILED(hr))
         return hr;
-    settings->setPluginsEnabled(!!enabled);
+    settings.setPluginsEnabled(!!enabled);
 
     hr = preferences->isCSSRegionsEnabled(&enabled);
@@ -4759 +4759 @@
         WebFrameNetworkingContext::destroyPrivateBrowsingSession();
 #endif
-    settings->setPrivateBrowsingEnabled(!!enabled);
+    settings.setPrivateBrowsingEnabled(!!enabled);
 
     hr = preferences->sansSerifFontFamily(&str);
     if (FAILED(hr))
         return hr;
-    settings->setSansSerifFontFamily(toAtomicString(str));
+    settings.setSansSerifFontFamily(toAtomicString(str));
     str.clear();
 
@@ -4770 +4770 @@
     if (FAILED(hr))
         return hr;
-    settings->setSerifFontFamily(toAtomicString(str));
+    settings.setSerifFontFamily(toAtomicString(str));
     str.clear();
 
@@ -4776 +4776 @@
     if (FAILED(hr))
         return hr;
-    settings->setStandardFontFamily(toAtomicString(str));
+    settings.setStandardFontFamily(toAtomicString(str));
     str.clear();
 
@@ -4782 +4782 @@
     if (FAILED(hr))
         return hr;
-    settings->setLoadsImagesAutomatically(!!enabled);
+    settings.setLoadsImagesAutomatically(!!enabled);
 
     hr = preferences->userStyleSheetEnabled(&enabled);
@@ -4808 +4808 @@
         }
 
-        settings->setUserStyleSheetLocation(url.get());
+        settings.setUserStyleSheetLocation(url.get());
         str.clear();
     } else
-        settings->setUserStyleSheetLocation(KURL());
+        settings.setUserStyleSheetLocation(KURL());
 
     hr = preferences->shouldPrintBackgrounds(&enabled);
     if (FAILED(hr))
         return hr;
-    settings->setShouldPrintBackgrounds(!!enabled);
+    settings.setShouldPrintBackgrounds(!!enabled);
 
     hr = preferences->textAreasAreResizable(&enabled);
     if (FAILED(hr))
         return hr;
-    settings->setTextAreasAreResizable(!!enabled);
+    settings.setTextAreasAreResizable(!!enabled);
 
     WebKitEditableLinkBehavior behavior;
@@ -4827 +4827 @@
     if (FAILED(hr))
         return hr;
-    settings->setEditableLinkBehavior((EditableLinkBehavior)behavior);
+    settings.setEditableLinkBehavior((EditableLinkBehavior)behavior);
 
     hr = preferences->usesPageCache(&enabled);
     if (FAILED(hr))
         return hr;
-    settings->setUsesPageCache(!!enabled);
+    settings.setUsesPageCache(!!enabled);
 
     hr = preferences->isDOMPasteAllowed(&enabled);
     if (FAILED(hr))
         return hr;
-    settings->setDOMPasteAllowed(!!enabled);
+    settings.setDOMPasteAllowed(!!enabled);
 
     hr = preferences->zoomsTextOnly(&enabled);
@@ -4846 +4846 @@
         setZoomMultiplier(m_zoomMultiplier, enabled);
 
-    settings->setShowsURLsInToolTips(false);
-
-    settings->setForceFTPDirectoryListings(true);
-    settings->setDeveloperExtrasEnabled(developerExtrasEnabled());
-    settings->setNeedsSiteSpecificQuirks(s_allowSiteSpecificHacks);
+    settings.setShowsURLsInToolTips(false);
+
+    settings.setForceFTPDirectoryListings(true);
+    settings.setDeveloperExtrasEnabled(developerExtrasEnabled());
+    settings.setNeedsSiteSpecificQuirks(s_allowSiteSpecificHacks);
 
     FontSmoothingType smoothingType;
@@ -4856 +4856 @@
     if (FAILED(hr))
         return hr;
-    settings->setFontRenderingMode(smoothingType != FontSmoothingTypeWindows ? NormalRenderingMode : AlternateRenderingMode);
+    settings.setFontRenderingMode(smoothingType != FontSmoothingTypeWindows ? NormalRenderingMode : AlternateRenderingMode);
 
 #if USE(AVFOUNDATION)
@@ -4862 +4862 @@
     if (FAILED(hr))
         return hr;
-    settings->setAVFoundationEnabled(enabled);
+    settings.setAVFoundationEnabled(enabled);
 #endif
 
@@ -4869 +4869 @@
         if (FAILED(hr))
             return hr;
-        settings->setAuthorAndUserStylesEnabled(enabled);
+        settings.setAuthorAndUserStylesEnabled(enabled);
     }
 
@@ -4875 +4875 @@
     if (FAILED(hr))
         return hr;
-    settings->setApplicationChromeMode(enabled);
+    settings.setApplicationChromeMode(enabled);
 
     hr = prefsPrivate->offlineWebApplicationCacheEnabled(&enabled);
     if (FAILED(hr))
         return hr;
-    settings->setOfflineWebApplicationCacheEnabled(enabled);
+    settings.setOfflineWebApplicationCacheEnabled(enabled);
 
 #if ENABLE(SQL_DATABASE)
@@ -4892 +4892 @@
     if (FAILED(hr))
         return hr;
-    settings->setLocalStorageEnabled(enabled);
+    settings.setLocalStorageEnabled(enabled);
 
     hr = prefsPrivate->experimentalNotificationsEnabled(&enabled);
     if (FAILED(hr))
         return hr;
-    settings->setExperimentalNotificationsEnabled(enabled);
+    settings.setExperimentalNotificationsEnabled(enabled);
 
     hr = prefsPrivate->isWebSecurityEnabled(&enabled);
     if (FAILED(hr))
         return hr;
-    settings->setWebSecurityEnabled(!!enabled);
+    settings.setWebSecurityEnabled(!!enabled);
 
     hr = prefsPrivate->allowUniversalAccessFromFileURLs(&enabled);
     if (FAILED(hr))
         return hr;
-    settings->setAllowUniversalAccessFromFileURLs(!!enabled);
+    settings.setAllowUniversalAccessFromFileURLs(!!enabled);
 
     hr = prefsPrivate->allowFileAccessFromFileURLs(&enabled);
     if (FAILED(hr))
         return hr;
-    settings->setAllowFileAccessFromFileURLs(!!enabled);
+    settings.setAllowFileAccessFromFileURLs(!!enabled);
 
     hr = prefsPrivate->javaScriptCanAccessClipboard(&enabled);
     if (FAILED(hr))
         return hr;
-    settings->setJavaScriptCanAccessClipboard(!!enabled);
+    settings.setJavaScriptCanAccessClipboard(!!enabled);
 
     hr = prefsPrivate->isXSSAuditorEnabled(&enabled);
     if (FAILED(hr))
         return hr;
-    settings->setXSSAuditorEnabled(!!enabled);
+    settings.setXSSAuditorEnabled(!!enabled);
 
 #if USE(SAFARI_THEME)
@@ -4928 +4928 @@
     if (FAILED(hr))
         return hr;
-    settings->setShouldPaintNativeControls(!!enabled);
+    settings.setShouldPaintNativeControls(!!enabled);
 #endif
 
@@ -4934 +4934 @@
     if (FAILED(hr))
         return hr;
-    settings->setShouldUseHighResolutionTimers(enabled);
+    settings.setShouldUseHighResolutionTimers(enabled);
 
     hr = prefsPrivate->isFrameFlatteningEnabled(&enabled);
     if (FAILED(hr))
         return hr;
-    settings->setFrameFlatteningEnabled(enabled);
+    settings.setFrameFlatteningEnabled(enabled);
 
 #if USE(ACCELERATED_COMPOSITING)
@@ -4945 +4945 @@
     if (FAILED(hr))
         return hr;
-    settings->setAcceleratedCompositingEnabled(enabled);
+    settings.setAcceleratedCompositingEnabled(enabled);
 #endif
 
@@ -4951 +4951 @@
     if (FAILED(hr))
         return hr;
-    settings->setShowDebugBorders(enabled);
+    settings.setShowDebugBorders(enabled);
 
     hr = prefsPrivate->showRepaintCounter(&enabled);
     if (FAILED(hr))
         return hr;
-    settings->setShowRepaintCounter(enabled);
+    settings.setShowRepaintCounter(enabled);
 
 #if ENABLE(WEB_AUDIO)
-    settings->:setWebAudioEnabled(true);
+    settings.setWebAudioEnabled(true);
 #endif // ENABLE(WEB_AUDIO)
 
 #if ENABLE(WEBGL)
-    settings->setWebGLEnabled(true);
+    settings.setWebGLEnabled(true);
 #endif // ENABLE(WEBGL)
 
@@ -4969 +4969 @@
     if (FAILED(hr))
         return hr;
-    settings->setDNSPrefetchingEnabled(enabled);
+    settings.setDNSPrefetchingEnabled(enabled);
 
     hr = prefsPrivate->hyperlinkAuditingEnabled(&enabled);
     if (FAILED(hr))
         return hr;
-    settings->setHyperlinkAuditingEnabled(enabled);
+    settings.setHyperlinkAuditingEnabled(enabled);
 
     hr = prefsPrivate->loadsSiteIconsIgnoringImageLoadingPreference(&enabled);
     if (FAILED(hr))
         return hr;
-    settings->setLoadsSiteIconsIgnoringImageLoadingSetting(!!enabled);
+    settings.setLoadsSiteIconsIgnoringImageLoadingSetting(!!enabled);
 
     hr = prefsPrivate->showsToolTipOverTruncatedText(&enabled);
@@ -4985 +4985 @@
         return hr;
 
-    settings->setShowsToolTipOverTruncatedText(enabled);
+    settings.setShowsToolTipOverTruncatedText(enabled);
 
     if (!m_closeWindowTimer)
@@ -5004 +5004 @@
     if (FAILED(hr))
         return hr;
-    settings->setMediaPlaybackRequiresUserGesture(enabled);
+    settings.setMediaPlaybackRequiresUserGesture(enabled);
 
     hr = prefsPrivate->mediaPlaybackAllowsInline(&enabled);
     if (FAILED(hr))
         return hr;
-    settings->setMediaPlaybackAllowsInline(enabled);
+    settings.setMediaPlaybackAllowsInline(enabled);
 
     hr = prefsPrivate->shouldInvertColors(&enabled);
@@ -5019 +5019 @@
     if (FAILED(hr))
         return hr;
-    settings->setRequestAnimationFrameEnabled(enabled);
+    settings.setRequestAnimationFrameEnabled(enabled);
 
     return S_OK;
@@ -6084 +6084 @@
         return E_FAIL;
 
-    m_page->settings()->setCookieEnabled(enable);
+    m_page->settings().setCookieEnabled(enable);
     return S_OK;
 }
@@ -6096 +6096 @@
         return E_FAIL;
 
-    *enabled = m_page->settings()->cookieEnabled();
+    *enabled = m_page->settings().cookieEnabled();
     return S_OK;
 }
@@ -6832 +6832 @@
 HRESULT WebView::setMinimumTimerInterval(double interval)
 {
-    page()->settings()->setMinDOMTimerInterval(interval);
+    page()->settings().setMinDOMTimerInterval(interval);
     return S_OK;
 }

trunk/Source/WebKit/wince/WebCoreSupport/EditorClientWinCE.cpp

@@ -217 +217 @@
     if (!page)
         return false;
-    return page->settings()->smartInsertDeleteEnabled();
+    return page->settings().smartInsertDeleteEnabled();
 }
 
@@ -225 +225 @@
     if (!page)
         return false;
-    return page->settings()->selectTrailingWhitespaceEnabled();
+    return page->settings().selectTrailingWhitespaceEnabled();
 }
 

trunk/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.cpp

@@ -87 +87 @@
 bool WebFullScreenManager::supportsFullScreen(bool withKeyboard)
 {
-    if (!m_page->corePage()->settings()->fullScreenEnabled())
+    if (!m_page->corePage()->settings().fullScreenEnabled())
         return false;
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp

@@ -235 +235 @@
         WebPreferencesStore::overrideBoolValueForKey(WebPreferencesKey::WebPreferencesName##Key(), enabled); \
         for (HashSet<Page*>::iterator iter = pages.begin(); iter != pages.end(); ++iter) \
-            (*iter)->settings()->set##SettingsName(enabled); \
+            (*iter)->settings().set##SettingsName(enabled); \
         return; \
     }
@@ -257 +257 @@
     const HashSet<Page*>& pages = PageGroup::pageGroup(pageGroup->identifier())->pages();
     for (HashSet<Page*>::iterator iter = pages.begin(); iter != pages.end(); ++iter)
-        (*iter)->settings()->setXSSAuditorEnabled(enabled);
+        (*iter)->settings().setXSSAuditorEnabled(enabled);
 }
 
@@ -264 +264 @@
     const HashSet<Page*>& pages = PageGroup::pageGroup(pageGroup->identifier())->pages();
     for (HashSet<Page*>::iterator iter = pages.begin(); iter != pages.end(); ++iter)
-        (*iter)->settings()->setAllowUniversalAccessFromFileURLs(enabled);
+        (*iter)->settings().setAllowUniversalAccessFromFileURLs(enabled);
 }
 
@@ -271 +271 @@
     const HashSet<Page*>& pages = PageGroup::pageGroup(pageGroup->identifier())->pages();
     for (HashSet<Page*>::iterator iter = pages.begin(); iter != pages.end(); ++iter)
-        (*iter)->settings()->setAllowFileAccessFromFileURLs(enabled);
+        (*iter)->settings().setAllowFileAccessFromFileURLs(enabled);
 }
 
@@ -278 +278 @@
     const HashSet<Page*>& pages = PageGroup::pageGroup(pageGroup->identifier())->pages();
     for (HashSet<Page*>::iterator iter = pages.begin(); iter != pages.end(); ++iter)
-        (*iter)->settings()->setMinimumLogicalFontSize(size);
+        (*iter)->settings().setMinimumLogicalFontSize(size);
 }
 
@@ -285 +285 @@
     const HashSet<Page*>& pages = PageGroup::pageGroup(pageGroup->identifier())->pages();
     for (HashSet<Page*>::iterator iter = pages.begin(); iter != pages.end(); ++iter)
-        (*iter)->settings()->setFrameFlatteningEnabled(enabled);
+        (*iter)->settings().setFrameFlatteningEnabled(enabled);
 }
 
@@ -292 +292 @@
     const HashSet<Page*>& pages = PageGroup::pageGroup(pageGroup->identifier())->pages();
     for (HashSet<Page*>::iterator iter = pages.begin(); iter != pages.end(); ++iter)
-        (*iter)->settings()->setPluginsEnabled(enabled);
+        (*iter)->settings().setPluginsEnabled(enabled);
 }
 
@@ -299 +299 @@
     const HashSet<Page*>& pages = PageGroup::pageGroup(pageGroup->identifier())->pages();
     for (HashSet<Page*>::iterator iter = pages.begin(); iter != pages.end(); ++iter)
-        (*iter)->settings()->setJavaScriptCanAccessClipboard(enabled);
+        (*iter)->settings().setJavaScriptCanAccessClipboard(enabled);
 }
 
@@ -313 +313 @@
     const HashSet<Page*>& pages = PageGroup::pageGroup(pageGroup->identifier())->pages();
     for (HashSet<Page*>::iterator iter = pages.begin(); iter != pages.end(); ++iter)
-        (*iter)->settings()->setPrivateBrowsingEnabled(enabled);
+        (*iter)->settings().setPrivateBrowsingEnabled(enabled);
 }
 
@@ -321 +321 @@
     HashSet<Page*>::const_iterator end = pages.end();
     for (HashSet<Page*>::const_iterator iter = pages.begin(); iter != end; ++iter)
-        (*iter)->settings()->setJavaScriptCanOpenWindowsAutomatically(!enabled);
+        (*iter)->settings().setJavaScriptCanOpenWindowsAutomatically(!enabled);
 }
 
@@ -337 +337 @@
     const HashSet<Page*>& pages = PageGroup::pageGroup(pageGroup->identifier())->pages();
     for (HashSet<Page*>::iterator iter = pages.begin(); iter != pages.end(); ++iter)
-        (*iter)->settings()->setAuthorAndUserStylesEnabled(enabled);
+        (*iter)->settings().setAuthorAndUserStylesEnabled(enabled);
 }
 
@@ -344 +344 @@
     const HashSet<Page*>& pages = PageGroup::pageGroup(pageGroup->identifier())->pages();
     for (HashSet<Page*>::iterator iter = pages.begin(); iter != pages.end(); ++iter)
-        (*iter)->settings()->setSpatialNavigationEnabled(enabled);
+        (*iter)->settings().setSpatialNavigationEnabled(enabled);
 }
 
@@ -366 +366 @@
     const HashSet<Page*>& pages = PageGroup::pageGroup(pageGroup->identifier())->pages();
     for (HashSet<Page*>::iterator iter = pages.begin(); iter != pages.end(); ++iter)
-        (*iter)->settings()->setAsynchronousSpellCheckingEnabled(enabled);
+        (*iter)->settings().setAsynchronousSpellCheckingEnabled(enabled);
 }
 
@@ -606 +606 @@
     const HashSet<Page*>& pages = PageGroup::pageGroup(pageGroup->identifier())->pages();
     for (HashSet<Page*>::iterator iter = pages.begin(); iter != pages.end(); ++iter)
-        (*iter)->settings()->setUserStyleSheetLocation(KURL(KURL(), location));
+        (*iter)->settings().setUserStyleSheetLocation(KURL(KURL(), location));
 }
 

trunk/Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.cpp

@@ -124 +124 @@
 {
 #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
-    if (!m_page->corePage()->settings()->notificationsEnabled())
+    if (!m_page->corePage()->settings().notificationsEnabled())
         return NotificationClient::PermissionDenied;
     

trunk/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp

@@ -142 +142 @@
 {
 #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
-    if (!notification || !page->corePage()->settings()->notificationsEnabled())
+    if (!notification || !page->corePage()->settings().notificationsEnabled())
         return false;
     
@@ -168 +168 @@
 {
 #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
-    if (!notification || !page->corePage()->settings()->notificationsEnabled())
+    if (!notification || !page->corePage()->settings().notificationsEnabled())
         return;
     

trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.cpp

@@ -66 +66 @@
 PassRefPtr<StorageNamespaceImpl> StorageNamespaceImpl::createSessionStorageNamespace(WebPage* webPage)
 {
-    return adoptRef(new StorageNamespaceImpl(SessionStorage, webPage->pageID(), webPage->corePage()->settings()->sessionStorageQuota()));
+    return adoptRef(new StorageNamespaceImpl(SessionStorage, webPage->pageID(), webPage->corePage()->settings().sessionStorageQuota()));
 }
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp

@@ -467 +467 @@
 void WebChromeClient::contentsSizeChanged(Frame* frame, const IntSize& size) const
 {
-    if (!m_page->corePage()->settings()->frameFlatteningEnabled()) {
+    if (!m_page->corePage()->settings().frameFlatteningEnabled()) {
         WebFrame* largestFrame = findLargestFrameInFrameSet(m_page);
         if (largestFrame != m_cachedFrameSetLargestFrame.get()) {
@@ -857 +857 @@
 void WebChromeClient::logDiagnosticMessage(const String& message, const String& description, const String& success)
 {
-    if (!m_page->corePage()->settings()->diagnosticLoggingEnabled())
+    if (!m_page->corePage()->settings().diagnosticLoggingEnabled())
         return;
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

@@ -550 +550 @@
 
         if (m_frame == m_frame->page()->mainWebFrame()) {
-            if (!webPage->corePage()->settings()->suppressesIncrementalRendering() && !m_didCompletePageTransitionAlready) {
+            if (!webPage->corePage()->settings().suppressesIncrementalRendering() && !m_didCompletePageTransitionAlready) {
                 webPage->didCompletePageTransition();
                 m_didCompletePageTransitionAlready = true;

trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp

@@ -68 +68 @@
     , m_exitCompositingTimer(RunLoop::main(), this, &DrawingAreaImpl::exitAcceleratedCompositingMode)
 {
-    if (webPage->corePage()->settings()->acceleratedDrawingEnabled() || webPage->corePage()->settings()->forceCompositingMode())
+    if (webPage->corePage()->settings().acceleratedDrawingEnabled() || webPage->corePage()->settings().forceCompositingMode())
         m_alwaysUseCompositing = true;
 
@@ -265 +265 @@
     // As a part of that work, we have to composite fixed position elements, and we have to allow those
     // elements to create a stacking context.
-    m_webPage->corePage()->settings()->setAcceleratedCompositingForFixedPositionEnabled(true);
-    m_webPage->corePage()->settings()->setFixedPositionCreatesStackingContext(true);
+    m_webPage->corePage()->settings().setAcceleratedCompositingForFixedPositionEnabled(true);
+    m_webPage->corePage()->settings().setFixedPositionCreatesStackingContext(true);
 
     // <rdar://problem/10697417>: It is necessary to force compositing when accelerate drawing
     // is enabled on Mac so that scrollbars are always in their own layers.
-    if (m_webPage->corePage()->settings()->acceleratedDrawingEnabled())
-        m_webPage->corePage()->settings()->setForceCompositingMode(LayerTreeHost::supportsAcceleratedCompositing());
+    if (m_webPage->corePage()->settings().acceleratedDrawingEnabled())
+        m_webPage->corePage()->settings().setForceCompositingMode(LayerTreeHost::supportsAcceleratedCompositing());
     else
 #endif
-        m_webPage->corePage()->settings()->setForceCompositingMode(store.getBoolValueForKey(WebPreferencesKey::forceCompositingModeKey()) && LayerTreeHost::supportsAcceleratedCompositing());
+        m_webPage->corePage()->settings().setForceCompositingMode(store.getBoolValueForKey(WebPreferencesKey::forceCompositingModeKey()) && LayerTreeHost::supportsAcceleratedCompositing());
 }
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -1103 +1103 @@
 
     // Recalculate the recommended layout size, when the available size (device pixel) changes.
-    Settings* settings = m_page->settings();
-
-    int minimumLayoutFallbackWidth = std::max(settings->layoutFallbackWidth(), m_viewSize.width());
+    Settings& settings = m_page->settings();
+
+    int minimumLayoutFallbackWidth = std::max(settings.layoutFallbackWidth(), m_viewSize.width());
 
     // If unset  we use the viewport dimensions. This fits with the behavior of desktop browsers.
-    int deviceWidth = (settings->deviceWidth() > 0) ? settings->deviceWidth() : m_viewSize.width();
-    int deviceHeight = (settings->deviceHeight() > 0) ? settings->deviceHeight() : m_viewSize.height();
+    int deviceWidth = (settings.deviceWidth() > 0) ? settings.deviceWidth() : m_viewSize.width();
+    int deviceHeight = (settings.deviceHeight() > 0) ? settings.deviceHeight() : m_viewSize.height();
 
     ViewportAttributes attr = computeViewportAttributes(m_page->viewportArguments(), minimumLayoutFallbackWidth, deviceWidth, deviceHeight, 1, m_viewSize);
@@ -1308 +1308 @@
     m_useFixedLayout = fixed;
 
-    m_page->settings()->setFixedElementsLayoutRelativeToFrame(fixed);
+    m_page->settings().setFixedElementsLayoutRelativeToFrame(fixed);
 #if USE(COORDINATED_GRAPHICS)
-    m_page->settings()->setAcceleratedCompositingForFixedPositionEnabled(fixed);
-    m_page->settings()->setFixedPositionCreatesStackingContext(fixed);
-    m_page->settings()->setApplyPageScaleFactorInCompositor(fixed);
-    m_page->settings()->setScrollingCoordinatorEnabled(fixed);
+    m_page->settings().setAcceleratedCompositingForFixedPositionEnabled(fixed);
+    m_page->settings().setFixedPositionCreatesStackingContext(fixed);
+    m_page->settings().setApplyPageScaleFactorInCompositor(fixed);
+    m_page->settings().setScrollingCoordinatorEnabled(fixed);
 #endif
 
@@ -1319 +1319 @@
     // Delegated scrolling will be enabled when the FrameView is created if fixed layout is enabled.
     // Ensure we don't do animated scrolling in the WebProcess in that case.
-    m_page->settings()->setScrollAnimatorEnabled(!fixed);
+    m_page->settings().setScrollAnimatorEnabled(!fixed);
 #endif
 
@@ -2425 +2425 @@
 void WebPage::updatePreferences(const WebPreferencesStore& store)
 {
-    Settings* settings = m_page->settings();
+    Settings& settings = m_page->settings();
 
     m_tabToLinks = store.getBoolValueForKey(WebPreferencesKey::tabsToLinksKey());
@@ -2442 +2442 @@
     // handrolling the boolean and integer preferences until that is fixed.
 
-#define INITIALIZE_SETTINGS(KeyUpper, KeyLower, TypeName, Type, DefaultValue) settings->set##KeyUpper(store.get##TypeName##ValueForKey(WebPreferencesKey::KeyLower##Key()));
+#define INITIALIZE_SETTINGS(KeyUpper, KeyLower, TypeName, Type, DefaultValue) settings.set##KeyUpper(store.get##TypeName##ValueForKey(WebPreferencesKey::KeyLower##Key()));
 
     FOR_EACH_WEBKIT_STRING_PREFERENCE(INITIALIZE_SETTINGS)
@@ -2448 +2448 @@
 #undef INITIALIZE_SETTINGS
 
-    settings->setScriptEnabled(store.getBoolValueForKey(WebPreferencesKey::javaScriptEnabledKey()));
-    settings->setScriptMarkupEnabled(store.getBoolValueForKey(WebPreferencesKey::javaScriptMarkupEnabledKey()));
-    settings->setLoadsImagesAutomatically(store.getBoolValueForKey(WebPreferencesKey::loadsImagesAutomaticallyKey()));
-    settings->setLoadsSiteIconsIgnoringImageLoadingSetting(store.getBoolValueForKey(WebPreferencesKey::loadsSiteIconsIgnoringImageLoadingPreferenceKey()));
-    settings->setPluginsEnabled(store.getBoolValueForKey(WebPreferencesKey::pluginsEnabledKey()));
-    settings->setJavaEnabled(store.getBoolValueForKey(WebPreferencesKey::javaEnabledKey()));
-    settings->setJavaEnabledForLocalFiles(store.getBoolValueForKey(WebPreferencesKey::javaEnabledForLocalFilesKey()));    
-    settings->setOfflineWebApplicationCacheEnabled(store.getBoolValueForKey(WebPreferencesKey::offlineWebApplicationCacheEnabledKey()));
-    settings->setLocalStorageEnabled(store.getBoolValueForKey(WebPreferencesKey::localStorageEnabledKey()));
-    settings->setXSSAuditorEnabled(store.getBoolValueForKey(WebPreferencesKey::xssAuditorEnabledKey()));
-    settings->setFrameFlatteningEnabled(store.getBoolValueForKey(WebPreferencesKey::frameFlatteningEnabledKey()));
-    settings->setPrivateBrowsingEnabled(store.getBoolValueForKey(WebPreferencesKey::privateBrowsingEnabledKey()));
-    settings->setDeveloperExtrasEnabled(store.getBoolValueForKey(WebPreferencesKey::developerExtrasEnabledKey()));
-    settings->setJavaScriptExperimentsEnabled(store.getBoolValueForKey(WebPreferencesKey::javaScriptExperimentsEnabledKey()));
-    settings->setTextAreasAreResizable(store.getBoolValueForKey(WebPreferencesKey::textAreasAreResizableKey()));
-    settings->setNeedsSiteSpecificQuirks(store.getBoolValueForKey(WebPreferencesKey::needsSiteSpecificQuirksKey()));
-    settings->setJavaScriptCanOpenWindowsAutomatically(store.getBoolValueForKey(WebPreferencesKey::javaScriptCanOpenWindowsAutomaticallyKey()));
-    settings->setForceFTPDirectoryListings(store.getBoolValueForKey(WebPreferencesKey::forceFTPDirectoryListingsKey()));
-    settings->setDNSPrefetchingEnabled(store.getBoolValueForKey(WebPreferencesKey::dnsPrefetchingEnabledKey()));
+    settings.setScriptEnabled(store.getBoolValueForKey(WebPreferencesKey::javaScriptEnabledKey()));
+    settings.setScriptMarkupEnabled(store.getBoolValueForKey(WebPreferencesKey::javaScriptMarkupEnabledKey()));
+    settings.setLoadsImagesAutomatically(store.getBoolValueForKey(WebPreferencesKey::loadsImagesAutomaticallyKey()));
+    settings.setLoadsSiteIconsIgnoringImageLoadingSetting(store.getBoolValueForKey(WebPreferencesKey::loadsSiteIconsIgnoringImageLoadingPreferenceKey()));
+    settings.setPluginsEnabled(store.getBoolValueForKey(WebPreferencesKey::pluginsEnabledKey()));
+    settings.setJavaEnabled(store.getBoolValueForKey(WebPreferencesKey::javaEnabledKey()));
+    settings.setJavaEnabledForLocalFiles(store.getBoolValueForKey(WebPreferencesKey::javaEnabledForLocalFilesKey()));    
+    settings.setOfflineWebApplicationCacheEnabled(store.getBoolValueForKey(WebPreferencesKey::offlineWebApplicationCacheEnabledKey()));
+    settings.setLocalStorageEnabled(store.getBoolValueForKey(WebPreferencesKey::localStorageEnabledKey()));
+    settings.setXSSAuditorEnabled(store.getBoolValueForKey(WebPreferencesKey::xssAuditorEnabledKey()));
+    settings.setFrameFlatteningEnabled(store.getBoolValueForKey(WebPreferencesKey::frameFlatteningEnabledKey()));
+    settings.setPrivateBrowsingEnabled(store.getBoolValueForKey(WebPreferencesKey::privateBrowsingEnabledKey()));
+    settings.setDeveloperExtrasEnabled(store.getBoolValueForKey(WebPreferencesKey::developerExtrasEnabledKey()));
+    settings.setJavaScriptExperimentsEnabled(store.getBoolValueForKey(WebPreferencesKey::javaScriptExperimentsEnabledKey()));
+    settings.setTextAreasAreResizable(store.getBoolValueForKey(WebPreferencesKey::textAreasAreResizableKey()));
+    settings.setNeedsSiteSpecificQuirks(store.getBoolValueForKey(WebPreferencesKey::needsSiteSpecificQuirksKey()));
+    settings.setJavaScriptCanOpenWindowsAutomatically(store.getBoolValueForKey(WebPreferencesKey::javaScriptCanOpenWindowsAutomaticallyKey()));
+    settings.setForceFTPDirectoryListings(store.getBoolValueForKey(WebPreferencesKey::forceFTPDirectoryListingsKey()));
+    settings.setDNSPrefetchingEnabled(store.getBoolValueForKey(WebPreferencesKey::dnsPrefetchingEnabledKey()));
 #if ENABLE(WEB_ARCHIVE)
-    settings->setWebArchiveDebugModeEnabled(store.getBoolValueForKey(WebPreferencesKey::webArchiveDebugModeEnabledKey()));
-#endif
-    settings->setLocalFileContentSniffingEnabled(store.getBoolValueForKey(WebPreferencesKey::localFileContentSniffingEnabledKey()));
-    settings->setUsesPageCache(store.getBoolValueForKey(WebPreferencesKey::usesPageCacheKey()));
-    settings->setPageCacheSupportsPlugins(store.getBoolValueForKey(WebPreferencesKey::pageCacheSupportsPluginsKey()));
-    settings->setAuthorAndUserStylesEnabled(store.getBoolValueForKey(WebPreferencesKey::authorAndUserStylesEnabledKey()));
-    settings->setPaginateDuringLayoutEnabled(store.getBoolValueForKey(WebPreferencesKey::paginateDuringLayoutEnabledKey()));
-    settings->setDOMPasteAllowed(store.getBoolValueForKey(WebPreferencesKey::domPasteAllowedKey()));
-    settings->setJavaScriptCanAccessClipboard(store.getBoolValueForKey(WebPreferencesKey::javaScriptCanAccessClipboardKey()));
-    settings->setShouldPrintBackgrounds(store.getBoolValueForKey(WebPreferencesKey::shouldPrintBackgroundsKey()));
-    settings->setWebSecurityEnabled(store.getBoolValueForKey(WebPreferencesKey::webSecurityEnabledKey()));
-    settings->setAllowUniversalAccessFromFileURLs(store.getBoolValueForKey(WebPreferencesKey::allowUniversalAccessFromFileURLsKey()));
-    settings->setAllowFileAccessFromFileURLs(store.getBoolValueForKey(WebPreferencesKey::allowFileAccessFromFileURLsKey()));
-
-    settings->setMinimumFontSize(store.getUInt32ValueForKey(WebPreferencesKey::minimumFontSizeKey()));
-    settings->setMinimumLogicalFontSize(store.getUInt32ValueForKey(WebPreferencesKey::minimumLogicalFontSizeKey()));
-    settings->setDefaultFontSize(store.getUInt32ValueForKey(WebPreferencesKey::defaultFontSizeKey()));
-    settings->setDefaultFixedFontSize(store.getUInt32ValueForKey(WebPreferencesKey::defaultFixedFontSizeKey()));
-    settings->setScreenFontSubstitutionEnabled(store.getBoolValueForKey(WebPreferencesKey::screenFontSubstitutionEnabledKey())
+    settings.setWebArchiveDebugModeEnabled(store.getBoolValueForKey(WebPreferencesKey::webArchiveDebugModeEnabledKey()));
+#endif
+    settings.setLocalFileContentSniffingEnabled(store.getBoolValueForKey(WebPreferencesKey::localFileContentSniffingEnabledKey()));
+    settings.setUsesPageCache(store.getBoolValueForKey(WebPreferencesKey::usesPageCacheKey()));
+    settings.setPageCacheSupportsPlugins(store.getBoolValueForKey(WebPreferencesKey::pageCacheSupportsPluginsKey()));
+    settings.setAuthorAndUserStylesEnabled(store.getBoolValueForKey(WebPreferencesKey::authorAndUserStylesEnabledKey()));
+    settings.setPaginateDuringLayoutEnabled(store.getBoolValueForKey(WebPreferencesKey::paginateDuringLayoutEnabledKey()));
+    settings.setDOMPasteAllowed(store.getBoolValueForKey(WebPreferencesKey::domPasteAllowedKey()));
+    settings.setJavaScriptCanAccessClipboard(store.getBoolValueForKey(WebPreferencesKey::javaScriptCanAccessClipboardKey()));
+    settings.setShouldPrintBackgrounds(store.getBoolValueForKey(WebPreferencesKey::shouldPrintBackgroundsKey()));
+    settings.setWebSecurityEnabled(store.getBoolValueForKey(WebPreferencesKey::webSecurityEnabledKey()));
+    settings.setAllowUniversalAccessFromFileURLs(store.getBoolValueForKey(WebPreferencesKey::allowUniversalAccessFromFileURLsKey()));
+    settings.setAllowFileAccessFromFileURLs(store.getBoolValueForKey(WebPreferencesKey::allowFileAccessFromFileURLsKey()));
+
+    settings.setMinimumFontSize(store.getUInt32ValueForKey(WebPreferencesKey::minimumFontSizeKey()));
+    settings.setMinimumLogicalFontSize(store.getUInt32ValueForKey(WebPreferencesKey::minimumLogicalFontSizeKey()));
+    settings.setDefaultFontSize(store.getUInt32ValueForKey(WebPreferencesKey::defaultFontSizeKey()));
+    settings.setDefaultFixedFontSize(store.getUInt32ValueForKey(WebPreferencesKey::defaultFixedFontSizeKey()));
+    settings.setScreenFontSubstitutionEnabled(store.getBoolValueForKey(WebPreferencesKey::screenFontSubstitutionEnabledKey())
 #if PLATFORM(MAC)
         || WebProcess::shared().shouldForceScreenFontSubstitution()
 #endif
     );
-    settings->setLayoutFallbackWidth(store.getUInt32ValueForKey(WebPreferencesKey::layoutFallbackWidthKey()));
-    settings->setDeviceWidth(store.getUInt32ValueForKey(WebPreferencesKey::deviceWidthKey()));
-    settings->setDeviceHeight(store.getUInt32ValueForKey(WebPreferencesKey::deviceHeightKey()));
-    settings->setEditableLinkBehavior(static_cast<WebCore::EditableLinkBehavior>(store.getUInt32ValueForKey(WebPreferencesKey::editableLinkBehaviorKey())));
-    settings->setShowsToolTipOverTruncatedText(store.getBoolValueForKey(WebPreferencesKey::showsToolTipOverTruncatedTextKey()));
-
-    settings->setAcceleratedCompositingForOverflowScrollEnabled(store.getBoolValueForKey(WebPreferencesKey::acceleratedCompositingForOverflowScrollEnabledKey()));
-    settings->setAcceleratedCompositingEnabled(store.getBoolValueForKey(WebPreferencesKey::acceleratedCompositingEnabledKey()) && LayerTreeHost::supportsAcceleratedCompositing());
-    settings->setAcceleratedDrawingEnabled(store.getBoolValueForKey(WebPreferencesKey::acceleratedDrawingEnabledKey()) && LayerTreeHost::supportsAcceleratedCompositing());
-    settings->setCanvasUsesAcceleratedDrawing(store.getBoolValueForKey(WebPreferencesKey::canvasUsesAcceleratedDrawingKey()) && LayerTreeHost::supportsAcceleratedCompositing());
-    settings->setShowDebugBorders(store.getBoolValueForKey(WebPreferencesKey::compositingBordersVisibleKey()));
-    settings->setShowRepaintCounter(store.getBoolValueForKey(WebPreferencesKey::compositingRepaintCountersVisibleKey()));
-    settings->setShowTiledScrollingIndicator(store.getBoolValueForKey(WebPreferencesKey::tiledScrollingIndicatorVisibleKey()));
-    settings->setAggressiveTileRetentionEnabled(store.getBoolValueForKey(WebPreferencesKey::aggressiveTileRetentionEnabledKey()));
-    settings->setCSSCustomFilterEnabled(store.getBoolValueForKey(WebPreferencesKey::cssCustomFilterEnabledKey()));
+    settings.setLayoutFallbackWidth(store.getUInt32ValueForKey(WebPreferencesKey::layoutFallbackWidthKey()));
+    settings.setDeviceWidth(store.getUInt32ValueForKey(WebPreferencesKey::deviceWidthKey()));
+    settings.setDeviceHeight(store.getUInt32ValueForKey(WebPreferencesKey::deviceHeightKey()));
+    settings.setEditableLinkBehavior(static_cast<WebCore::EditableLinkBehavior>(store.getUInt32ValueForKey(WebPreferencesKey::editableLinkBehaviorKey())));
+    settings.setShowsToolTipOverTruncatedText(store.getBoolValueForKey(WebPreferencesKey::showsToolTipOverTruncatedTextKey()));
+
+    settings.setAcceleratedCompositingForOverflowScrollEnabled(store.getBoolValueForKey(WebPreferencesKey::acceleratedCompositingForOverflowScrollEnabledKey()));
+    settings.setAcceleratedCompositingEnabled(store.getBoolValueForKey(WebPreferencesKey::acceleratedCompositingEnabledKey()) && LayerTreeHost::supportsAcceleratedCompositing());
+    settings.setAcceleratedDrawingEnabled(store.getBoolValueForKey(WebPreferencesKey::acceleratedDrawingEnabledKey()) && LayerTreeHost::supportsAcceleratedCompositing());
+    settings.setCanvasUsesAcceleratedDrawing(store.getBoolValueForKey(WebPreferencesKey::canvasUsesAcceleratedDrawingKey()) && LayerTreeHost::supportsAcceleratedCompositing());
+    settings.setShowDebugBorders(store.getBoolValueForKey(WebPreferencesKey::compositingBordersVisibleKey()));
+    settings.setShowRepaintCounter(store.getBoolValueForKey(WebPreferencesKey::compositingRepaintCountersVisibleKey()));
+    settings.setShowTiledScrollingIndicator(store.getBoolValueForKey(WebPreferencesKey::tiledScrollingIndicatorVisibleKey()));
+    settings.setAggressiveTileRetentionEnabled(store.getBoolValueForKey(WebPreferencesKey::aggressiveTileRetentionEnabledKey()));
+    settings.setCSSCustomFilterEnabled(store.getBoolValueForKey(WebPreferencesKey::cssCustomFilterEnabledKey()));
     RuntimeEnabledFeatures::setCSSRegionsEnabled(store.getBoolValueForKey(WebPreferencesKey::cssRegionsEnabledKey()));
     RuntimeEnabledFeatures::setCSSCompositingEnabled(store.getBoolValueForKey(WebPreferencesKey::cssCompositingEnabledKey()));
-    settings->setCSSGridLayoutEnabled(store.getBoolValueForKey(WebPreferencesKey::cssGridLayoutEnabledKey()));
-    settings->setRegionBasedColumnsEnabled(store.getBoolValueForKey(WebPreferencesKey::regionBasedColumnsEnabledKey()));
-    settings->setWebGLEnabled(store.getBoolValueForKey(WebPreferencesKey::webGLEnabledKey()));
-    settings->setAccelerated2dCanvasEnabled(store.getBoolValueForKey(WebPreferencesKey::accelerated2dCanvasEnabledKey()));
-    settings->setMediaPlaybackRequiresUserGesture(store.getBoolValueForKey(WebPreferencesKey::mediaPlaybackRequiresUserGestureKey()));
-    settings->setMediaPlaybackAllowsInline(store.getBoolValueForKey(WebPreferencesKey::mediaPlaybackAllowsInlineKey()));
-    settings->setMockScrollbarsEnabled(store.getBoolValueForKey(WebPreferencesKey::mockScrollbarsEnabledKey()));
-    settings->setHyperlinkAuditingEnabled(store.getBoolValueForKey(WebPreferencesKey::hyperlinkAuditingEnabledKey()));
-    settings->setRequestAnimationFrameEnabled(store.getBoolValueForKey(WebPreferencesKey::requestAnimationFrameEnabledKey()));
+    settings.setCSSGridLayoutEnabled(store.getBoolValueForKey(WebPreferencesKey::cssGridLayoutEnabledKey()));
+    settings.setRegionBasedColumnsEnabled(store.getBoolValueForKey(WebPreferencesKey::regionBasedColumnsEnabledKey()));
+    settings.setWebGLEnabled(store.getBoolValueForKey(WebPreferencesKey::webGLEnabledKey()));
+    settings.setAccelerated2dCanvasEnabled(store.getBoolValueForKey(WebPreferencesKey::accelerated2dCanvasEnabledKey()));
+    settings.setMediaPlaybackRequiresUserGesture(store.getBoolValueForKey(WebPreferencesKey::mediaPlaybackRequiresUserGestureKey()));
+    settings.setMediaPlaybackAllowsInline(store.getBoolValueForKey(WebPreferencesKey::mediaPlaybackAllowsInlineKey()));
+    settings.setMockScrollbarsEnabled(store.getBoolValueForKey(WebPreferencesKey::mockScrollbarsEnabledKey()));
+    settings.setHyperlinkAuditingEnabled(store.getBoolValueForKey(WebPreferencesKey::hyperlinkAuditingEnabledKey()));
+    settings.setRequestAnimationFrameEnabled(store.getBoolValueForKey(WebPreferencesKey::requestAnimationFrameEnabledKey()));
 #if ENABLE(SMOOTH_SCROLLING)
-    settings->setScrollAnimatorEnabled(store.getBoolValueForKey(WebPreferencesKey::scrollAnimatorEnabledKey()));
-#endif
-    settings->setInteractiveFormValidationEnabled(store.getBoolValueForKey(WebPreferencesKey::interactiveFormValidationEnabledKey()));
+    settings.setScrollAnimatorEnabled(store.getBoolValueForKey(WebPreferencesKey::scrollAnimatorEnabledKey()));
+#endif
+    settings.setInteractiveFormValidationEnabled(store.getBoolValueForKey(WebPreferencesKey::interactiveFormValidationEnabledKey()));
 
 #if ENABLE(SQL_DATABASE)
@@ -2527 +2527 @@
 
 #if ENABLE(FULLSCREEN_API)
-    settings->setFullScreenEnabled(store.getBoolValueForKey(WebPreferencesKey::fullScreenEnabledKey()));
+    settings.setFullScreenEnabled(store.getBoolValueForKey(WebPreferencesKey::fullScreenEnabledKey()));
 #endif
 
 #if USE(AVFOUNDATION)
-    settings->setAVFoundationEnabled(store.getBoolValueForKey(WebPreferencesKey::isAVFoundationEnabledKey()));
+    settings.setAVFoundationEnabled(store.getBoolValueForKey(WebPreferencesKey::isAVFoundationEnabledKey()));
 #endif
 
 #if PLATFORM(MAC)
-    settings->setQTKitEnabled(store.getBoolValueForKey(WebPreferencesKey::isQTKitEnabledKey()));
+    settings.setQTKitEnabled(store.getBoolValueForKey(WebPreferencesKey::isQTKitEnabledKey()));
 #endif
 
 #if ENABLE(WEB_AUDIO)
-    settings->setWebAudioEnabled(store.getBoolValueForKey(WebPreferencesKey::webAudioEnabledKey()));
-#endif
-
-    settings->setApplicationChromeMode(store.getBoolValueForKey(WebPreferencesKey::applicationChromeModeKey()));
-    settings->setSuppressesIncrementalRendering(store.getBoolValueForKey(WebPreferencesKey::suppressesIncrementalRenderingKey()));
-    settings->setIncrementalRenderingSuppressionTimeoutInSeconds(store.getDoubleValueForKey(WebPreferencesKey::incrementalRenderingSuppressionTimeoutKey()));
-    settings->setBackspaceKeyNavigationEnabled(store.getBoolValueForKey(WebPreferencesKey::backspaceKeyNavigationEnabledKey()));
-    settings->setWantsBalancedSetDefersLoadingBehavior(store.getBoolValueForKey(WebPreferencesKey::wantsBalancedSetDefersLoadingBehaviorKey()));
-    settings->setCaretBrowsingEnabled(store.getBoolValueForKey(WebPreferencesKey::caretBrowsingEnabledKey()));
+    settings.setWebAudioEnabled(store.getBoolValueForKey(WebPreferencesKey::webAudioEnabledKey()));
+#endif
+
+    settings.setApplicationChromeMode(store.getBoolValueForKey(WebPreferencesKey::applicationChromeModeKey()));
+    settings.setSuppressesIncrementalRendering(store.getBoolValueForKey(WebPreferencesKey::suppressesIncrementalRenderingKey()));
+    settings.setIncrementalRenderingSuppressionTimeoutInSeconds(store.getDoubleValueForKey(WebPreferencesKey::incrementalRenderingSuppressionTimeoutKey()));
+    settings.setBackspaceKeyNavigationEnabled(store.getBoolValueForKey(WebPreferencesKey::backspaceKeyNavigationEnabledKey()));
+    settings.setWantsBalancedSetDefersLoadingBehavior(store.getBoolValueForKey(WebPreferencesKey::wantsBalancedSetDefersLoadingBehaviorKey()));
+    settings.setCaretBrowsingEnabled(store.getBoolValueForKey(WebPreferencesKey::caretBrowsingEnabledKey()));
 
 #if ENABLE(VIDEO_TRACK)
-    settings->setShouldDisplaySubtitles(store.getBoolValueForKey(WebPreferencesKey::shouldDisplaySubtitlesKey()));
-    settings->setShouldDisplayCaptions(store.getBoolValueForKey(WebPreferencesKey::shouldDisplayCaptionsKey()));
-    settings->setShouldDisplayTextDescriptions(store.getBoolValueForKey(WebPreferencesKey::shouldDisplayTextDescriptionsKey()));
+    settings.setShouldDisplaySubtitles(store.getBoolValueForKey(WebPreferencesKey::shouldDisplaySubtitlesKey()));
+    settings.setShouldDisplayCaptions(store.getBoolValueForKey(WebPreferencesKey::shouldDisplayCaptionsKey()));
+    settings.setShouldDisplayTextDescriptions(store.getBoolValueForKey(WebPreferencesKey::shouldDisplayTextDescriptionsKey()));
 #endif
 
 #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
-    settings->setNotificationsEnabled(store.getBoolValueForKey(WebPreferencesKey::notificationsEnabledKey()));
-#endif
-
-    settings->setShouldRespectImageOrientation(store.getBoolValueForKey(WebPreferencesKey::shouldRespectImageOrientationKey()));
-    settings->setStorageBlockingPolicy(static_cast<SecurityOrigin::StorageBlockingPolicy>(store.getUInt32ValueForKey(WebPreferencesKey::storageBlockingPolicyKey())));
-    settings->setCookieEnabled(store.getBoolValueForKey(WebPreferencesKey::cookieEnabledKey()));
-
-    settings->setDiagnosticLoggingEnabled(store.getBoolValueForKey(WebPreferencesKey::diagnosticLoggingEnabledKey()));
-
-    settings->setScrollingPerformanceLoggingEnabled(m_scrollingPerformanceLoggingEnabled);
-
-    settings->setPlugInSnapshottingEnabled(store.getBoolValueForKey(WebPreferencesKey::plugInSnapshottingEnabledKey()));
-    settings->setSnapshotAllPlugIns(store.getBoolValueForKey(WebPreferencesKey::snapshotAllPlugInsKey()));
-    settings->setAutostartOriginPlugInSnapshottingEnabled(store.getBoolValueForKey(WebPreferencesKey::autostartOriginPlugInSnapshottingEnabledKey()));
-    settings->setPrimaryPlugInSnapshotDetectionEnabled(store.getBoolValueForKey(WebPreferencesKey::primaryPlugInSnapshotDetectionEnabledKey()));
-    settings->setUsesEncodingDetector(store.getBoolValueForKey(WebPreferencesKey::usesEncodingDetectorKey()));
+    settings.setNotificationsEnabled(store.getBoolValueForKey(WebPreferencesKey::notificationsEnabledKey()));
+#endif
+
+    settings.setShouldRespectImageOrientation(store.getBoolValueForKey(WebPreferencesKey::shouldRespectImageOrientationKey()));
+    settings.setStorageBlockingPolicy(static_cast<SecurityOrigin::StorageBlockingPolicy>(store.getUInt32ValueForKey(WebPreferencesKey::storageBlockingPolicyKey())));
+    settings.setCookieEnabled(store.getBoolValueForKey(WebPreferencesKey::cookieEnabledKey()));
+
+    settings.setDiagnosticLoggingEnabled(store.getBoolValueForKey(WebPreferencesKey::diagnosticLoggingEnabledKey()));
+
+    settings.setScrollingPerformanceLoggingEnabled(m_scrollingPerformanceLoggingEnabled);
+
+    settings.setPlugInSnapshottingEnabled(store.getBoolValueForKey(WebPreferencesKey::plugInSnapshottingEnabledKey()));
+    settings.setSnapshotAllPlugIns(store.getBoolValueForKey(WebPreferencesKey::snapshotAllPlugInsKey()));
+    settings.setAutostartOriginPlugInSnapshottingEnabled(store.getBoolValueForKey(WebPreferencesKey::autostartOriginPlugInSnapshottingEnabledKey()));
+    settings.setPrimaryPlugInSnapshotDetectionEnabled(store.getBoolValueForKey(WebPreferencesKey::primaryPlugInSnapshotDetectionEnabledKey()));
+    settings.setUsesEncodingDetector(store.getBoolValueForKey(WebPreferencesKey::usesEncodingDetectorKey()));
 
 #if ENABLE(TEXT_AUTOSIZING)
-    settings->setTextAutosizingEnabled(store.getBoolValueForKey(WebPreferencesKey::textAutosizingEnabledKey()));
-#endif
-
-    settings->setLogsPageMessagesToSystemConsoleEnabled(store.getBoolValueForKey(WebPreferencesKey::logsPageMessagesToSystemConsoleEnabledKey()));
-    settings->setAsynchronousSpellCheckingEnabled(store.getBoolValueForKey(WebPreferencesKey::asynchronousSpellCheckingEnabledKey()));
-
-    settings->setSmartInsertDeleteEnabled(store.getBoolValueForKey(WebPreferencesKey::smartInsertDeleteEnabledKey()));
-    settings->setSelectTrailingWhitespaceEnabled(store.getBoolValueForKey(WebPreferencesKey::selectTrailingWhitespaceEnabledKey()));
-    settings->setShowsURLsInToolTips(store.getBoolValueForKey(WebPreferencesKey::showsURLsInToolTipsEnabledKey()));
+    settings.setTextAutosizingEnabled(store.getBoolValueForKey(WebPreferencesKey::textAutosizingEnabledKey()));
+#endif
+
+    settings.setLogsPageMessagesToSystemConsoleEnabled(store.getBoolValueForKey(WebPreferencesKey::logsPageMessagesToSystemConsoleEnabledKey()));
+    settings.setAsynchronousSpellCheckingEnabled(store.getBoolValueForKey(WebPreferencesKey::asynchronousSpellCheckingEnabledKey()));
+
+    settings.setSmartInsertDeleteEnabled(store.getBoolValueForKey(WebPreferencesKey::smartInsertDeleteEnabledKey()));
+    settings.setSelectTrailingWhitespaceEnabled(store.getBoolValueForKey(WebPreferencesKey::selectTrailingWhitespaceEnabledKey()));
+    settings.setShowsURLsInToolTips(store.getBoolValueForKey(WebPreferencesKey::showsURLsInToolTipsEnabledKey()));
 
 #if ENABLE(HIDDEN_PAGE_DOM_TIMER_THROTTLING)
-    settings->setHiddenPageDOMTimerThrottlingEnabled(store.getBoolValueForKey(WebPreferencesKey::hiddenPageDOMTimerThrottlingEnabledKey()));
+    settings.setHiddenPageDOMTimerThrottlingEnabled(store.getBoolValueForKey(WebPreferencesKey::hiddenPageDOMTimerThrottlingEnabledKey()));
 #endif
 #if ENABLE(PAGE_VISIBILITY_API)
-    settings->setHiddenPageCSSAnimationSuspensionEnabled(store.getBoolValueForKey(WebPreferencesKey::hiddenPageCSSAnimationSuspensionEnabledKey()));
-#endif
-
-    settings->setLowPowerVideoAudioBufferSizeEnabled(store.getBoolValueForKey(WebPreferencesKey::lowPowerVideoAudioBufferSizeEnabledKey()));
+    settings.setHiddenPageCSSAnimationSuspensionEnabled(store.getBoolValueForKey(WebPreferencesKey::hiddenPageCSSAnimationSuspensionEnabledKey()));
+#endif
+
+    settings.setLowPowerVideoAudioBufferSizeEnabled(store.getBoolValueForKey(WebPreferencesKey::lowPowerVideoAudioBufferSizeEnabledKey()));
 
     platformPreferencesDidChange(store);
@@ -3928 +3928 @@
 bool WebPage::isSmartInsertDeleteEnabled()
 {
-    return m_page->settings()->smartInsertDeleteEnabled();
+    return m_page->settings().smartInsertDeleteEnabled();
 }
 
 void WebPage::setSmartInsertDeleteEnabled(bool enabled)
 {
-    if (m_page->settings()->smartInsertDeleteEnabled() != enabled) {
-        m_page->settings()->setSmartInsertDeleteEnabled(enabled);
+    if (m_page->settings().smartInsertDeleteEnabled() != enabled) {
+        m_page->settings().setSmartInsertDeleteEnabled(enabled);
         setSelectTrailingWhitespaceEnabled(!enabled);
     }
@@ -3941 +3941 @@
 bool WebPage::isSelectTrailingWhitespaceEnabled()
 {
-    return m_page->settings()->selectTrailingWhitespaceEnabled();
+    return m_page->settings().selectTrailingWhitespaceEnabled();
 }
 
 void WebPage::setSelectTrailingWhitespaceEnabled(bool enabled)
 {
-    if (m_page->settings()->selectTrailingWhitespaceEnabled() != enabled) {
-        m_page->settings()->setSelectTrailingWhitespaceEnabled(enabled);
+    if (m_page->settings().selectTrailingWhitespaceEnabled() != enabled) {
+        m_page->settings().setSelectTrailingWhitespaceEnabled(enabled);
         setSmartInsertDeleteEnabled(!enabled);
     }
@@ -4045 +4045 @@
         return;
     
-    Settings* settings = m_page->settings();
-    if (!settings->snapshotAllPlugIns() && settings->primaryPlugInSnapshotDetectionEnabled())
+    Settings& settings = m_page->settings();
+    if (!settings.snapshotAllPlugIns() && settings.primaryPlugInSnapshotDetectionEnabled())
         determinePrimarySnapshottedPlugIn();
 }
@@ -4053 +4053 @@
 void WebPage::determinePrimarySnapshottedPlugIn()
 {
-    if (!m_page->settings()->plugInSnapshottingEnabled())
+    if (!m_page->settings().plugInSnapshottingEnabled())
         return;
 

trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp

@@ -103 +103 @@
     m_nonCompositedContentLayer->setContentsOpaque(m_webPage->drawsBackground() && !m_webPage->drawsTransparentBackground());
     m_nonCompositedContentLayer->setSize(m_webPage->size());
-    if (m_webPage->corePage()->settings()->acceleratedDrawingEnabled())
+    if (m_webPage->corePage()->settings().acceleratedDrawingEnabled())
         m_nonCompositedContentLayer->setAcceleratesDrawing(true);
 
@@ -382 +382 @@
 #endif
 
-    layer->setAcceleratesDrawing(m_webPage->corePage()->settings()->acceleratedDrawingEnabled());
+    layer->setAcceleratesDrawing(m_webPage->corePage()->settings().acceleratedDrawingEnabled());
     layer->setDrawsContent(true);
     layer->setSize(m_webPage->size());
-    layer->setShowDebugBorder(m_webPage->corePage()->settings()->showDebugBorders());
-    layer->setShowRepaintCounter(m_webPage->corePage()->settings()->showRepaintCounter());
+    layer->setShowDebugBorder(m_webPage->corePage()->settings().showDebugBorders());
+    layer->setShowRepaintCounter(m_webPage->corePage()->settings().showRepaintCounter());
 
     m_rootLayer->addChild(layer.get());

trunk/Source/WebKit2/WebProcess/WebPage/mac/LayerTreeHostMac.mm

@@ -319 +319 @@
     m_nonCompositedContentLayer->setContentsOpaque(m_webPage->drawsBackground() && !m_webPage->drawsTransparentBackground());
     m_nonCompositedContentLayer->setSize(m_webPage->size());
-    if (m_webPage->corePage()->settings()->acceleratedDrawingEnabled())
+    if (m_webPage->corePage()->settings().acceleratedDrawingEnabled())
         m_nonCompositedContentLayer->setAcceleratesDrawing(true);
 
@@ -391 +391 @@
 #endif
 
-    layer->setAcceleratesDrawing(m_webPage->corePage()->settings()->acceleratedDrawingEnabled());
+    layer->setAcceleratesDrawing(m_webPage->corePage()->settings().acceleratedDrawingEnabled());
     layer->setDrawsContent(true);
     layer->setSize(m_webPage->size());
-    layer->setShowDebugBorder(m_webPage->corePage()->settings()->showDebugBorders());
-    layer->setShowRepaintCounter(m_webPage->corePage()->settings()->showRepaintCounter());
+    layer->setShowDebugBorder(m_webPage->corePage()->settings().showDebugBorders());
+    layer->setShowRepaintCounter(m_webPage->corePage()->settings().showRepaintCounter());
 
     m_rootLayer->addChild(layer.get());

trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm

@@ -76 +76 @@
     Page* page = m_webPage->corePage();
 
-    page->settings()->setScrollingCoordinatorEnabled(true);
-    page->settings()->setForceCompositingMode(true);
+    page->settings().setScrollingCoordinatorEnabled(true);
+    page->settings().setForceCompositingMode(true);
 
     WebProcess::shared().eventDispatcher().addScrollingTreeForPage(webPage);
@@ -239 +239 @@
 void TiledCoreAnimationDrawingArea::updatePreferences(const WebPreferencesStore&)
 {
-    Settings* settings = m_webPage->corePage()->settings();
+    Settings& settings = m_webPage->corePage()->settings();
     bool scrollingPerformanceLoggingEnabled = m_webPage->scrollingPerformanceLoggingEnabled();
     ScrollingThread::dispatch(bind(&ScrollingTree::setScrollingPerformanceLoggingEnabled, m_webPage->corePage()->scrollingCoordinator()->scrollingTree(), scrollingPerformanceLoggingEnabled));
 
     if (TiledBacking* tiledBacking = mainFrameTiledBacking())
-        tiledBacking->setAggressivelyRetainsTiles(settings->aggressiveTileRetentionEnabled());
+        tiledBacking->setAggressivelyRetainsTiles(settings.aggressiveTileRetentionEnabled());
 
     for (PageOverlayLayerMap::iterator it = m_pageOverlayLayers.begin(), end = m_pageOverlayLayers.end(); it != end; ++it) {
-        it->value->setAcceleratesDrawing(settings->acceleratedDrawingEnabled());
-        it->value->setShowDebugBorder(settings->showDebugBorders());
-        it->value->setShowRepaintCounter(settings->showRepaintCounter());
+        it->value->setAcceleratesDrawing(settings.acceleratedDrawingEnabled());
+        it->value->setShowDebugBorder(settings.showDebugBorders());
+        it->value->setShowRepaintCounter(settings.showRepaintCounter());
     }
 
@@ -255 +255 @@
     // As a part of that work, we have to composite fixed position elements, and we have to allow those
     // elements to create a stacking context.
-    settings->setAcceleratedCompositingForFixedPositionEnabled(true);
-    settings->setFixedPositionCreatesStackingContext(true);
-
-    bool showTiledScrollingIndicator = settings->showTiledScrollingIndicator();
+    settings.setAcceleratedCompositingForFixedPositionEnabled(true);
+    settings.setFixedPositionCreatesStackingContext(true);
+
+    bool showTiledScrollingIndicator = settings.showTiledScrollingIndicator();
     if (showTiledScrollingIndicator == !!m_debugInfoLayer)
         return;
@@ -603 +603 @@
 
     if (TiledBacking* tiledBacking = mainFrameTiledBacking()) {
-        tiledBacking->setAggressivelyRetainsTiles(m_webPage->corePage()->settings()->aggressiveTileRetentionEnabled());
+        tiledBacking->setAggressivelyRetainsTiles(m_webPage->corePage()->settings().aggressiveTileRetentionEnabled());
         tiledBacking->setExposedRect(m_scrolledExposedRect);
     }
@@ -609 +609 @@
     updateMainFrameClipsToExposedRect();
 
-    updateDebugInfoLayer(m_webPage->corePage()->settings()->showTiledScrollingIndicator());
+    updateDebugInfoLayer(m_webPage->corePage()->settings().showTiledScrollingIndicator());
 
     [CATransaction commit];
@@ -621 +621 @@
 #endif
 
-    layer->setAcceleratesDrawing(m_webPage->corePage()->settings()->acceleratedDrawingEnabled());
-    layer->setShowDebugBorder(m_webPage->corePage()->settings()->showDebugBorders());
-    layer->setShowRepaintCounter(m_webPage->corePage()->settings()->showRepaintCounter());
+    layer->setAcceleratesDrawing(m_webPage->corePage()->settings().acceleratedDrawingEnabled());
+    layer->setShowDebugBorder(m_webPage->corePage()->settings().showDebugBorders());
+    layer->setShowRepaintCounter(m_webPage->corePage()->settings().showRepaintCounter());
 
     m_pageOverlayPlatformLayers.set(layer.get(), layer->platformLayer());