WebCore:
authorabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 4 Mar 2009 19:56:27 +0000 (19:56 +0000)
committerabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 4 Mar 2009 19:56:27 +0000 (19:56 +0000)
2009-03-04  Adam Barth  <abath@webkit.org>

        Reviewed by Alexey Proskuryakov.

        https://bugs.webkit.org/show_bug.cgi?id=24356

        Fix WebKit style for allowUniversalAccessFromFileURLs.

        * WebCore.base.exp:
        * dom/Document.cpp:
        (WebCore::Document::initSecurityContext):
        * page/Settings.cpp:
        (WebCore::Settings::Settings):
        (WebCore::Settings::setAllowUniversalAccessFromFileURLs):
        * page/Settings.h:
        (WebCore::Settings::allowUniversalAccessFromFileURLs):

WebKit/mac:

2009-03-04  Adam Barth  <abath@webkit.org>

        Reviewed by Alexey Proskuryakov.

        https://bugs.webkit.org/show_bug.cgi?id=24356

        Fix WebKit style for allowUniversalAccessFromFileURLs.

        * WebView/WebPreferenceKeysPrivate.h:
        * WebView/WebPreferences.mm:
        (+[WebPreferences initialize]):
        (-[WebPreferences allowUniversalAccessFromFileURLs]):
        (-[WebPreferences setAllowUniversalAccessFromFileURLs:]):
        * WebView/WebPreferencesPrivate.h:
        * WebView/WebView.mm:
        (-[WebView _preferencesChangedNotification:]):

WebKit/qt:

2009-03-04  Adam Barth  <abath@webkit.org>

        Reviewed by Alexey Proskuryakov.

        https://bugs.webkit.org/show_bug.cgi?id=24356

        Fix WebKit style for allowUniversalAccessFromFileURLs.

        * Api/qwebsettings.cpp:
        (QWebSettingsPrivate::apply):

WebKit/win:

2009-03-04  Adam Barth  <abath@webkit.org>

        Reviewed by Alexey Proskuryakov.

        https://bugs.webkit.org/show_bug.cgi?id=24356

        Fix WebKit style for allowUniversalAccessFromFileURLs.

        * Interfaces/IWebPreferencesPrivate.idl:
        * WebPreferenceKeysPrivate.h:
        * WebPreferences.cpp:
        (WebPreferences::initializeDefaultSettings):
        (WebPreferences::allowUniversalAccessFromFileURLs):
        (WebPreferences::setAllowUniversalAccessFromFileURLs):
        * WebPreferences.h:
        * WebView.cpp:
        (WebView::notifyPreferencesChanged):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@41426 268f45cc-cd09-0410-ab3c-d52691b4dbfc

18 files changed:
WebCore/ChangeLog
WebCore/WebCore.base.exp
WebCore/dom/Document.cpp
WebCore/page/Settings.cpp
WebCore/page/Settings.h
WebKit/mac/ChangeLog
WebKit/mac/WebView/WebPreferenceKeysPrivate.h
WebKit/mac/WebView/WebPreferences.mm
WebKit/mac/WebView/WebPreferencesPrivate.h
WebKit/mac/WebView/WebView.mm
WebKit/qt/Api/qwebsettings.cpp
WebKit/qt/ChangeLog
WebKit/win/ChangeLog
WebKit/win/Interfaces/IWebPreferencesPrivate.idl
WebKit/win/WebPreferenceKeysPrivate.h
WebKit/win/WebPreferences.cpp
WebKit/win/WebPreferences.h
WebKit/win/WebView.cpp

index b10388261663e0c42688cf14c3be82e8d2a51812..98cc1d240550552a9080e3821c3b0b2aa63da595 100644 (file)
@@ -1,3 +1,20 @@
+2009-03-04  Adam Barth  <abath@webkit.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        https://bugs.webkit.org/show_bug.cgi?id=24356
+
+        Fix WebKit style for allowUniversalAccessFromFileURLs.
+
+        * WebCore.base.exp:
+        * dom/Document.cpp:
+        (WebCore::Document::initSecurityContext):
+        * page/Settings.cpp:
+        (WebCore::Settings::Settings):
+        (WebCore::Settings::setAllowUniversalAccessFromFileURLs):
+        * page/Settings.h:
+        (WebCore::Settings::allowUniversalAccessFromFileURLs):
+
 2009-03-04  Brady Eidson  <beidson@apple.com>
 
         Reviewed by Darin Adler
