Changeset 123316 in webkit
- Timestamp:
- Jul 23, 2012 1:33:26 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r123315 r123316 1 2012-07-23 Christophe Dumez <christophe.dumez@intel.com> 2 3 WebKit2 needs layoutTestController.setAlwaysAcceptCookies 4 https://bugs.webkit.org/show_bug.cgi?id=42778 5 6 Reviewed by Kenneth Rohde Christiansen. 7 8 Add setAlwaysAcceptCookies() method to InjectedBundle 9 so that we can use it in LayoutTestController. 10 The method uses WebCookieManager::setHTTPCookieAcceptPolicy() 11 internally. 12 13 * WebProcess/InjectedBundle/API/c/WKBundle.cpp: 14 (WKBundleSetAlwaysAcceptCookies): 15 * WebProcess/InjectedBundle/API/c/WKBundlePrivate.h: 16 * WebProcess/InjectedBundle/InjectedBundle.cpp: 17 (WebKit::InjectedBundle::setAlwaysAcceptCookies): 18 (WebKit): 19 * WebProcess/InjectedBundle/InjectedBundle.h: 20 (InjectedBundle): 21 1 22 2012-07-23 Thiago Marcos P. Santos <thiago.santos@intel.com> 2 23 -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp
r118937 r123316 92 92 } 93 93 94 void WKBundleSetAlwaysAcceptCookies(WKBundleRef bundleRef, bool accept) 95 { 96 toImpl(bundleRef)->setAlwaysAcceptCookies(accept); 97 } 98 94 99 void WKBundleAddUserScript(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, WKBundleScriptWorldRef scriptWorldRef, WKStringRef sourceRef, WKURLRef urlRef, WKArrayRef whitelistRef, WKArrayRef blacklistRef, WKUserScriptInjectionTime injectionTimeRef, WKUserContentInjectedFrames injectedFramesRef) 95 100 { -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h
r118937 r123316 87 87 WK_EXPORT void WKBundleRemoveOriginAccessWhitelistEntry(WKBundleRef bundle, WKStringRef, WKStringRef, WKStringRef, bool); 88 88 WK_EXPORT void WKBundleResetOriginAccessWhitelists(WKBundleRef bundle); 89 WK_EXPORT void WKBundleSetAlwaysAcceptCookies(WKBundleRef bundle, bool); 89 90 90 91 WK_EXPORT bool WKBundleIsProcessingUserGesture(WKBundleRef bundle); -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp
r123315 r123316 37 37 #include "WebApplicationCacheManager.h" 38 38 #include "WebContextMessageKinds.h" 39 #include "WebCookieManager.h" 39 40 #include "WebCoreArgumentCoders.h" 40 41 #include "WebDatabaseManager.h" … … 115 116 } 116 117 118 void InjectedBundle::setAlwaysAcceptCookies(bool accept) 119 { 120 WebCookieManager::shared().setHTTPCookieAcceptPolicy(accept ? HTTPCookieAcceptPolicyAlways : HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain); 121 } 122 117 123 void InjectedBundle::removeAllVisitedLinks() 118 124 { -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h
r118937 r123316 102 102 // TestRunner only SPI 103 103 void setShouldTrackVisitedLinks(bool); 104 void setAlwaysAcceptCookies(bool); 104 105 void removeAllVisitedLinks(); 105 106 void activateMacFontAscentHack(); -
trunk/Tools/ChangeLog
r123300 r123316 1 2012-07-23 Christophe Dumez <christophe.dumez@intel.com> 2 3 WebKit2 needs layoutTestController.setAlwaysAcceptCookies 4 https://bugs.webkit.org/show_bug.cgi?id=42778 5 6 Reviewed by Kenneth Rohde Christiansen. 7 8 Add support for layoutTestController.setAlwaysAcceptCookies() 9 since it is required by some tests. 10 11 * WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl: 12 * WebKitTestRunner/InjectedBundle/LayoutTestController.cpp: 13 (WTR::LayoutTestController::setAlwaysAcceptCookies): 14 (WTR): 15 * WebKitTestRunner/InjectedBundle/LayoutTestController.h: 16 (LayoutTestController): 17 1 18 2012-07-23 Kent Tamura <tkent@chromium.org> 2 19 -
trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl
r122204 r123316 140 140 void setWindowIsKey(in boolean isKey); 141 141 142 // Cookies testing 143 void setAlwaysAcceptCookies(in boolean accept); 144 142 145 // FIXME: handle non-boolean preferences. 143 146 void overridePreference(in DOMString preference, in boolean value); -
trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp
r122204 r123316 614 614 } 615 615 616 void LayoutTestController::setAlwaysAcceptCookies(bool accept) 617 { 618 WKBundleSetAlwaysAcceptCookies(InjectedBundle::shared().bundle(), accept); 619 } 620 616 621 double LayoutTestController::preciseTime() 617 622 { -
trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h
r122204 r123316 207 207 void overridePreference(JSStringRef preference, bool value); 208 208 209 // Cookies testing 210 void setAlwaysAcceptCookies(bool); 211 209 212 // Custom full screen behavior. 210 213 void setHasCustomFullScreenBehavior(bool value) { m_customFullScreenBehavior = value; }
Note: See TracChangeset
for help on using the changeset viewer.