Changeset 84980 in webkit
- Timestamp:
- Apr 26, 2011 4:43:03 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r84970 r84980 1 2011-04-26 Chang Shu <cshu@webkit.org> 2 3 Reviewed by Laszlo Gombos. 4 5 WebKitTestRunner needs layoutTestController.setAllowFileAccessFromFileURLs 6 https://bugs.webkit.org/show_bug.cgi?id=57572 7 8 Remove the unnecessary code that updates preference. 9 10 * Shared/WebPreferencesStore.cpp: 11 (WebKit::WebPreferencesStore::decode): 12 * Shared/WebPreferencesStore.h: 13 * WebProcess/InjectedBundle/API/c/WKBundle.cpp: 14 (WKBundleSetAllowUniversalAccessFromFileURLs): 15 * WebProcess/InjectedBundle/API/c/WKBundlePrivate.h: 16 * WebProcess/InjectedBundle/InjectedBundle.cpp: 17 (WebKit::InjectedBundle::setAllowUniversalAccessFromFileURLs): 18 (WebKit::InjectedBundle::setAllowFileAccessFromFileURLs): 19 * WebProcess/InjectedBundle/InjectedBundle.h: 20 1 21 2011-04-26 Brian Weinstein <bweinstein@apple.com> 2 22 -
trunk/Source/WebKit2/Shared/WebPreferencesStore.cpp
r83766 r84980 51 51 static bool hasXSSAuditorEnabledTestRunnerOverride; 52 52 static bool xssAuditorEnabledTestRunnerOverride; 53 static bool hasAllowUniversalAccessFromFileURLsTestRunnerOverride;54 static bool allowUniversalAccessFromFileURLsTestRunnerOverride;55 static bool hasAllowFileAccessFromFileURLsTestRunnerOverride;56 static bool allowFileAccessFromFileURLsTestRunnerOverride;57 53 58 54 WebPreferencesStore::WebPreferencesStore() … … 73 69 s.m_boolValues.set(WebPreferencesKey::xssAuditorEnabledKey(), xssAuditorEnabledTestRunnerOverride); 74 70 75 if (hasAllowUniversalAccessFromFileURLsTestRunnerOverride)76 s.m_boolValues.set(WebPreferencesKey::allowUniversalAccessFromFileURLsKey(), allowUniversalAccessFromFileURLsTestRunnerOverride);77 78 if (hasAllowFileAccessFromFileURLsTestRunnerOverride)79 s.m_boolValues.set(WebPreferencesKey::allowFileAccessFromFileURLsKey(), allowFileAccessFromFileURLsTestRunnerOverride);80 81 71 return true; 82 72 } … … 86 76 hasXSSAuditorEnabledTestRunnerOverride = true; 87 77 xssAuditorEnabledTestRunnerOverride = enabled; 88 }89 90 void WebPreferencesStore::overrideAllowUniversalAccessFromFileURLsForTestRunner(bool enabled)91 {92 hasAllowUniversalAccessFromFileURLsTestRunnerOverride = true;93 allowUniversalAccessFromFileURLsTestRunnerOverride = enabled;94 }95 96 void WebPreferencesStore::overrideAllowFileAccessFromFileURLsForTestRunner(bool enabled)97 {98 hasAllowFileAccessFromFileURLsTestRunnerOverride = true;99 allowFileAccessFromFileURLsTestRunnerOverride = enabled;100 78 } 101 79 -
trunk/Source/WebKit2/Shared/WebPreferencesStore.h
r84648 r84980 172 172 173 173 static void overrideXSSAuditorEnabledForTestRunner(bool); 174 static void overrideAllowUniversalAccessFromFileURLsForTestRunner(bool);175 static void overrideAllowFileAccessFromFileURLsForTestRunner(bool);176 174 static void removeTestRunnerOverrides(); 177 175 -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp
r84721 r84980 129 129 } 130 130 131 void WKBundle OverrideAllowUniversalAccessFromFileURLsForTestRunner(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, bool enabled)131 void WKBundleSetAllowUniversalAccessFromFileURLs(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, bool enabled) 132 132 { 133 toImpl(bundleRef)-> overrideAllowUniversalAccessFromFileURLsForTestRunner(toImpl(pageGroupRef), enabled);133 toImpl(bundleRef)->setAllowUniversalAccessFromFileURLs(toImpl(pageGroupRef), enabled); 134 134 } 135 135 -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h
r84721 r84980 66 66 // Will make WebProcess ignore this preference until a preferences change notification, only for WebKitTestRunner use. 67 67 WK_EXPORT void WKBundleOverrideXSSAuditorEnabledForTestRunner(WKBundleRef bundle, WKBundlePageGroupRef pageGroup, bool enabled); 68 WK_EXPORT void WKBundle OverrideAllowUniversalAccessFromFileURLsForTestRunner(WKBundleRef bundle, WKBundlePageGroupRef pageGroup, bool enabled);68 WK_EXPORT void WKBundleSetAllowUniversalAccessFromFileURLs(WKBundleRef bundle, WKBundlePageGroupRef pageGroup, bool enabled); 69 69 WK_EXPORT void WKBundleSetAllowFileAccessFromFileURLs(WKBundleRef bundle, WKBundlePageGroupRef pageGroup, bool enabled); 70 70 WK_EXPORT void WKBundleSetFrameFlatteningEnabled(WKBundleRef bundle, WKBundlePageGroupRef pageGroup, bool enabled); -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp
r84721 r84980 114 114 } 115 115 116 void InjectedBundle::overrideAllowUniversalAccessFromFileURLsForTestRunner(WebPageGroupProxy* pageGroup, bool enabled) 117 { 118 // Override the preference for all future pages. 119 WebPreferencesStore::overrideAllowUniversalAccessFromFileURLsForTestRunner(enabled); 120 121 // Change the setting for existing ones. 116 void InjectedBundle::setAllowUniversalAccessFromFileURLs(WebPageGroupProxy* pageGroup, bool enabled) 117 { 122 118 const HashSet<Page*>& pages = PageGroup::pageGroup(pageGroup->identifier())->pages(); 123 119 for (HashSet<Page*>::iterator iter = pages.begin(); iter != pages.end(); ++iter) … … 127 123 void InjectedBundle::setAllowFileAccessFromFileURLs(WebPageGroupProxy* pageGroup, bool enabled) 128 124 { 129 // Override the preference for all future pages.130 WebPreferencesStore::overrideAllowFileAccessFromFileURLsForTestRunner(enabled);131 132 // Change the setting for existing ones.133 125 const HashSet<Page*>& pages = PageGroup::pageGroup(pageGroup->identifier())->pages(); 134 126 for (HashSet<Page*>::iterator iter = pages.begin(); iter != pages.end(); ++iter) -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h
r84721 r84980 92 92 void activateMacFontAscentHack(); 93 93 void overrideXSSAuditorEnabledForTestRunner(WebPageGroupProxy* pageGroup, bool enabled); 94 void overrideAllowUniversalAccessFromFileURLsForTestRunner(WebPageGroupProxy*, bool);94 void setAllowUniversalAccessFromFileURLs(WebPageGroupProxy*, bool); 95 95 void setAllowFileAccessFromFileURLs(WebPageGroupProxy*, bool); 96 96 void setFrameFlatteningEnabled(WebPageGroupProxy*, bool); -
trunk/Tools/ChangeLog
r84975 r84980 1 2011-04-26 Chang Shu <cshu@webkit.org> 2 3 Reviewed by Laszlo Gombos. 4 5 WebKitTestRunner needs layoutTestController.setAllowFileAccessFromFileURLs 6 https://bugs.webkit.org/show_bug.cgi?id=57572 7 8 Remove the unnecessary code that updates preference. 9 10 * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp: 11 (WTR::InjectedBundle::beginTesting): 12 * WebKitTestRunner/InjectedBundle/LayoutTestController.cpp: 13 (WTR::LayoutTestController::setAllowUniversalAccessFromFileURLs): 14 1 15 2011-04-26 Mario Sanchez Prada <msanchez@igalia.com> 2 16 -
trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp
r84534 r84980 178 178 WKBundleSetShouldTrackVisitedLinks(m_bundle, false); 179 179 WKBundleRemoveAllVisitedLinks(m_bundle); 180 WKBundle OverrideAllowUniversalAccessFromFileURLsForTestRunner(m_bundle, m_pageGroup, true);180 WKBundleSetAllowUniversalAccessFromFileURLs(m_bundle, m_pageGroup, true); 181 181 182 182 WKBundleRemoveAllUserContent(m_bundle, m_pageGroup); -
trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp
r84721 r84980 319 319 void LayoutTestController::setAllowUniversalAccessFromFileURLs(bool enabled) 320 320 { 321 WKBundle OverrideAllowUniversalAccessFromFileURLsForTestRunner(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);321 WKBundleSetAllowUniversalAccessFromFileURLs(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled); 322 322 } 323 323
Note: See TracChangeset
for help on using the changeset viewer.