index 010420a07128ab7fc9c126167a4faa5b508bdf43..c6c05670d1ff55d73e41a36358404a20be490afb 100644 (file)
@@ -618,7 +618,7 @@ __ZN7WebCore8Settings31setShrinksStandaloneImagesToFitEb
 __ZN7WebCore8Settings32setNeedsAdobeFrameReloadingQuirkEb
 __ZN7WebCore8Settings33setEnforceCSSMIMETypeInStrictModeEb
 __ZN7WebCore8Settings35disableRangeMutationForOldAppleMailEb
-__ZN7WebCore8Settings35setAllowUniversalAccessFromFileUrlsEb
+__ZN7WebCore8Settings35setAllowUniversalAccessFromFileURLsEb
 __ZN7WebCore8Settings36setOfflineWebApplicationCacheEnabledEb
 __ZN7WebCore8Settings40setJavaScriptCanOpenWindowsAutomaticallyEb
 __ZN7WebCore8Settings40setTextDirectionSubmenuInclusionBehaviorENS_37TextDirectionSubmenuInclusionBehaviorE
index bda1a74cb2ecd2458c8dc5d0a5bd18cdfe3b4e4a..1577b2072054912d5ac3406612a4a58b7321ea15 100644 (file)
@@ -4155,7 +4155,7 @@ void Document::initSecurityContext()
           // sites.
           securityOrigin()->grantUniversalAccess();
 
-        } else if(settings->allowUniversalAccessFromFileUrls() && securityOrigin()->isLocal()) {
+        } else if (settings->allowUniversalAccessFromFileURLs() && securityOrigin()->isLocal()) {
           // Some clients want file:// URLs to have universal access, but that
           // setting is dangerous for other clients.
           securityOrigin()->grantUniversalAccess();
index 38e753b708da513fb031a7211a67d61f824d165f..a000cbebc4743b268d1edd721b7dde5df2a0e78f 100644 (file)
@@ -61,7 +61,7 @@ Settings::Settings(Page* page)
     , m_localStorageEnabled(false)
     , m_isJavaScriptEnabled(false)
     , m_isWebSecurityEnabled(true)
-    , m_allowUniversalAccessFromFileUrls(true)
+    , m_allowUniversalAccessFromFileURLs(true)
     , m_javaScriptCanOpenWindowsAutomatically(false)
     , m_shouldPrintBackgrounds(false)
     , m_textAreasAreResizable(false)
@@ -199,9 +199,9 @@ void Settings::setWebSecurityEnabled(bool isWebSecurityEnabled)
     m_isWebSecurityEnabled = isWebSecurityEnabled;
 }
 
-void Settings::setAllowUniversalAccessFromFileUrls(bool allowUniversalAccessFromFileUrls)
+void Settings::setAllowUniversalAccessFromFileURLs(bool allowUniversalAccessFromFileURLs)
 {
-    m_allowUniversalAccessFromFileUrls = allowUniversalAccessFromFileUrls;
+    m_allowUniversalAccessFromFileURLs = allowUniversalAccessFromFileURLs;
 }
 
 void Settings::setJavaEnabled(bool isJavaEnabled)
