Changeset 154219 in webkit

Timestamp:

Aug 17, 2013 3:58:40 AM (11 years ago)

Author:

akling@apple.com

Message:

<​https://webkit.org/b/119903> Make Settings ref-counted (and let Frame keep a ref!)

Reviewed by Geoff Garen.

Let Frame hold a RefPtr<Settings> so Frame::settings() isn't forced to go through Page.
It now also returns a reference, as it can never be null.

Removed 8.8 million lines of null-checking as a result.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp (modified) (1 diff)
• WebCore/bindings/ScriptControllerBase.cpp (modified) (1 diff)
• WebCore/bindings/js/JSDOMWindowBase.cpp (modified) (1 diff)
• WebCore/bindings/js/JSDOMWindowCustom.cpp (modified) (1 diff)
• WebCore/bindings/scripts/CodeGeneratorJS.pm (modified) (1 diff)
• WebCore/bindings/scripts/test/JS/JSTestObj.cpp (modified) (1 diff)
• WebCore/css/CSSFontSelector.cpp (modified) (3 diffs)
• WebCore/css/MediaQueryEvaluator.cpp (modified) (1 diff)
• WebCore/dom/DOMImplementation.cpp (modified) (1 diff)
• WebCore/dom/Document.cpp (modified) (1 diff)
• WebCore/editing/Editor.cpp (modified) (4 diffs)
• WebCore/editing/EditorCommand.cpp (modified) (3 diffs)
• WebCore/editing/FrameSelection.cpp (modified) (6 diffs)
• WebCore/editing/SpellChecker.cpp (modified) (1 diff)
• WebCore/editing/TextCheckingHelper.cpp (modified) (1 diff)
• WebCore/html/HTMLEmbedElement.cpp (modified) (1 diff)
• WebCore/html/HTMLSelectElement.cpp (modified) (1 diff)
• WebCore/html/ImageDocument.cpp (modified) (1 diff)
• WebCore/html/PluginDocument.cpp (modified) (1 diff)
• WebCore/html/canvas/WebGLRenderingContext.cpp (modified) (3 diffs)
• WebCore/html/parser/XSSAuditor.cpp (modified) (1 diff)
• WebCore/inspector/InspectorPageAgent.cpp (modified) (4 diffs)
• WebCore/loader/DocumentLoader.cpp (modified) (3 diffs)
• WebCore/loader/DocumentWriter.cpp (modified) (1 diff)
• WebCore/loader/FrameLoader.cpp (modified) (2 diffs)
• WebCore/loader/HistoryController.cpp (modified) (6 diffs)
• WebCore/loader/MixedContentChecker.cpp (modified) (2 diffs)
• WebCore/loader/SubframeLoader.cpp (modified) (2 diffs)
• WebCore/loader/appcache/ApplicationCacheGroup.cpp (modified) (4 diffs)
• WebCore/loader/appcache/ApplicationCacheHost.cpp (modified) (1 diff)
• WebCore/loader/cache/CachedImage.cpp (modified) (1 diff)
• WebCore/loader/cache/CachedResourceLoader.cpp (modified) (1 diff)
• WebCore/loader/icon/IconController.cpp (modified) (1 diff)
• WebCore/page/ContextMenuController.cpp (modified) (1 diff)
• WebCore/page/DOMWindow.cpp (modified) (6 diffs)
• WebCore/page/DragController.cpp (modified) (2 diffs)
• WebCore/page/EventHandler.cpp (modified) (8 diffs)
• WebCore/page/FocusController.cpp (modified) (2 diffs)
• WebCore/page/Frame.cpp (modified) (5 diffs)
• WebCore/page/Frame.h (modified) (2 diffs)
• WebCore/page/FrameView.cpp (modified) (5 diffs)
• WebCore/page/Navigator.cpp (modified) (2 diffs)
• WebCore/page/Page.h (modified) (1 diff)
• WebCore/page/Settings.cpp (modified) (1 diff)
• WebCore/page/Settings.h (modified) (2 diffs)
• WebCore/page/SpatialNavigation.cpp (modified) (1 diff)
• WebCore/page/mac/EventHandlerMac.mm (modified) (1 diff)
• WebCore/rendering/RenderBlock.cpp (modified) (1 diff)
• WebCore/rendering/RenderFrameSet.cpp (modified) (1 diff)
• WebCore/rendering/RenderIFrame.cpp (modified) (1 diff)
• WebCore/rendering/RenderLayerBacking.cpp (modified) (1 diff)
• WebKit/efl/WebCoreSupport/EditorClientEfl.cpp (modified) (1 diff)
• WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp (modified) (1 diff)
• WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp (modified) (1 diff)
• WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (modified) (1 diff)
• WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.mm (modified) (2 diffs)
• WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp (modified) (2 diffs)
• WebKit/win/WebCoreSupport/WebFrameNetworkingContext.cpp (modified) (1 diff)
• WebKit/wince/WebCoreSupport/EditorClientWinCE.cpp (modified) (1 diff)
• WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp (modified) (1 diff)
• WebKit2/WebProcess/Plugins/PluginView.cpp (modified) (6 diffs)
• WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm (modified) (2 diffs)
• WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-08-16  Andreas Kling  <akling@apple.com>
+
+        <https://webkit.org/b/119903> Make Settings ref-counted (and let Frame keep a ref!)
+
+        Reviewed by Geoff Garen.
+
+        Let Frame hold a RefPtr<Settings> so Frame::settings() isn't forced to go through Page.
+        It now also returns a reference, as it can never be null.
+
+        Removed 8.8 million lines of null-checking as a result.
+
 2013-08-16  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -1589 +1589 @@
 __ZNK7WebCore5Frame25trackedRepaintRectsAsTextEv
 __ZNK7WebCore5Frame31displayStringModifiedByEncodingERKN3WTF6StringE
-__ZNK7WebCore5Frame8settingsEv
 __ZNK7WebCore5Range11startOffsetERi
 __ZNK7WebCore5Range12endContainerERi

trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp

@@ -646 +646 @@
         return false;
 
-    Settings* settings = frame->settings();
-    if (!settings || !settings->caretBrowsingEnabled())
+    if (!frame->settings().caretBrowsingEnabled())
         return false;
 

trunk/Source/WebCore/bindings/ScriptControllerBase.cpp

@@ -52 +52 @@
     }
 
-    Settings* settings = m_frame->settings();
-    const bool allowed = m_frame->loader().client()->allowScript(settings && settings->isScriptEnabled());
+    const bool allowed = m_frame->loader().client()->allowScript(m_frame->settings().isScriptEnabled());
     if (!allowed && reason == AboutToExecuteScript)
         m_frame->loader().client()->didNotAllowScript();

trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp

@@ -161 +161 @@
     if (!frame)
         return false;
-    Settings* settings = frame->settings();
-    if (!settings)
-        return false;
-    return settings->javaScriptExperimentsEnabled();
+    return frame->settings().javaScriptExperimentsEnabled();
 }
 

trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp

