diff options
Diffstat (limited to 'Source/WebCore/page/Settings.cpp')
| -rw-r--r-- | Source/WebCore/page/Settings.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Source/WebCore/page/Settings.cpp b/Source/WebCore/page/Settings.cpp index 5cf20d6..f272325 100644 --- a/Source/WebCore/page/Settings.cpp +++ b/Source/WebCore/page/Settings.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. + * Copyright (C) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -101,6 +101,7 @@ Settings::Settings(Page* page) , m_isSpatialNavigationEnabled(false) , m_isJavaEnabled(false) , m_loadsImagesAutomatically(false) + , m_loadsSiteIconsIgnoringImageLoadingSetting(false) , m_privateBrowsingEnabled(false) , m_caretBrowsingEnabled(false) , m_areImagesEnabled(true) @@ -175,6 +176,7 @@ Settings::Settings(Page* page) , m_crossOriginCheckInGetMatchedCSSRulesDisabled(false) , m_useQuickLookResourceCachingQuirks(false) , m_forceCompositingMode(false) +<<<<<<< HEAD #ifdef ANDROID_LAYOUT , m_useWideViewport(false) #endif @@ -190,6 +192,9 @@ Settings::Settings(Page* page) #ifdef ANDROID_PLUGINS , m_pluginsOnDemand(false) #endif +======= + , m_shouldInjectUserScriptsInInitialEmptyDocument(false) +>>>>>>> WebKit.org at r84325 { // A Frame may not have been created yet, so we initialize the AtomicString // hash before trying to use it. @@ -303,6 +308,11 @@ void Settings::setLoadsImagesAutomatically(bool loadsImagesAutomatically) setLoadsImagesAutomaticallyInAllFrames(m_page); } +void Settings::setLoadsSiteIconsIgnoringImageLoadingSetting(bool loadsSiteIcons) +{ + m_loadsSiteIconsIgnoringImageLoadingSetting = loadsSiteIcons; +} + void Settings::setJavaScriptEnabled(bool isJavaScriptEnabled) { m_isJavaScriptEnabled = isJavaScriptEnabled; |