index c81f5e01bd30cf1ed368f24706ccbc8b463df1d9..0a059cb16ccd9fa503e00d295d4aa624b26d3867 100644 (file)
@@ -92,8 +92,8 @@ namespace WebCore {
         void setWebSecurityEnabled(bool);
         bool isWebSecurityEnabled() const { return m_isWebSecurityEnabled; }
 
-        void setAllowUniversalAccessFromFileUrls(bool);
-        bool allowUniversalAccessFromFileUrls() const { return m_allowUniversalAccessFromFileUrls; }
+        void setAllowUniversalAccessFromFileURLs(bool);
+        bool allowUniversalAccessFromFileURLs() const { return m_allowUniversalAccessFromFileURLs; }
 
         void setJavaScriptCanOpenWindowsAutomatically(bool);
         bool JavaScriptCanOpenWindowsAutomatically() const { return m_javaScriptCanOpenWindowsAutomatically; }
@@ -235,7 +235,7 @@ namespace WebCore {
         bool m_localStorageEnabled : 1;
         bool m_isJavaScriptEnabled : 1;
         bool m_isWebSecurityEnabled : 1;
-        bool m_allowUniversalAccessFromFileUrls: 1;
+        bool m_allowUniversalAccessFromFileURLs: 1;
         bool m_javaScriptCanOpenWindowsAutomatically : 1;
         bool m_shouldPrintBackgrounds : 1;
         bool m_textAreasAreResizable : 1;
index 2d90b815bc906afcbc9df20643834233338452c5..dd84d784b52c66c2af1945602609fe8138bb64b8 100644 (file)
@@ -1,3 +1,20 @@
+2009-03-04  Adam Barth  <abath@webkit.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        https://bugs.webkit.org/show_bug.cgi?id=24356
+
+        Fix WebKit style for allowUniversalAccessFromFileURLs.
+
+        * WebView/WebPreferenceKeysPrivate.h:
+        * WebView/WebPreferences.mm:
+        (+[WebPreferences initialize]):
+        (-[WebPreferences allowUniversalAccessFromFileURLs]):
+        (-[WebPreferences setAllowUniversalAccessFromFileURLs:]):
+        * WebView/WebPreferencesPrivate.h:
+        * WebView/WebView.mm:
+        (-[WebView _preferencesChangedNotification:]):
+
 2009-03-03  David Kilzer  <ddkilzer@apple.com>
 
         <rdar://problem/6581203> WebCore and WebKit should install the same set of headers during installhdrs phase as build phase
index a5c0658587ef260eb448ea9478af5d87480d997c..cb776095d5a8058959285c4e8ede6bc3a6e8197d 100644 (file)
@@ -49,7 +49,7 @@
 #define WebKitJavaEnabledPreferenceKey @"WebKitJavaEnabled"
 #define WebKitJavaScriptEnabledPreferenceKey @"WebKitJavaScriptEnabled"
 #define WebKitWebSecurityEnabledPreferenceKey @"WebKitWebSecurityEnabled"
-#define WebKitAllowUniversalAccessFromFileUrlsPreferenceKey @"WebKitAllowUniversalAccessFromFileUrls"
+#define WebKitAllowUniversalAccessFromFileURLsPreferenceKey @"WebKitAllowUniversalAccessFromFileURLs"
 #define WebKitJavaScriptCanOpenWindowsAutomaticallyPreferenceKey @"WebKitJavaScriptCanOpenWindowsAutomatically"
 #define WebKitPluginsEnabledPreferenceKey @"WebKitPluginsEnabled"
 #define WebKitDatabasesEnabledPreferenceKey @"WebKitDatabasesEnabledPreferenceKey"
index 4002e6c4a75c20abe68981ba85c3acced73cfc30..25b64605a393ca9719953fb54b1dd80a57fca9ab 100644 (file)
@@ -314,7 +314,7 @@ static WebCacheModel cacheModelForMainBundle(void)
         [NSNumber numberWithBool:YES],  WebKitJavaEnabledPreferenceKey,
         [NSNumber numberWithBool:YES],  WebKitJavaScriptEnabledPreferenceKey,
         [NSNumber numberWithBool:YES],  WebKitWebSecurityEnabledPreferenceKey,
-        [NSNumber numberWithBool:YES],  WebKitAllowUniversalAccessFromFileUrlsPreferenceKey,
+        [NSNumber numberWithBool:YES],  WebKitAllowUniversalAccessFromFileURLsPreferenceKey,
         [NSNumber numberWithBool:YES],  WebKitJavaScriptCanOpenWindowsAutomaticallyPreferenceKey,
         [NSNumber numberWithBool:YES],  WebKitPluginsEnabledPreferenceKey,
         [NSNumber numberWithBool:YES],  WebKitDatabasesEnabledPreferenceKey,
@@ -874,14 +874,14 @@ static WebCacheModel cacheModelForMainBundle(void)
     [self _setBoolValue: flag forKey: WebKitWebSecurityEnabledPreferenceKey];
 }
 
-- (BOOL)allowUniversalAccessFromFileUrls
+- (BOOL)allowUniversalAccessFromFileURLs
 {
-    return [self _boolValueForKey: WebKitAllowUniversalAccessFromFileUrlsPreferenceKey];
+    return [self _boolValueForKey: WebKitAllowUniversalAccessFromFileURLsPreferenceKey];
 }
 
-- (void)setAllowUniversalAccessFromFileUrls:(BOOL)flag
+- (void)setAllowUniversalAccessFromFileURLs:(BOOL)flag
 {
-    [self _setBoolValue: flag forKey: WebKitAllowUniversalAccessFromFileUrlsPreferenceKey];
+    [self _setBoolValue: flag forKey: WebKitAllowUniversalAccessFromFileURLsPreferenceKey];
 }
 
 - (NSTimeInterval)_backForwardCacheExpirationInterval
index a539d892296a785fb7c7f847fdd6a68fd24bc474..e1d2a139ae2ca5e8b888267efacc33365d96e50f 100644 (file)
@@ -92,8 +92,8 @@ extern NSString *WebPreferencesRemovedNotification;
 - (BOOL)isWebSecurityEnabled;
 - (void)setWebSecurityEnabled:(BOOL)flag;
 
-- (BOOL)allowUniversalAccessFromFileUrls;
-- (void)setAllowUniversalAccessFromFileUrls:(BOOL)flag;
+- (BOOL)allowUniversalAccessFromFileURLs;
+- (void)setAllowUniversalAccessFromFileURLs:(BOOL)flag;
 
 - (BOOL)zoomsTextOnly;
 - (void)setZoomsTextOnly:(BOOL)zoomsTextOnly;
index 76dad29f6d12d999fb067ed03aeaf23a6e79292d..d30488e5d042157cc2c464d604c78d210252540f 100644 (file)
@@ -1317,7 +1317,7 @@ static void WebKitInitializeApplicationCachePathIfNecessary()
     settings->setJavaEnabled([preferences isJavaEnabled]);
     settings->setJavaScriptEnabled([preferences isJavaScriptEnabled]);
     settings->setWebSecurityEnabled([preferences isWebSecurityEnabled]);
-    settings->setAllowUniversalAccessFromFileUrls([preferences allowUniversalAccessFromFileUrls]);
+    settings->setAllowUniversalAccessFromFileURLs([preferences allowUniversalAccessFromFileURLs]);
     settings->setJavaScriptCanOpenWindowsAutomatically([preferences javaScriptCanOpenWindowsAutomatically]);
     settings->setMinimumFontSize([preferences minimumFontSize]);
     settings->setMinimumLogicalFontSize([preferences minimumLogicalFontSize]);
index 9ae3d36f75b8337b784f7be798f3697ad258b36e..4e64ec91ad5bd800682e6b9d604a19086986d1d6 100644 (file)
@@ -186,7 +186,7 @@ void QWebSettingsPrivate::apply()
 
         value = attributes.value(QWebSettings::AllowUniversalAccessFromFileUrls,
                                       global->attributes.value(QWebSettings::AllowUniversalAccessFromFileUrls));
-        settings->setAllowUniversalAccessFromFileUrls(value);
+        settings->setAllowUniversalAccessFromFileURLs(value);
     } else {
         QList<QWebSettingsPrivate *> settings = *::allSettings();
         for (int i = 0; i < settings.count(); ++i)
@@ -316,7 +316,7 @@ QWebSettings *QWebSettings::globalSettings()
     \value LocalStorageDatabaseEnabled Specifies whether support for the HTML 5
         local storage feature is enabled or not.
     \value AllowUniversalAccessFromFileUrls Specifies whether documents from file
-        URLs should be granted universal access (e.g., to HTTP and HTTPS documents).
+        Urls should be granted universal access (e.g., to HTTP and HTTPS documents).
 */
 
 /*!
index ba363d216ccfdb1734e269a1396475497715aa5c..7cd48203b6ace77ddc39bd2805ffee66836eada8 100644 (file)
@@ -1,3 +1,14 @@
+2009-03-04  Adam Barth  <abath@webkit.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        https://bugs.webkit.org/show_bug.cgi?id=24356
+
+        Fix WebKit style for allowUniversalAccessFromFileURLs.
+
+        * Api/qwebsettings.cpp:
+        (QWebSettingsPrivate::apply):
+
 2009-03-03  Adam Barth  <abarth@webkit.org>
 
         Reviewed by Alexey Proskuryakov.
index a5a9cc5812e369c01b25fad4ad9e69b5fda23735..9623f0f31f4b4c2adddd0220e5027d2929d4d9c5 100644 (file)
@@ -1,3 +1,21 @@
+2009-03-04  Adam Barth  <abath@webkit.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        https://bugs.webkit.org/show_bug.cgi?id=24356
+
+        Fix WebKit style for allowUniversalAccessFromFileURLs.
+
+        * Interfaces/IWebPreferencesPrivate.idl:
+        * WebPreferenceKeysPrivate.h:
+        * WebPreferences.cpp:
+        (WebPreferences::initializeDefaultSettings):
+        (WebPreferences::allowUniversalAccessFromFileURLs):
+        (WebPreferences::setAllowUniversalAccessFromFileURLs):
+        * WebPreferences.h:
+        * WebView.cpp:
+        (WebView::notifyPreferencesChanged):
+
 2009-02-27  Adam Barth  <abarth@webkit.org>
 
         Reviewed by Eric Seidel.
index 4608fb5b0a0e31b50f4f5cc6ecf738ca2af5cb81..b9e05ece7c09bb4ffcd0f0266a1dca45d924e433 100644 (file)
@@ -73,6 +73,6 @@ interface IWebPreferencesPrivate : IUnknown
     HRESULT isWebSecurityEnabled([out, retval] BOOL* enabled);
     HRESULT setWebSecurityEnabled([in] BOOL enabled);
 
-    HRESULT allowUniversalAccessFromFileUrls([out, retval] BOOL *allowAccess);
-    HRESULT setAllowUniversalAccessFromFileUrls([in] BOOL allowAccess);
+    HRESULT allowUniversalAccessFromFileURLs([out, retval] BOOL *allowAccess);
+    HRESULT setAllowUniversalAccessFromFileURLs([in] BOOL allowAccess);
 }
index f947f7952ee4dddb5e6eaa7f63df7b6bc7fc7638..8426271feb9e008001fea9d27c2c83b461f23e78 100644 (file)
@@ -48,7 +48,7 @@
 #define WebKitJavaEnabledPreferenceKey "WebKitJavaEnabled"
 #define WebKitJavaScriptEnabledPreferenceKey "WebKitJavaScriptEnabled"
 #define WebKitWebSecurityEnabledPreferenceKey "WebKitWebSecurityEnabled"
-#define WebKitAllowUniversalAccessFromFileUrlsPreferenceKey "WebKitAllowUniversalAccessFromFileUrls"
+#define WebKitAllowUniversalAccessFromFileURLsPreferenceKey "WebKitAllowUniversalAccessFromFileURLs"
 #define WebKitJavaScriptCanOpenWindowsAutomaticallyPreferenceKey "WebKitJavaScriptCanOpenWindowsAutomatically"
 #define WebKitPluginsEnabledPreferenceKey "WebKitPluginsEnabled"
 #define WebKitDatabasesEnabledPreferenceKey "WebKitDatabasesEnabled"
index 8b3ae5d19dc0ad654bc3f70f097ed24e3d805eec..ac773765f66f366986a3f47f82da8e7882a8098e 100644 (file)
@@ -204,7 +204,7 @@ void WebPreferences::initializeDefaultSettings()
     CFDictionaryAddValue(defaults, CFSTR(WebKitJavaEnabledPreferenceKey), kCFBooleanTrue);
     CFDictionaryAddValue(defaults, CFSTR(WebKitJavaScriptEnabledPreferenceKey), kCFBooleanTrue);
     CFDictionaryAddValue(defaults, CFSTR(WebKitWebSecurityEnabledPreferenceKey), kCFBooleanTrue);
-    CFDictionaryAddValue(defaults, CFSTR(WebKitAllowUniversalAccessFromFileUrlsPreferenceKey), kCFBooleanTrue);
+    CFDictionaryAddValue(defaults, CFSTR(WebKitAllowUniversalAccessFromFileURLsPreferenceKey), kCFBooleanTrue);
     CFDictionaryAddValue(defaults, CFSTR(WebKitJavaScriptCanOpenWindowsAutomaticallyPreferenceKey), kCFBooleanTrue);
     CFDictionaryAddValue(defaults, CFSTR(WebKitPluginsEnabledPreferenceKey), kCFBooleanTrue);
     CFDictionaryAddValue(defaults, CFSTR(WebKitDatabasesEnabledPreferenceKey), kCFBooleanTrue);
@@ -767,17 +767,17 @@ HRESULT STDMETHODCALLTYPE WebPreferences::setWebSecurityEnabled(
     return S_OK;
 }
 
-HRESULT STDMETHODCALLTYPE WebPreferences::allowUniversalAccessFromFileUrls(
+HRESULT STDMETHODCALLTYPE WebPreferences::allowUniversalAccessFromFileURLs(
     /* [retval][out] */ BOOL* allowAccess)
 {
-    *allowAccess = boolValueForKey(CFSTR(WebKitAllowUniversalAccessFromFileUrlsPreferenceKey));
+    *allowAccess = boolValueForKey(CFSTR(WebKitAllowUniversalAccessFromFileURLsPreferenceKey));
     return S_OK;
 }
 