@@ -502 +502 @@
     // a property named "location" instead of performing a navigation (<rdar://problem/5688039>).
     if (Frame* activeFrame = activeDOMWindow(exec)->frame()) {
-        if (Settings* settings = activeFrame->settings()) {
-            if (settings->usesDashboardBackwardCompatibilityMode() && !activeFrame->tree()->parent()) {
-                if (BindingSecurity::shouldAllowAccessToDOMWindow(exec, impl()))
-                    putDirect(exec->vm(), Identifier(exec, "location"), value);
-                return;
-            }
+        if (activeFrame->settings().usesDashboardBackwardCompatibilityMode() && !activeFrame->tree()->parent()) {
+            if (BindingSecurity::shouldAllowAccessToDOMWindow(exec, impl()))
+                putDirect(exec->vm(), Identifier(exec, "location"), value);
+            return;
         }
     }

trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm

@@ -1995 +1995 @@
                         AddToImplIncludes("Settings.h");
                         my $enable_function = ToMethodName($attribute->signature->extendedAttributes->{"EnabledBySetting"}) . "Enabled";
-                        push(@implContent, "    Settings* settings = castedThis->impl()->frame() ? castedThis->impl()->frame()->settings() : 0;\n");
-                        push(@implContent, "    if (!settings || !settings->$enable_function())\n");
+                        push(@implContent, "    if (!castedThis->impl()->frame())\n");
+                        push(@implContent, "        return jsUndefined();\n");
+                        push(@implContent, "    Settings& settings = castedThis->impl()->frame()->settings();\n");
+                        push(@implContent, "    if (!settings.$enable_function())\n");
                         push(@implContent, "        return jsUndefined();\n");
                     }

trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp

