From 8d473cf9743f1d30a16a27114e93bd5af5648d23 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 18 May 2012 14:03:11 +0200 Subject: Imported WebKit commit 1350e72f7345ced9da2bd9980deeeb5a8d62fab4 (http://svn.webkit.org/repository/webkit/trunk@117578) Weekly snapshot --- Tools/TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionNoCache.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Tools/TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionNoCache.cpp') diff --git a/Tools/TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionNoCache.cpp b/Tools/TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionNoCache.cpp index d59d0d1bb..c19104eb8 100644 --- a/Tools/TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionNoCache.cpp +++ b/Tools/TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionNoCache.cpp @@ -91,20 +91,20 @@ TEST(WebKit2, DOMWindowExtensionNoCache) injectedBundleClient.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle; WKContextSetInjectedBundleClient(context.get(), &injectedBundleClient); - // FIXME 85891: Instead of using unload handlers to prevent use of the page cache, set the - // cache model to kWKCacheModelDocumentView, which sets page cache capacity to 0. + // Disable the page cache. + WKContextSetCacheModel(context.get(), kWKCacheModelDocumentViewer); PlatformWebView webView(context.get(), pageGroup.get()); // Make sure the extensions for each frame are installed in each world. - WKRetainPtr url1(AdoptWK, Util::createURLForResource("simple-iframe-unload", "html")); + WKRetainPtr url1(AdoptWK, Util::createURLForResource("simple-iframe", "html")); WKPageLoadURL(webView.page(), url1.get()); Util::run(&finished); finished = false; // Make sure those first 4 extensions are destroyed, and 2 new ones are installed. - WKRetainPtr url2(AdoptWK, Util::createURLForResource("simple-unload", "html")); + WKRetainPtr url2(AdoptWK, Util::createURLForResource("simple", "html")); WKPageLoadURL(webView.page(), url2.get()); Util::run(&finished); -- cgit v1.2.1