-HRESULT STDMETHODCALLTYPE WebPreferences::setAllowUniversalAccessFromFileUrls(
+HRESULT STDMETHODCALLTYPE WebPreferences::setAllowUniversalAccessFromFileURLs(
     /* [in] */ BOOL allowAccess)
 {
-    setBoolValue(CFSTR(WebKitAllowUniversalAccessFromFileUrlsPreferenceKey), allowAccess);
+    setBoolValue(CFSTR(WebKitAllowUniversalAccessFromFileURLsPreferenceKey), allowAccess);
     return S_OK;
 }
 
index ef7087c4f314a532ec4802e3dfbf98f828eff4e5..b6bcf6dd1b480cafcdf8bfe1b6e8be7fe992fe4f 100644 (file)
@@ -350,10 +350,10 @@ public:
     virtual HRESULT STDMETHODCALLTYPE setWebSecurityEnabled(
     /* [in] */ BOOL enabled);
 
-    virtual HRESULT STDMETHODCALLTYPE allowUniversalAccessFromFileUrls(
+    virtual HRESULT STDMETHODCALLTYPE allowUniversalAccessFromFileURLs(
     /* [retval][out] */ BOOL* allowAccess);
 
-    virtual HRESULT STDMETHODCALLTYPE setAllowUniversalAccessFromFileUrls(
+    virtual HRESULT STDMETHODCALLTYPE setAllowUniversalAccessFromFileURLs(
     /* [in] */ BOOL allowAccess);
 
     // WebPreferences
index 01c030ecc9a748e335d66518709d833d0e099bdf..474fe7d65642c87618677bf2489ba639914fda19 100644 (file)
@@ -4211,10 +4211,10 @@ HRESULT WebView::notifyPreferencesChanged(IWebNotification* notification)
         return hr;
     settings->setWebSecurityEnabled(!!enabled);
 
-    hr = prefsPrivate->allowUniversalAccessFromFileUrls(&enabled);
+    hr = prefsPrivate->allowUniversalAccessFromFileURLs(&enabled);
     if (FAILED(hr))
         return hr;
-    settings->setAllowUniversalAccessFromFileUrls(!!enabled);
+    settings->setAllowUniversalAccessFromFileURLs(!!enabled);
 
 #if USE(SAFARI_THEME)
     hr = prefsPrivate->shouldPaintNativeControls(&enabled);