Diff
Modified: trunk/LayoutTests/ChangeLog (135507 => 135508)
--- trunk/LayoutTests/ChangeLog 2012-11-22 13:23:28 UTC (rev 135507)
+++ trunk/LayoutTests/ChangeLog 2012-11-22 13:23:41 UTC (rev 135508)
@@ -1,3 +1,16 @@
+2012-11-22 Christophe Dumez <[email protected]>
+
+ WebKitTestRunner needs layoutTestController.setCacheModel
+ https://bugs.webkit.org/show_bug.cgi?id=42684
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Unskip fast/dom/HTMLScriptElement/nested-execution.html for
+ WK2 now that WebKitTestRunner implements
+ testRunner.setCacheModel.
+
+ * platform/wk2/TestExpectations:
+
2012-11-22 Stephen Chenney <[email protected]>
Fixing some Chromium test expectations.
Modified: trunk/LayoutTests/platform/wk2/TestExpectations (135507 => 135508)
--- trunk/LayoutTests/platform/wk2/TestExpectations 2012-11-22 13:23:28 UTC (rev 135507)
+++ trunk/LayoutTests/platform/wk2/TestExpectations 2012-11-22 13:23:41 UTC (rev 135508)
@@ -295,10 +295,6 @@
svg/custom/manually-parsed-svg-allowed-in-dashboard.html
svg/custom/svg-allowed-in-dashboard-object.html
-# WebKitTestRunner needs layoutTestController.setCacheModel
-# <https://bugs.webkit.org/show_bug.cgi?id=42684>
-fast/dom/HTMLScriptElement/nested-execution.html
-
# WebKitTestRunner needs layoutTestController.setMainFrameIsFirstResponder
# <https://bugs.webkit.org/show_bug.cgi?id=42685>
editing/selection/caret-and-focus-ring.html
Modified: trunk/Source/WebKit2/ChangeLog (135507 => 135508)
--- trunk/Source/WebKit2/ChangeLog 2012-11-22 13:23:28 UTC (rev 135507)
+++ trunk/Source/WebKit2/ChangeLog 2012-11-22 13:23:41 UTC (rev 135508)
@@ -1,3 +1,24 @@
+2012-11-22 Christophe Dumez <[email protected]>
+
+ WebKitTestRunner needs layoutTestController.setCacheModel
+ https://bugs.webkit.org/show_bug.cgi?id=42684
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Add Bundle C API for WebKitTestRunner to set the
+ cache model.
+
+ * WebProcess/InjectedBundle/API/c/WKBundle.cpp:
+ (WKBundleSetCacheModel):
+ * WebProcess/InjectedBundle/API/c/WKBundlePrivate.h:
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ (WebKit::InjectedBundle::setCacheModel):
+ (WebKit):
+ * WebProcess/InjectedBundle/InjectedBundle.h:
+ (InjectedBundle):
+ * WebProcess/WebProcess.h:
+ (WebProcess):
+
2012-11-22 Mikhail Pozdnyakov <[email protected]>
REGRESSION(r135399): Wrong assertion causing an assertion failure: m_rawAttributes.initialScale > 0
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp (135507 => 135508)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp 2012-11-22 13:23:28 UTC (rev 135507)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp 2012-11-22 13:23:41 UTC (rev 135508)
@@ -77,6 +77,11 @@
toImpl(bundleRef)->activateMacFontAscentHack();
}
+void WKBundleSetCacheModel(WKBundleRef bundleRef, uint32_t cacheModel)
+{
+ toImpl(bundleRef)->setCacheModel(cacheModel);
+}
+
void WKBundleGarbageCollectJavaScriptObjects(WKBundleRef bundleRef)
{
toImpl(bundleRef)->garbageCollectJavaScriptObjects();
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h (135507 => 135508)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h 2012-11-22 13:23:28 UTC (rev 135507)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h 2012-11-22 13:23:41 UTC (rev 135508)
@@ -41,6 +41,7 @@
WK_EXPORT void WKBundleSetAlwaysAcceptCookies(WKBundleRef bundle, bool);
WK_EXPORT void WKBundleRemoveAllVisitedLinks(WKBundleRef bundle);
WK_EXPORT void WKBundleActivateMacFontAscentHack(WKBundleRef bundle);
+WK_EXPORT void WKBundleSetCacheModel(WKBundleRef bundle, uint32_t cacheModel);
// Will make WebProcess ignore this preference until a preferences change notification, only for WebKitTestRunner use.
WK_EXPORT void WKBundleOverrideBoolPreferenceForTestRunner(WKBundleRef bundle, WKBundlePageGroupRef pageGroup, WKStringRef preference, bool enabled);
WK_EXPORT void WKBundleSetAllowUniversalAccessFromFileURLs(WKBundleRef bundle, WKBundlePageGroupRef pageGroup, bool enabled);
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (135507 => 135508)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2012-11-22 13:23:28 UTC (rev 135507)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2012-11-22 13:23:41 UTC (rev 135508)
@@ -141,6 +141,11 @@
PageGroup::removeAllVisitedLinks();
}
+void InjectedBundle::setCacheModel(uint32_t cacheModel)
+{
+ WebProcess::shared().setCacheModel(cacheModel);
+}
+
void InjectedBundle::overrideBoolPreferenceForTestRunner(WebPageGroupProxy* pageGroup, const String& preference, bool enabled)
{
const HashSet<Page*>& pages = PageGroup::pageGroup(pageGroup->identifier())->pages();
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h (135507 => 135508)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h 2012-11-22 13:23:28 UTC (rev 135507)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h 2012-11-22 13:23:41 UTC (rev 135508)
@@ -107,6 +107,7 @@
void setShouldTrackVisitedLinks(bool);
void setAlwaysAcceptCookies(bool);
void removeAllVisitedLinks();
+ void setCacheModel(uint32_t);
void activateMacFontAscentHack();
void overrideBoolPreferenceForTestRunner(WebPageGroupProxy*, const String& preference, bool enabled);
void overrideXSSAuditorEnabledForTestRunner(WebPageGroupProxy* pageGroup, bool enabled);
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (135507 => 135508)
--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2012-11-22 13:23:28 UTC (rev 135507)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2012-11-22 13:23:41 UTC (rev 135508)
@@ -208,6 +208,8 @@
WebResourceLoadScheduler& webResourceLoadScheduler() { return m_webResourceLoadScheduler; }
#endif
+ void setCacheModel(uint32_t);
+
private:
WebProcess();
@@ -234,7 +236,6 @@
void visitedLinkStateChanged(const Vector<WebCore::LinkHash>& linkHashes);
void allVisitedLinkStateChanged();
- void setCacheModel(uint32_t);
void platformSetCacheModel(CacheModel);
static void calculateCacheSizes(CacheModel cacheModel, uint64_t memorySize, uint64_t diskFreeSize,
unsigned& cacheTotalCapacity, unsigned& cacheMinDeadCapacity, unsigned& cacheMaxDeadCapacity, double& deadDecodedDataDeletionInterval,
Modified: trunk/Tools/ChangeLog (135507 => 135508)
--- trunk/Tools/ChangeLog 2012-11-22 13:23:28 UTC (rev 135507)
+++ trunk/Tools/ChangeLog 2012-11-22 13:23:41 UTC (rev 135508)
@@ -1,3 +1,21 @@
+2012-11-22 Christophe Dumez <[email protected]>
+
+ WebKitTestRunner needs layoutTestController.setCacheModel
+ https://bugs.webkit.org/show_bug.cgi?id=42684
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Add support for testRunner.setCacheModel to WebKitTestRunner.
+
+ * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
+ * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+ (WTR::InjectedBundle::beginTesting):
+ * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+ (WTR::TestRunner::setCacheModel):
+ (WTR):
+ * WebKitTestRunner/InjectedBundle/TestRunner.h:
+ (TestRunner):
+
2012-11-22 Balazs Kelemen <[email protected]>
[Qt][WTR] TestController::platformRunUntil should not do busy waiting
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl (135507 => 135508)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2012-11-22 13:23:28 UTC (rev 135507)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2012-11-22 13:23:41 UTC (rev 135508)
@@ -72,6 +72,7 @@
void setTabKeyCyclesThroughElements(in boolean enabled);
void setSerializeHTTPLoads();
void dispatchPendingLoadRequests();
+ void setCacheModel(in int model);
// Special DOM functions.
void clearBackForwardList();
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp (135507 => 135508)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2012-11-22 13:23:28 UTC (rev 135507)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2012-11-22 13:23:41 UTC (rev 135508)
@@ -256,6 +256,7 @@
WKBundleSetAlwaysAcceptCookies(m_bundle, false);
WKBundleSetSerialLoadingEnabled(m_bundle, false);
WKBundleSetShadowDOMEnabled(m_bundle, true);
+ WKBundleSetCacheModel(m_bundle, 1 /*CacheModelDocumentBrowser*/);
WKBundleRemoveAllUserContent(m_bundle, m_pageGroup);
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (135507 => 135508)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2012-11-22 13:23:28 UTC (rev 135507)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2012-11-22 13:23:41 UTC (rev 135508)
@@ -755,6 +755,11 @@
WKBundleDispatchPendingLoadRequests(InjectedBundle::shared().bundle());
}
+void TestRunner::setCacheModel(int model)
+{
+ WKBundleSetCacheModel(InjectedBundle::shared().bundle(), model);
+}
+
void TestRunner::grantWebNotificationPermission(JSStringRef origin)
{
WKRetainPtr<WKStringRef> originWK = toWK(origin);
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (135507 => 135508)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2012-11-22 13:23:28 UTC (rev 135507)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2012-11-22 13:23:41 UTC (rev 135508)
@@ -112,6 +112,7 @@
void setTabKeyCyclesThroughElements(bool);
void setSerializeHTTPLoads();
void dispatchPendingLoadRequests();
+ void setCacheModel(int);
// Special DOM functions.
JSValueRef computedStyleIncludingVisitedInfo(JSValueRef element);