@@ -461 +461 @@
 {
     JSTestObj* castedThis = jsCast<JSTestObj*>(asObject(slotBase));
-    Settings* settings = castedThis->impl()->frame() ? castedThis->impl()->frame()->settings() : 0;
-    if (!settings || !settings->testSettingEnabled())
+    if (!castedThis->impl()->frame())
+        return jsUndefined();
+    Settings& settings = castedThis->impl()->frame()->settings();
+    if (!settings.testSettingEnabled())
         return jsUndefined();
     return JSTestSubObj::getConstructor(exec, castedThis->globalObject());

trunk/Source/WebCore/css/CSSFontSelector.cpp

@@ -215 +215 @@
 #endif
         if (!item->isLocal()) {
-            Settings* settings = m_document ? m_document->frame() ? m_document->frame()->settings() : 0 : 0;
+            Settings* settings = m_document ? m_document->frame() ? &m_document->frame()->settings() : 0 : 0;
             bool allowDownloading = foundSVGFont || (settings && settings->downloadableBinaryFontsEnabled());
             if (allowDownloading && item->isSupportedFormat() && m_document) {
@@ -371 +371 @@
         return 0;
 
-    const Settings* settings = document->frame()->settings();
-    if (!settings)
-        return 0;
+    const Settings& settings = document->frame()->settings();
 
     AtomicString genericFamily;
@@ -379 +377 @@
 
     if (familyName == serifFamily)
-         genericFamily = settings->serifFontFamily(script);
+        genericFamily = settings.serifFontFamily(script);
     else if (familyName == sansSerifFamily)
-         genericFamily = settings->sansSerifFontFamily(script);
+        genericFamily = settings.sansSerifFontFamily(script);
     else if (familyName == cursiveFamily)
-         genericFamily = settings->cursiveFontFamily(script);
+        genericFamily = settings.cursiveFontFamily(script);
     else if (familyName == fantasyFamily)
-         genericFamily = settings->fantasyFontFamily(script);
+        genericFamily = settings.fantasyFontFamily(script);
     else if (familyName == monospaceFamily)
-         genericFamily = settings->fixedFontFamily(script);
+        genericFamily = settings.fixedFontFamily(script);
     else if (familyName == pictographFamily)
-         genericFamily = settings->pictographFontFamily(script);
+        genericFamily = settings.pictographFontFamily(script);
     else if (familyName == standardFamily)
-         genericFamily = settings->standardFontFamily(script);
+        genericFamily = settings.standardFontFamily(script);
 
     if (!genericFamily.isEmpty())

trunk/Source/WebCore/css/MediaQueryEvaluator.cpp

@@ -636 +636 @@
 static PointerDeviceType leastCapablePrimaryPointerDeviceType(Frame* frame)
 {
-    if (frame->settings()->deviceSupportsTouch())
+    if (frame->settings().deviceSupportsTouch())
         return TouchPointer;
 

trunk/Source/WebCore/dom/DOMImplementation.cpp

@@ -368 +368 @@
      // Check to see if the type can be played by our MediaPlayer, if so create a MediaDocument
     // Key system is not applicable here.
-    DOMImplementationSupportsTypeClient client(frame && frame->settings() && frame->settings()->needsSiteSpecificQuirks(), url.host());
+    DOMImplementationSupportsTypeClient client(frame && frame->settings().needsSiteSpecificQuirks(), url.host());
     if (MediaPlayer::supportsType(ContentType(type), String(), url, &client))
          return MediaDocument::create(frame, url);

trunk/Source/WebCore/dom/Document.cpp

@@ -1651 +1651 @@
 Settings* Document::settings() const
 {
-    return m_frame ? m_frame->settings() : 0;
+    return m_frame ? &m_frame->settings() : 0;
 }
 

trunk/Source/WebCore/editing/Editor.cpp

@@ -183 +183 @@
 EditingBehavior Editor::behavior() const
 {
-    if (!m_frame || !m_frame->settings())
+    if (!m_frame)
         return EditingBehavior(EditingMacBehavior);
-
-    return EditingBehavior(m_frame->settings()->editingBehaviorType());
+    return EditingBehavior(m_frame->settings().editingBehaviorType());
 }
 
@@ -2119 +2118 @@
     RefPtr<Range> paragraphRange = paragraphToCheck.paragraphRange();
 
-    bool asynchronous = m_frame && m_frame->settings() && m_frame->settings()->asynchronousSpellCheckingEnabled() && !shouldShowCorrectionPanel;
+    bool asynchronous = m_frame && m_frame->settings().asynchronousSpellCheckingEnabled() && !shouldShowCorrectionPanel;
 
     // In asynchronous mode, we intentionally check paragraph-wide sentence.
@@ -2632 +2631 @@
 String Editor::selectedTextForClipboard() const
 {
-    if (m_frame->settings() && m_frame->settings()->selectionIncludesAltImageText())
+    if (m_frame->settings().selectionIncludesAltImageText())
         return selectedText(TextIteratorEmitsImageAltText);
     return selectedText();
@@ -2990 +2989 @@
         VisibleSelection newAdjacentWords;
         VisibleSelection newSelectedSentence;
-        bool caretBrowsing = m_frame->settings() && m_frame->settings()->caretBrowsingEnabled();
+        bool caretBrowsing = m_frame->settings().caretBrowsingEnabled();
         if (m_frame->selection()->selection().isContentEditable() || caretBrowsing) {
             VisiblePosition newStart(m_frame->selection()->selection().visibleStart());

trunk/Source/WebCore/editing/EditorCommand.cpp

@@ -1173 +1173 @@
         return false;
 
-    Settings* settings = frame->settings();
-    bool defaultValue = settings && settings->javaScriptCanAccessClipboard();
+    bool defaultValue = frame->settings().javaScriptCanAccessClipboard();
 
     EditorClient* client = frame->editor().client();
@@ -1185 +1184 @@
         return false;
 
-    Settings* settings = frame->settings();
-    bool defaultValue = settings && settings->javaScriptCanAccessClipboard() && settings->DOMPasteAllowed();
+    bool defaultValue = frame->settings().javaScriptCanAccessClipboard() && frame->settings().DOMPasteAllowed();
 
     EditorClient* client = frame->editor().client();
@@ -1208 +1206 @@
 static bool caretBrowsingEnabled(Frame* frame)
 {
-    return frame->settings() && frame->settings()->caretBrowsingEnabled();
+    return frame->settings().caretBrowsingEnabled();
 }
 

trunk/Source/WebCore/editing/FrameSelection.cpp

@@ -561 +561 @@
 VisiblePosition FrameSelection::positionForPlatform(bool isGetStart) const
 {
-    Settings* settings = m_frame ? m_frame->settings() : 0;
-    if (settings && settings->editingBehaviorType() == EditingMacBehavior)
+    if (m_frame && m_frame->settings().editingBehaviorType() == EditingMacBehavior)
         return isGetStart ? m_selection.visibleStart() : m_selection.visibleEnd();
     // Linux and Windows always extend selections from the extent endpoint.
@@ -1414 +1413 @@
     ASSERT(view);
     Frame* frame = view->frameView() ? &view->frameView()->frame() : 0; // The frame where the selection started.
-    bool caretBrowsing = frame && frame->settings() && frame->settings()->caretBrowsingEnabled();
+    bool caretBrowsing = frame && frame->settings().caretBrowsingEnabled();
     return (caretBrowsing || isContentEditable);
 }
@@ -1771 +1770 @@
     bool caretRectChangedOrCleared = recomputeCaretRect();
 
-    bool caretBrowsing = m_frame->settings() && m_frame->settings()->caretBrowsingEnabled();
+    bool caretBrowsing = m_frame->settings().caretBrowsingEnabled();
     bool shouldBlink = caretIsVisible() && isCaret() && (isContentEditable() || caretBrowsing) && forwardPosition.isNull();
 
@@ -1885 +1884 @@
         return;
 
-    bool caretBrowsing = m_frame->settings() && m_frame->settings()->caretBrowsingEnabled();
+    bool caretBrowsing = m_frame->settings().caretBrowsingEnabled();
     if (caretBrowsing) {
         if (Element* anchor = enclosingAnchorElement(base())) {
@@ -2038 +2037 @@
 
     Document* document = m_frame->document();
-    bool caretBrowsing = m_frame->settings() && m_frame->settings()->caretBrowsingEnabled();
+    bool caretBrowsing = m_frame->settings().caretBrowsingEnabled();
     if (!isNone() || !(document->rendererIsEditable() || caretBrowsing))
         return;
@@ -2065 +2064 @@
 inline bool FrameSelection::visualWordMovementEnabled() const
 {
-    Settings* settings = m_frame ? m_frame->settings() : 0;
-    return settings && settings->visualWordMovementEnabled();
+    if (!m_frame)
+        return false;
+    return m_frame->settings().visualWordMovementEnabled();
 }
 

trunk/Source/WebCore/editing/SpellChecker.cpp

@@ -142 +142 @@
 bool SpellChecker::isAsynchronousEnabled() const
 {
-    return m_frame->settings() && m_frame->settings()->asynchronousSpellCheckingEnabled();
+    return m_frame->settings().asynchronousSpellCheckingEnabled();
 }
 

trunk/Source/WebCore/editing/TextCheckingHelper.cpp

@@ -684 +684 @@
     if (!frame)
         return false;
-
-    const Settings* settings = frame->settings();
-    if (!settings)
-        return false;
-
-    return settings->unifiedTextCheckerEnabled();
-}
-
-}
+    return frame->settings().unifiedTextCheckerEnabled();
+}
+
+}

trunk/Source/WebCore/html/HTMLEmbedElement.cpp

@@ -192 +192 @@
 
 #if ENABLE(DASHBOARD_SUPPORT)
-    // Workaround for <rdar://problem/6642221>. 
-    if (Settings* settings = frame->settings()) {
-        if (settings->usesDashboardBackwardCompatibilityMode())
-            return true;
-    }
+    // Workaround for <rdar://problem/6642221>.
+    if (frame->settings().usesDashboardBackwardCompatibilityMode())
+        return true;
 #endif
 

trunk/Source/WebCore/html/HTMLSelectElement.cpp

@@ -1132 +1132 @@
         // out of the select element when user hits a left or right arrow key.
         const Frame* frame = document()->frame();
-        if (frame && frame->settings() && frame->settings()->caretBrowsingEnabled()) {
+        if (frame && frame->settings().caretBrowsingEnabled()) {
             if (keyIdentifier == "Left" || keyIdentifier == "Right")
                 return;

trunk/Source/WebCore/html/ImageDocument.cpp

@@ -131 +131 @@
 {
     Frame* frame = document()->frame();
-    Settings* settings = frame->settings();
-    if (!frame->loader().client()->allowImage(!settings || settings->areImagesEnabled(), document()->url()))
+    if (!frame->loader().client()->allowImage(frame->settings().areImagesEnabled(), document()->url()))
         return;
 

trunk/Source/WebCore/html/PluginDocument.cpp

@@ -111 +111 @@
     if (!frame)
         return;
-    Settings* settings = frame->settings();
-    if (!settings)
-        return;
 
     document()->updateLayout();

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

@@ -412 +412 @@
     if (!frame)
         return nullptr;
-    Settings* settings = frame->settings();
 
     // The FrameLoaderClient might creation of a new WebGL context despite the page settings; in
     // particular, if WebGL contexts were lost one or more times via the GL_ARB_robustness extension.
-    if (!frame->loader().client()->allowWebGL(settings && settings->webGLEnabled())) {
+    if (!frame->loader().client()->allowWebGL(frame->settings().webGLEnabled())) {
         canvas->dispatchEvent(WebGLContextEvent::create(eventNames().webglcontextcreationerrorEvent, false, true, "Web page was not allowed to create a WebGL context."));
         return nullptr;
@@ -425 +424 @@
 
     if (attributes.antialias) {
-        if (settings && !settings->openGLMultisamplingEnabled())
+        if (!frame->settings().openGLMultisamplingEnabled())
             attributes.antialias = false;
     }
@@ -5821 +5820 @@
         return;
 
-    if (!frame->loader().client()->allowWebGL(frame->settings() && frame->settings()->webGLEnabled()))
+    if (!frame->loader().client()->allowWebGL(frame->settings().webGLEnabled()))
         return;
 

trunk/Source/WebCore/html/parser/XSSAuditor.cpp

@@ -240 +240 @@
 
     if (Frame* frame = document->frame())
-        if (Settings* settings = frame->settings())
-            m_isEnabled = settings->xssAuditorEnabled();
+        m_isEnabled = frame->settings().xssAuditorEnabled();
 
     if (!m_isEnabled)

trunk/Source/WebCore/inspector/InspectorPageAgent.cpp

@@ -435 +435 @@
     m_instrumentingAgents->setInspectorPageAgent(this);
 
-    if (Frame* frame = mainFrame()) {
-        if (Settings* settings = frame->settings())
-            m_originalScriptExecutionDisabled = !settings->isScriptEnabled();
-    }
+    if (Frame* frame = mainFrame())
+        m_originalScriptExecutionDisabled = !frame->settings().isScriptEnabled();
 }
 
@@ -841 +839 @@
     if (frame) {
         disabledByScriptController = !frame->script().canExecuteScripts(NotAboutToExecuteScript);
-        if (frame->settings())
-            disabledInSettings = !frame->settings()->isScriptEnabled();
+        disabledInSettings = !frame->settings().isScriptEnabled();
     }
 
@@ -862 +859 @@
         return;
 
-    Settings* settings = mainFrame()->settings();
-    if (settings) {
-        m_ignoreScriptsEnabledNotification = true;
-        settings->setScriptEnabled(!value);
-        m_ignoreScriptsEnabledNotification = false;
-    }
+    m_ignoreScriptsEnabledNotification = true;
+    mainFrame()->settings().setScriptEnabled(!value);
+    m_ignoreScriptsEnabledNotification = false;
 }
 
@@ -1172 +1166 @@
 {
     m_state->setBoolean(PageAgentState::touchEventEmulationEnabled, enabled);
-    if (mainFrame() && mainFrame()->settings())
-        mainFrame()->settings()->setTouchEventEmulationEnabled(enabled);
+    if (mainFrame())
+        mainFrame()->settings().setTouchEventEmulationEnabled(enabled);
 }
 #endif

trunk/Source/WebCore/loader/DocumentLoader.cpp

@@ -627 +627 @@
 #if ENABLE(FTPDIR)
     // Respect the hidden FTP Directory Listing pref so it can be tested even if the policy delegate might otherwise disallow it
-    Settings* settings = m_frame->settings();
-    if (settings && settings->forceFTPDirectoryListings() && m_response.mimeType() == "application/x-ftp-directory") {
+    if (m_frame->settings().forceFTPDirectoryListings() && m_response.mimeType() == "application/x-ftp-directory") {
         continueAfterContentPolicy(PolicyUse);
         return;
@@ -941 +940 @@
     // but we still need to consider subframes.
     if (frameLoader()->state() != FrameStateComplete) {
-        if (m_frame->settings()->needsIsLoadingInAPISenseQuirk() && !m_subresourceLoaders.isEmpty())
+        if (m_frame->settings().needsIsLoadingInAPISenseQuirk() && !m_subresourceLoaders.isEmpty())
             return true;
     
@@ -1177 +1176 @@
     case Archive::WebArchive:
         // WebArchiveDebugMode means we fail loads instead of trying to fetch them from the network if they're not in the archive.
-        return m_frame->settings() && m_frame->settings()->webArchiveDebugModeEnabled() && ArchiveFactory::isArchiveMimeType(responseMIMEType());
+        return m_frame->settings().webArchiveDebugModeEnabled() && ArchiveFactory::isArchiveMimeType(responseMIMEType());
 #endif
 #if ENABLE(MHTML)

trunk/Source/WebCore/loader/DocumentWriter.cpp

@@ -170 +170 @@
 {
     if (!m_decoder) {
-        if (Settings* settings = m_frame->settings()) {
-            m_decoder = TextResourceDecoder::create(m_mimeType,
-                settings->defaultTextEncodingName(),
-                settings->usesEncodingDetector());
-            Frame* parentFrame = m_frame->tree()->parent();
-            // Set the hint encoding to the parent frame encoding only if
-            // the parent and the current frames share the security origin.
-            // We impose this condition because somebody can make a child frame 
-            // containing a carefully crafted html/javascript in one encoding
-            // that can be mistaken for hintEncoding (or related encoding) by
-            // an auto detector. When interpreted in the latter, it could be
-            // an attack vector.
-            // FIXME: This might be too cautious for non-7bit-encodings and
-            // we may consider relaxing this later after testing.
-            if (canReferToParentFrameEncoding(m_frame, parentFrame))
-                m_decoder->setHintEncoding(parentFrame->document()->decoder());
-        } else
-            m_decoder = TextResourceDecoder::create(m_mimeType, String());
+        m_decoder = TextResourceDecoder::create(m_mimeType,
+            m_frame->settings().defaultTextEncodingName(),
+            m_frame->settings().usesEncodingDetector());
         Frame* parentFrame = m_frame->tree()->parent();
+        // Set the hint encoding to the parent frame encoding only if
+        // the parent and the current frames share the security origin.
+        // We impose this condition because somebody can make a child frame
+        // containing a carefully crafted html/javascript in one encoding
+        // that can be mistaken for hintEncoding (or related encoding) by
+        // an auto detector. When interpreted in the latter, it could be
+        // an attack vector.
+        // FIXME: This might be too cautious for non-7bit-encodings and
+        // we may consider relaxing this later after testing.
+        if (canReferToParentFrameEncoding(m_frame, parentFrame))
+            m_decoder->setHintEncoding(parentFrame->document()->decoder());
         if (m_encoding.isEmpty()) {
             if (canReferToParentFrameEncoding(m_frame, parentFrame))

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -2504 +2504 @@
     if (request.responseContentDispositionEncodingFallbackArray().isEmpty()) {
         // Always try UTF-8. If that fails, try frame encoding (if any) and then the default.
-        Settings* settings = m_frame->settings();
-        request.setResponseContentDispositionEncodingFallbackArray("UTF-8", m_frame->document()->encoding(), settings ? settings->defaultTextEncodingName() : String());
+        request.setResponseContentDispositionEncodingFallbackArray("UTF-8", m_frame->document()->encoding(), m_frame->settings().defaultTextEncodingName());
     }
 }
@@ -3423 +3422 @@
     FrameLoader::addHTTPOriginIfNeeded(requestWithReferrer.resourceRequest(), openerFrame->loader().outgoingOrigin());
 
-    if (openerFrame->settings() && !openerFrame->settings()->supportsMultipleWindows()) {
+    if (!openerFrame->settings().supportsMultipleWindows()) {
         created = false;
         return openerFrame;

trunk/Source/WebCore/loader/HistoryController.cpp

@@ -363 +363 @@
     FrameLoader& frameLoader = m_frame->loader();
 
-    Settings* settings = m_frame->settings();
-    bool needPrivacy = !settings || settings->privateBrowsingEnabled();
+    bool needPrivacy = m_frame->settings().privateBrowsingEnabled();
     const KURL& historyURL = frameLoader.documentLoader()->urlForHistory();
 
@@ -401 +400 @@
 #endif
     
-    Settings* settings = m_frame->settings();
-    bool needPrivacy = !settings || settings->privateBrowsingEnabled();
+    bool needPrivacy = m_frame->settings().privateBrowsingEnabled();
     const KURL& historyURL = m_frame->loader().documentLoader()->urlForHistory();
 
@@ -450 +448 @@
     }
 
-    Settings* settings = m_frame->settings();
-    bool needPrivacy = !settings || settings->privateBrowsingEnabled();
+    bool needPrivacy = m_frame->settings().privateBrowsingEnabled();
     const KURL& historyURL = m_frame->loader().documentLoader()->urlForHistory();
 
@@ -543 +540 @@
         return;
 
-    Settings* settings = m_frame->settings();
-    if (!settings || settings->privateBrowsingEnabled())
+    if (m_frame->settings().privateBrowsingEnabled())
         return;
 
@@ -872 +868 @@
     page->backForward()->addItem(topItem.release());
 
-    Settings* settings = m_frame->settings();
-    if (!settings || settings->privateBrowsingEnabled())
+    if (m_frame->settings().privateBrowsingEnabled())
         return;
 
@@ -893 +888 @@
     m_currentItem->setFormContentType(String());
 
-    Settings* settings = m_frame->settings();
-    if (!settings || settings->privateBrowsingEnabled())
+    if (m_frame->settings().privateBrowsingEnabled())
         return;
 

trunk/Source/WebCore/loader/MixedContentChecker.cpp

@@ -69 +69 @@
         return true;
 
-    Settings* settings = m_frame->settings();
-    bool allowed = client()->allowDisplayingInsecureContent(settings && settings->allowDisplayOfInsecureContent(), securityOrigin, url);
+    bool allowed = client()->allowDisplayingInsecureContent(m_frame->settings().allowDisplayOfInsecureContent(), securityOrigin, url);
     logWarning(allowed, "displayed", url);
 
@@ -84 +83 @@
         return true;
 
-    Settings* settings = m_frame->settings();
-    bool allowed = client()->allowRunningInsecureContent(settings && settings->allowRunningOfInsecureContent(), securityOrigin, url);
+    bool allowed = client()->allowRunningInsecureContent(m_frame->settings().allowRunningOfInsecureContent(), securityOrigin, url);
     logWarning(allowed, "ran", url);
 

trunk/Source/WebCore/loader/SubframeLoader.cpp

@@ -109 +109 @@
 bool SubframeLoader::pluginIsLoadable(HTMLPlugInImageElement* pluginElement, const KURL& url, const String& mimeType)
 {
-    Settings* settings = m_frame->settings();
-    if (!settings)
-        return false;
-
     if (MIMETypeRegistry::isJavaAppletMIMEType(mimeType)) {
-        if (!settings->isJavaEnabled())
-            return false;
-        if (document() && document()->securityOrigin()->isLocal() && !settings->isJavaEnabledForLocalFiles())
+        if (!m_frame->settings().isJavaEnabled())
+            return false;
+        if (document() && document()->securityOrigin()->isLocal() && !m_frame->settings().isJavaEnabledForLocalFiles())
             return false;
     }
@@ -405 +401 @@
 bool SubframeLoader::allowPlugins(ReasonForCallingAllowPlugins reason)
 {
-    Settings* settings = m_frame->settings();
-    bool allowed = m_frame->loader().client()->allowPlugins(settings && settings->arePluginsEnabled());
+    bool allowed = m_frame->loader().client()->allowPlugins(m_frame->settings().arePluginsEnabled());
     if (!allowed && reason == AboutToInstantiatePlugin)
         m_frame->loader().client()->didNotAllowPlugins();

trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp

@@ -139 +139 @@
     ASSERT(frame && frame->page());
     
-    if (!frame->settings() || !frame->settings()->offlineWebApplicationCacheEnabled())
+    if (!frame->settings().offlineWebApplicationCacheEnabled())
         return;
 
@@ -197 +197 @@
 
     // Don't change anything on disk if private browsing is enabled.
-    if (frame->settings()->privateBrowsingEnabled()) {
+    if (frame->settings().privateBrowsingEnabled()) {
         postListenerTask(ApplicationCacheHost::CHECKING_EVENT, documentLoader);
         postListenerTask(ApplicationCacheHost::ERROR_EVENT, documentLoader);
@@ -215 +215 @@
 void ApplicationCacheGroup::selectCacheWithoutManifestURL(Frame* frame)
 {
-    if (!frame->settings() || !frame->settings()->offlineWebApplicationCacheEnabled())
+    if (!frame->settings().offlineWebApplicationCacheEnabled())
         return;
 
@@ -441 +441 @@
 
     // Don't change anything on disk if private browsing is enabled.
-    if (!frame->settings() || frame->settings()->privateBrowsingEnabled()) {
+    if (frame->settings().privateBrowsingEnabled()) {
         ASSERT(m_pendingMasterResourceLoaders.isEmpty());
         ASSERT(m_pendingEntries.isEmpty());

trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp

@@ -475 +475 @@
 bool ApplicationCacheHost::isApplicationCacheEnabled()
 {
-    return m_documentLoader->frame() && m_documentLoader->frame()->settings()
-           && m_documentLoader->frame()->settings()->offlineWebApplicationCacheEnabled();
+    return m_documentLoader->frame() && m_documentLoader->frame()->settings().offlineWebApplicationCacheEnabled();
 }
 

trunk/Source/WebCore/loader/cache/CachedImage.cpp

@@ -353 +353 @@
         return true;
 
-    Settings* settings = m_loader->frameLoader()->frame()->settings();
-    if (!settings)
-        return true;
-
     size_t estimatedDecodedImageSize = m_image->width() * m_image->height() * 4; // no overflow check
-    return estimatedDecodedImageSize <= settings->maximumDecodedImageSize();
+    return estimatedDecodedImageSize <= m_loader->frameLoader()->frame()->settings().maximumDecodedImageSize();
 }
 

trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp

@@ -366 +366 @@
 
         if (frame()) {
-            Settings* settings = frame()->settings();
-            if (!frame()->loader().client()->allowScriptFromSource(!settings || settings->isScriptEnabled(), url)) {
+            if (!frame()->loader().client()->allowScriptFromSource(frame()->settings().isScriptEnabled(), url)) {
                 frame()->loader().client()->didNotAllowScript();
                 return false;

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

@@ -148 +148 @@
     // People who want to avoid loading images generally want to avoid loading all images, unless an exception has been made for site icons.
     // Now that we've accounted for URL mapping, avoid starting the network load if images aren't set to display automatically.
-    Settings* settings = m_frame->settings();
-    if (settings && !settings->loadsImagesAutomatically() && !settings->loadsSiteIconsIgnoringImageLoadingSetting())
+    if (!m_frame->settings().loadsImagesAutomatically() && !m_frame->settings().loadsSiteIconsIgnoringImageLoadingSetting())
         return;
 

trunk/Source/WebCore/page/ContextMenuController.cpp

@@ -184 +184 @@
         FrameLoadRequest request(frame->document()->securityOrigin(), ResourceRequest(urlToLoad, frame->loader().outgoingReferrer()));
         Page* newPage = oldPage;
-        if (!frame->settings() || frame->settings()->supportsMultipleWindows()) {
+        if (frame->settings().supportsMultipleWindows()) {
             newPage = oldPage->chrome().createWindow(frame, request, WindowFeatures(), NavigationAction(request.resourceRequest()));
             if (!newPage)

trunk/Source/WebCore/page/DOMWindow.cpp

@@ -358 +358 @@
         return true;
 
-    Settings* settings = firstFrame->settings();
-    return settings && settings->javaScriptCanOpenWindowsAutomatically();
+    return firstFrame->settings().javaScriptCanOpenWindowsAutomatically();
 }
 
@@ -924 +923 @@
         return;
 
-    bool allowFocus = WindowFocusAllowedIndicator::windowFocusAllowed() || !m_frame->settings()->windowFocusRestricted();
+    bool allowFocus = WindowFocusAllowedIndicator::windowFocusAllowed() || !m_frame->settings().windowFocusRestricted();
     if (context) {
         ASSERT(isMainThread());
@@ -949 +948 @@
 void DOMWindow::blur()
 {
-
     if (!m_frame)
         return;
@@ -957 +955 @@
         return;
 
-    if (m_frame->settings()->windowFocusRestricted())
+    if (m_frame->settings().windowFocusRestricted())
         return;
 
@@ -988 +986 @@
     }
 
-    Settings* settings = m_frame->settings();
-    bool allowScriptsToCloseWindows = settings && settings->allowScriptsToCloseWindows();
+    bool allowScriptsToCloseWindows = m_frame->settings().allowScriptsToCloseWindows();
 
     if (!(page->openedByDOM() || page->backForward()->count() <= 1 || allowScriptsToCloseWindows))
@@ -1387 +1384 @@
     if (!authorOnly)
         rulesToInclude |= StyleResolver::UAAndUserCSSRules;
-    if (Settings* settings = m_frame->settings()) {
-        if (settings->crossOriginCheckInGetMatchedCSSRulesDisabled())
-            rulesToInclude |= StyleResolver::CrossOriginCSSRules;
-    }
+    if (m_frame->settings().crossOriginCheckInGetMatchedCSSRulesDisabled())
+        rulesToInclude |= StyleResolver::CrossOriginCSSRules;
 
     PseudoId pseudoId = CSSSelector::pseudoId(pseudoType);

trunk/Source/WebCore/page/DragController.cpp

@@ -662 +662 @@
                 if ((m_dragSourceAction & DragSourceActionImage)
                     && isHTMLImageElement(node)
-                    && sourceFrame->settings()
-                    && sourceFrame->settings()->loadsImagesAutomatically()) {
+                    && sourceFrame->settings().loadsImagesAutomatically()) {
                     state.type = static_cast<DragSourceAction>(state.type | DragSourceActionImage);
                     return toElement(node);
@@ -846 +845 @@
         m_client->willPerformDragSourceAction(DragSourceActionLink, dragOrigin, clipboard);
         if (!dragImage) {
-            dragImage = createDragImageForLink(linkURL, hitTestResult.textContent(), src->settings() ? src->settings()->fontRenderingMode() : NormalRenderingMode);
+            dragImage = createDragImageForLink(linkURL, hitTestResult.textContent(), src->settings().fontRenderingMode());
             IntSize size = dragImageSize(dragImage);
             m_dragOffset = IntPoint(-size.width() / 2, -LinkDragBorderInset);

trunk/Source/WebCore/page/EventHandler.cpp

@@ -947 +947 @@
         VisibleSelection newSelection;
         Node* node = event.targetNode();
-        bool caretBrowsing = m_frame->settings() && m_frame->settings()->caretBrowsingEnabled();
+        bool caretBrowsing = m_frame->settings().caretBrowsingEnabled();
         if (node && (caretBrowsing || node->rendererIsEditable()) && node->renderer()) {
             VisiblePosition pos = node->renderer()->positionForPoint(event.localPoint());
@@ -1215 +1215 @@
     // If the link is editable, then we need to check the settings to see whether or not the link should be followed
     if (editable) {
-        ASSERT(m_frame->settings());
-        switch (m_frame->settings()->editableLinkBehavior()) {
+        switch (m_frame->settings().editableLinkBehavior()) {
         default:
         case EditableLinkDefaultBehavior:
@@ -2636 +2635 @@
 {
 #if ENABLE(DRAG_SUPPORT)
-    if (m_frame->settings() && m_frame->settings()->touchDragDropEnabled()) {
+    if (m_frame->settings().touchDragDropEnabled()) {
         IntPoint adjustedPoint = gestureEvent.position();
 #if ENABLE(TOUCH_ADJUSTMENT)
@@ -2817 +2816 @@
 bool EventHandler::shouldApplyTouchAdjustment(const PlatformGestureEvent& event) const
 {
-    if (m_frame->settings() && !m_frame->settings()->touchAdjustmentEnabled())
+    if (!m_frame->settings().touchAdjustmentEnabled())
         return false;
     return !event.area().isEmpty();
@@ -3031 +3030 @@
         return;
 
-    Settings* settings = m_frame->settings();
-    if (settings && !settings->deviceSupportsMouse())
+    if (!m_frame->settings().deviceSupportsMouse())
         return;
 
@@ -3071 +3069 @@
     ASSERT(!m_mousePressed);
 
-    Settings* settings = m_frame->settings();
-    if (settings && !settings->deviceSupportsMouse())
+    if (!m_frame->settings().deviceSupportsMouse())
         return;
 
@@ -3706 +3703 @@
         return;
 
-    if (!m_frame->settings()->backspaceKeyNavigationEnabled())
+    if (!m_frame->settings().backspaceKeyNavigationEnabled())
         return;
     
@@ -4065 +4062 @@
 bool EventHandler::dispatchSyntheticTouchEventIfEnabled(const PlatformMouseEvent& event)
 {
-    if (!m_frame || !m_frame->settings() || !m_frame->settings()->isTouchEventEmulationEnabled())
+    if (!m_frame || !m_frame->settings().isTouchEventEmulationEnabled())
         return false;
 

trunk/Source/WebCore/page/FocusController.cpp

@@ -288 +288 @@
     Node* currentNode = document->focusedElement();
     // FIXME: Not quite correct when it comes to focus transitions leaving/entering the WebView itself
-    bool caretBrowsing = frame->settings() && frame->settings()->caretBrowsingEnabled();
+    bool caretBrowsing = frame->settings().caretBrowsingEnabled();
 
     if (caretBrowsing && !currentNode)
@@ -569 +569 @@
         return;
 
-    bool caretBrowsing = oldFocusedFrame->settings()->caretBrowsingEnabled();
+    bool caretBrowsing = oldFocusedFrame->settings().caretBrowsingEnabled();
     if (caretBrowsing)
         return;

trunk/Source/WebCore/page/Frame.cpp

@@ -152 +152 @@
 inline Frame::Frame(Page* page, HTMLFrameOwnerElement* ownerElement, FrameLoaderClient* frameLoaderClient)
     : m_page(page)
+    , m_settings(&page->settings())
     , m_treeNode(this, parentFromOwnerElement(ownerElement))
     , m_loader(this, frameLoaderClient)
@@ -184 +185 @@
 #if USE(TILED_BACKING_STORE)
         // Top level frame only for now.
-        setTiledBackingStoreEnabled(page->settings().tiledBackingStoreEnabled());
+        setTiledBackingStoreEnabled(settings().tiledBackingStoreEnabled());
 #endif
     } else {
@@ -327 +328 @@
 }
 #endif // ENABLE(ORIENTATION_EVENTS)
-    
-Settings* Frame::settings() const
-{
-    return m_page ? &m_page->settings() : 0;
-}
 
 static PassOwnPtr<RegularExpression> createRegExpForLabels(const Vector<String>& labels)
@@ -561 +557 @@
         return;
 
-    if (loader().stateMachine()->creatingInitialEmptyDocument() && !settings()->shouldInjectUserScriptsInInitialEmptyDocument())
+    if (loader().stateMachine()->creatingInitialEmptyDocument() && !settings().shouldInjectUserScriptsInInitialEmptyDocument())
         return;
 
@@ -947 +943 @@
 
     // 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 || settings().applyPageScaleFactorInCompositor())
         return 1;
 

trunk/Source/WebCore/page/Frame.h

@@ -142 +142 @@
         static Frame* frameForWidget(const Widget*);
 
-        Settings* settings() const; // can be NULL
+        Settings& settings() const { return *m_settings; }
 
         void setPrinting(bool printing, const FloatSize& pageSize, const FloatSize& originalPageSize, float maximumShrinkRatio, AdjustViewSizeOrNot);
@@ -211 +211 @@
 
         Page* m_page;
+        const RefPtr<Settings> m_settings;
         mutable FrameTree m_treeNode;
         mutable FrameLoader m_loader;

trunk/Source/WebCore/page/FrameView.cpp

@@ -496 +496 @@
 bool FrameView::frameFlatteningEnabled() const
 {
-    if (Settings* settings = frame().settings())
-        return settings->frameFlatteningEnabled();
-    return false;
+    return frame().settings().frameFlatteningEnabled();
 }
 
@@ -541 +539 @@
 PassRefPtr<Scrollbar> FrameView::createScrollbar(ScrollbarOrientation orientation)
 {
-    if (Settings* settings = frame().settings()) {
-        if (!settings->allowCustomScrollbarInMainFrame() && isMainFrameView())
-            return ScrollView::createScrollbar(orientation);
-    }
+    if (!frame().settings().allowCustomScrollbarInMainFrame() && isMainFrameView())
+        return ScrollView::createScrollbar(orientation);
 
     // FIXME: We need to update the scrollbar dynamically as documents change (or as doc elements and bodies get discovered that have custom styles).
@@ -798 +794 @@
     if (!renderView)
         return false;
-    if (frame().settings() && frame().settings()->compositedScrollingForFramesEnabled())
+    if (frame().settings().compositedScrollingForFramesEnabled())
         return renderView->compositor()->inForcedCompositingMode();
     return false;
@@ -1634 +1630 @@
 bool FrameView::fixedElementsLayoutRelativeToFrame() const
 {
-    if (!frame().settings())
-        return false;
-
-    return frame().settings()->fixedElementsLayoutRelativeToFrame();
+    return frame().settings().fixedElementsLayoutRelativeToFrame();
 }
 
@@ -3085 +3078 @@
 float FrameView::visibleContentScaleFactor() const
 {
-    if (!isMainFrameView() || !frame().settings()->applyPageScaleFactorInCompositor())
+    if (!isMainFrameView() || !frame().settings().applyPageScaleFactorInCompositor())
         return 1;
 

trunk/Source/WebCore/page/Navigator.cpp

@@ -64 +64 @@
     if (!(sourceURL->endsWith("/dqm_script.js") || sourceURL->endsWith("/dqm_loader.js") || sourceURL->endsWith("/tdqm_loader.js")))
         return false;
-    Settings* settings = frame->settings();
-    if (!settings)
-        return false;
-    return settings->needsSiteSpecificQuirks();
+    return frame->settings().needsSiteSpecificQuirks();
 }
 
@@ -125 +122 @@
 bool Navigator::javaEnabled() const
 {
-    if (!m_frame || !m_frame->settings())
+    if (!m_frame)
         return false;
 
-    if (!m_frame->settings()->isJavaEnabled())
+    if (!m_frame->settings().isJavaEnabled())
         return false;
-    if (m_frame->document()->securityOrigin()->isLocal() && !m_frame->settings()->isJavaEnabledForLocalFiles())
+    if (m_frame->document()->securityOrigin()->isLocal() && !m_frame->settings().isJavaEnabledForLocalFiles())
         return false;
 

trunk/Source/WebCore/page/Page.h

@@ -458 +458 @@
     RefPtr<ScrollingCoordinator> m_scrollingCoordinator;
 
-    const OwnPtr<Settings> m_settings;
+    const RefPtr<Settings> m_settings;
     OwnPtr<ProgressTracker> m_progress;
 

trunk/Source/WebCore/page/Settings.cpp

@@ -183 +183 @@
 }
 
-PassOwnPtr<Settings> Settings::create(Page* page)
-{
-    return adoptPtr(new Settings(page));
+PassRefPtr<Settings> Settings::create(Page* page)
+{
+    return adoptRef(new Settings(page));
 }
 

trunk/Source/WebCore/page/Settings.h

@@ -36 +36 @@
 #include "Timer.h"
 #include <wtf/HashMap.h>
+#include <wtf/RefCounted.h>
 #include <wtf/text/AtomicString.h>
 #include <wtf/text/AtomicStringHash.h>
@@ -59 +60 @@
     };
 
-    class Settings {
+    class Settings : public RefCounted<Settings> {
         WTF_MAKE_NONCOPYABLE(Settings); WTF_MAKE_FAST_ALLOCATED;
     public:
-        static PassOwnPtr<Settings> create(Page*);
-
+        static PassRefPtr<Settings> create(Page*);
         ~Settings();
 

trunk/Source/WebCore/page/SpatialNavigation.cpp

@@ -91 +91 @@
 bool isSpatialNavigationEnabled(const Frame* frame)
 {
-    return (frame && frame->settings() && frame->settings()->spatialNavigationEnabled());
+    return (frame && frame->settings().spatialNavigationEnabled());
 }
 

trunk/Source/WebCore/page/mac/EventHandlerMac.mm

@@ -709 +709 @@
 bool EventHandler::needsKeyboardEventDisambiguationQuirks() const
 {
-    Settings* settings = m_frame->settings();
-    if (!settings)
-        return false;
-
 #if ENABLE(DASHBOARD_SUPPORT)
-    if (settings->usesDashboardBackwardCompatibilityMode())
+    if (m_frame->settings().usesDashboardBackwardCompatibilityMode())
         return true;
 #endif
         
-    if (settings->needsKeyboardEventDisambiguationQuirks())
+    if (m_frame->settings().needsKeyboardEventDisambiguationQuirks())
         return true;
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -3273 +3273 @@
 {
     // Paint the caret if the FrameSelection says so or if caret browsing is enabled
-    bool caretBrowsing = frame()->settings() && frame()->settings()->caretBrowsingEnabled();
+    bool caretBrowsing = frame()->settings().caretBrowsingEnabled();
     RenderObject* caretPainter;
     bool isContentEditable;

trunk/Source/WebCore/rendering/RenderFrameSet.cpp

@@ -645 +645 @@
 bool RenderFrameSet::flattenFrameSet() const
 {
-    return frame() && frame()->settings() && frame()->settings()->frameFlatteningEnabled();
+    return frame() && frame()->settings().frameFlatteningEnabled();
 }
 

trunk/Source/WebCore/rendering/RenderIFrame.cpp

@@ -109 +109 @@
         return false; // Seamless iframes are already "flat", don't try to flatten them.
 
-    bool enabled = frame && frame->settings() && frame->settings()->frameFlatteningEnabled();
+    bool enabled = frame && frame->settings().frameFlatteningEnabled();
 
     if (!enabled || !frame->page())

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -146 +146 @@
                 tiledBacking->setUnparentsOffscreenTiles(true);
 
-            tiledBacking->setScrollingPerformanceLoggingEnabled(frame->settings() && frame->settings()->scrollingPerformanceLoggingEnabled());
+            tiledBacking->setScrollingPerformanceLoggingEnabled(frame->settings().scrollingPerformanceLoggingEnabled());
             adjustTiledBackingCoverage();
         }

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

@@ -292 +292 @@
         return false;
 
-    if (!frame->settings())
-        return false;
-
-    bool caretBrowsing = frame->settings()->caretBrowsingEnabled();
+    bool caretBrowsing = frame->settings().caretBrowsingEnabled();
     if (caretBrowsing) {
         switch (keyEvent->windowsVirtualKeyCode()) {

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

@@ -436 +436 @@
     ASSERT(coreFrame);
 
-    Settings* settings = coreFrame->settings();
-    if (!settings || !settings->isScriptEnabled())
+    if (!coreFrame->settings().isScriptEnabled())
         return;
 

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

@@ -586 +586 @@
     ASSERT(coreFrame);
 
-    Settings* settings = coreFrame->settings();
-    if (!settings || !settings->isScriptEnabled())
+    if (!coreFrame->settings().isScriptEnabled())
         return;
 

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

@@ -1669 +1669 @@
     Frame* frame = core(m_webFrame.get());
     NSMutableArray *attributeKeys = kit(paramNames);
-    if (frame && frame->settings()->needsSiteSpecificQuirks() && equalIgnoringCase(mimeType, "application/x-snkp")) {
+    if (frame && frame->settings().needsSiteSpecificQuirks() && equalIgnoringCase(mimeType, "application/x-snkp")) {
         for (NSUInteger i = 0; i < [attributeKeys count]; ++i)
             [attributeKeys replaceObjectAtIndex:i withObject:[[attributeKeys objectAtIndex:i] lowercaseString]];

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

@@ -58 +58 @@
 bool WebFrameNetworkingContext::needsSiteSpecificQuirks() const
 {
-    return frame() && frame()->settings() && frame()->settings()->needsSiteSpecificQuirks();
+    return frame() && frame()->settings().needsSiteSpecificQuirks();
 }
 
 bool WebFrameNetworkingContext::localFileContentSniffingEnabled() const
 {
-    return frame() && frame()->settings() && frame()->settings()->localFileContentSniffingEnabled();
+    return frame() && frame()->settings().localFileContentSniffingEnabled();
 }
 
@@ -94 +94 @@
     ASSERT(isMainThread());
 
-    if (frame() && frame()->settings() && frame()->settings()->privateBrowsingEnabled())
+    if (frame() && frame()->settings().privateBrowsingEnabled())
         return *privateSession;
 

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

@@ -633 +633 @@
         return true;
 
-    if (m_frame && m_frame->settings()  && m_frame->settings()->arePluginsEnabled()
+    if (m_frame && m_frame->settings().arePluginsEnabled()
         && PluginDatabase::installedPlugins()->isMIMETypeRegistered(type))
         return true;
@@ -1349 +1349 @@
         mimeType = MIMETypeRegistry::getMIMETypeForExtension(extension);
 
-    bool arePluginsEnabled = (m_frame && m_frame->settings() && m_frame->settings()->arePluginsEnabled());
+    bool arePluginsEnabled = (m_frame && m_frame->settings().arePluginsEnabled());
     if (arePluginsEnabled && !mimeType.length())
         mimeType = PluginDatabase::installedPlugins()->MIMETypeForExtension(extension);

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

@@ -109 +109 @@
     ASSERT(isMainThread());
 
-    if (frame() && frame()->settings() && frame()->settings()->privateBrowsingEnabled())
+    if (frame() && frame()->settings().privateBrowsingEnabled())
         return *privateSession;
 

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

@@ -366 +366 @@
         return false;
 
-    bool caretBrowsing = frame->settings()->caretBrowsingEnabled();
+    bool caretBrowsing = frame->settings().caretBrowsingEnabled();
     if (caretBrowsing) {
         switch (keyEvent->windowsVirtualKeyCode()) {

trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp

@@ -104 +104 @@
     ContentSniffingPolicy contentSniffingPolicy = resourceLoader->shouldSniffContent() ? SniffContent : DoNotSniffContent;
     StoredCredentials allowStoredCredentials = resourceLoader->shouldUseCredentialStorage() ? AllowStoredCredentials : DoNotAllowStoredCredentials;
-    bool privateBrowsingEnabled = resourceLoader->frameLoader()->frame()->settings()->privateBrowsingEnabled();
+    bool privateBrowsingEnabled = resourceLoader->frameLoader()->frame()->settings().privateBrowsingEnabled();
 
     // FIXME: Some entities in WebCore use WebCore's "EmptyFrameLoaderClient" instead of having a proper WebFrameLoaderClient.

trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp

@@ -609 +609 @@
             m_pluginElement->setNeedsStyleRecalc(SyntheticStyleChange);
         }
-        if (frame() && !frame()->settings()->maximumPlugInSnapshotAttempts()) {
+        if (frame() && !frame()->settings().maximumPlugInSnapshotAttempts()) {
             m_pluginElement->setDisplayState(HTMLPlugInElement::DisplayingSnapshot);
             return;
@@ -1416 +1416 @@
         return false;
     
-    Settings* settings = frame()->settings();
-    if (!settings)
-        return false;
-
     // We know that some plug-ins can support snapshotting without needing
     // accelerated compositing. Since we're trying to snapshot them anyway,
@@ -1427 +1423 @@
         return false;
 
-    return settings->acceleratedCompositingEnabled();
+    return frame()->settings().acceleratedCompositingEnabled();
 }
 
@@ -1532 +1528 @@
         return true;
 
-    Settings* settings = frame()->settings();
-    if (!settings)
-        return true;
-
-    return settings->privateBrowsingEnabled();
+    return frame()->settings().privateBrowsingEnabled();
 }
 
@@ -1689 +1681 @@
 
 #if PLATFORM(MAC)
-        unsigned maximumSnapshotRetries = frame() ? frame()->settings()->maximumPlugInSnapshotAttempts() : 0;
+        unsigned maximumSnapshotRetries = frame() ? frame()->settings().maximumPlugInSnapshotAttempts() : 0;
         if (snapshotImage && isAlmostSolidColor(static_cast<BitmapImage*>(snapshotImage.get())) && m_countSnapshotRetries < maximumSnapshotRetries) {
             ++m_countSnapshotRetries;
@@ -1720 +1712 @@
 void PluginView::pluginDidReceiveUserInteraction()
 {
-    if (frame() && !frame()->settings()->plugInSnapshottingEnabled())
+    if (frame() && !frame()->settings().plugInSnapshottingEnabled())
         return;
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm

@@ -89 +89 @@
 bool WebFrameNetworkingContext::needsSiteSpecificQuirks() const
 {
-    return frame() && frame()->settings() && frame()->settings()->needsSiteSpecificQuirks();
+    return frame() && frame()->settings().needsSiteSpecificQuirks();
 }
 
 bool WebFrameNetworkingContext::localFileContentSniffingEnabled() const
 {
-    return frame() && frame()->settings() && frame()->settings()->localFileContentSniffingEnabled();
+    return frame() && frame()->settings().localFileContentSniffingEnabled();
 }
 
@@ -118 +118 @@
     ASSERT(isMainThread());
 
-    if (frame() && frame()->settings() && frame()->settings()->privateBrowsingEnabled())
+    if (frame() && frame()->settings().privateBrowsingEnabled())
         return *privateSession;
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp

@@ -66 +66 @@
 NetworkStorageSession& WebFrameNetworkingContext::storageSession() const
 {
-    if (frame() && frame()->settings() && frame()->settings()->privateBrowsingEnabled())
+    if (frame() && frame()->settings().privateBrowsingEnabled())
         return *privateSession;