Diff
Modified: branches/safari-601.1-branch/LayoutTests/ChangeLog (189099 => 189100)
--- branches/safari-601.1-branch/LayoutTests/ChangeLog 2015-08-28 16:40:46 UTC (rev 189099)
+++ branches/safari-601.1-branch/LayoutTests/ChangeLog 2015-08-28 16:45:04 UTC (rev 189100)
@@ -1,3 +1,7 @@
+2015-08-28 Andy Estes <aes...@apple.com>
+
+ Reverted r189001.
+
2015-08-26 Andy Estes <aes...@apple.com>
Merge r188988.
Deleted: branches/safari-601.1-branch/LayoutTests/http/tests/contentfiltering/load-substitute-data-from-appcache-expected.txt (189099 => 189100)
--- branches/safari-601.1-branch/LayoutTests/http/tests/contentfiltering/load-substitute-data-from-appcache-expected.txt 2015-08-28 16:40:46 UTC (rev 189099)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/contentfiltering/load-substitute-data-from-appcache-expected.txt 2015-08-28 16:45:04 UTC (rev 189100)
@@ -1,3 +0,0 @@
-This is a regression test for webkit.org/b/147651. The test passes if it does not crash.
-
-
Deleted: branches/safari-601.1-branch/LayoutTests/http/tests/contentfiltering/load-substitute-data-from-appcache.html (189099 => 189100)
--- branches/safari-601.1-branch/LayoutTests/http/tests/contentfiltering/load-substitute-data-from-appcache.html 2015-08-28 16:40:46 UTC (rev 189099)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/contentfiltering/load-substitute-data-from-appcache.html 2015-08-28 16:45:04 UTC (rev 189100)
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<script>
-if (window.internals) {
- var settings = window.internals.mockContentFilterSettings;
- settings.enabled = true;
- settings.decisionPoint = settings.DECISION_POINT_AFTER_ADD_DATA;
- settings.decision = settings.DECISION_ALLOW;
-}
-
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
- testRunner.setShouldDecideNavigationPolicyAfterDelay(true);
-}
-
-window.addEventListener("message", function() {
- frames[0].location = "/resources/redirect.php?url=""
-});
-</script>
-<body>
-<p>This is a regression test for <a href="" The test passes if it does not crash.</p>
-<iframe src=""
-</body>
-</html>
Deleted: branches/safari-601.1-branch/LayoutTests/http/tests/contentfiltering/resources/appcache.html (189099 => 189100)
--- branches/safari-601.1-branch/LayoutTests/http/tests/contentfiltering/resources/appcache.html 2015-08-28 16:40:46 UTC (rev 189099)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/contentfiltering/resources/appcache.html 2015-08-28 16:45:04 UTC (rev 189100)
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html manifest="appcache.manifest">
-<script>
-applicationCache._onnoupdate_ = function() {
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-applicationCache._oncached_ = function() {
- parent.postMessage("cached", "*");
-}
-</script>
-</html>
Deleted: branches/safari-601.1-branch/LayoutTests/http/tests/contentfiltering/resources/appcache.manifest (189099 => 189100)
--- branches/safari-601.1-branch/LayoutTests/http/tests/contentfiltering/resources/appcache.manifest 2015-08-28 16:40:46 UTC (rev 189099)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/contentfiltering/resources/appcache.manifest 2015-08-28 16:45:04 UTC (rev 189100)
@@ -1 +0,0 @@
-CACHE MANIFEST
Modified: branches/safari-601.1-branch/LayoutTests/platform/mac-wk1/TestExpectations (189099 => 189100)
--- branches/safari-601.1-branch/LayoutTests/platform/mac-wk1/TestExpectations 2015-08-28 16:40:46 UTC (rev 189099)
+++ branches/safari-601.1-branch/LayoutTests/platform/mac-wk1/TestExpectations 2015-08-28 16:45:04 UTC (rev 189100)
@@ -126,6 +126,3 @@
### END OF (2) Failures without bug reports
########################################
-
-# This test is WebKit2-only
-http/tests/contentfiltering/load-substitute-data-from-appcache.html
Modified: branches/safari-601.1-branch/Tools/ChangeLog (189099 => 189100)
--- branches/safari-601.1-branch/Tools/ChangeLog 2015-08-28 16:40:46 UTC (rev 189099)
+++ branches/safari-601.1-branch/Tools/ChangeLog 2015-08-28 16:45:04 UTC (rev 189100)
@@ -1,3 +1,7 @@
+2015-08-28 Andy Estes <aes...@apple.com>
+
+ Reverted r189001.
+
2015-08-26 Andy Estes <aes...@apple.com>
Merge r188988.
Modified: branches/safari-601.1-branch/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl (189099 => 189100)
--- branches/safari-601.1-branch/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2015-08-28 16:40:46 UTC (rev 189099)
+++ branches/safari-601.1-branch/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2015-08-28 16:45:04 UTC (rev 189100)
@@ -75,7 +75,6 @@
void setCacheModel(int model);
void setAsynchronousSpellCheckingEnabled(boolean value);
void setPrinting();
- void setShouldDecideNavigationPolicyAfterDelay(boolean value);
// Special DOM functions.
void clearBackForwardList();
Modified: branches/safari-601.1-branch/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (189099 => 189100)
--- branches/safari-601.1-branch/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2015-08-28 16:40:46 UTC (rev 189099)
+++ branches/safari-601.1-branch/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2015-08-28 16:45:04 UTC (rev 189100)
@@ -1286,9 +1286,6 @@
injectedBundle.outputText(stringBuilder.toString());
}
- if (injectedBundle.testRunner()->shouldDecideNavigationPolicyAfterDelay())
- return WKBundlePagePolicyActionPassThrough;
-
if (!injectedBundle.testRunner()->isPolicyDelegateEnabled())
return WKBundlePagePolicyActionUse;
Modified: branches/safari-601.1-branch/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (189099 => 189100)
--- branches/safari-601.1-branch/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2015-08-28 16:40:46 UTC (rev 189099)
+++ branches/safari-601.1-branch/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2015-08-28 16:45:04 UTC (rev 189100)
@@ -851,12 +851,4 @@
return JSC::setNeverInline(context, theFunction);
}
-void TestRunner::setShouldDecideNavigationPolicyAfterDelay(bool value)
-{
- m_shouldDecideNavigationPolicyAfterDelay = value;
- WKRetainPtr<WKStringRef> messageName(AdoptWK, WKStringCreateWithUTF8CString("SetShouldDecideNavigationPolicyAfterDelay"));
- WKRetainPtr<WKBooleanRef> messageBody(AdoptWK, WKBooleanCreate(value));
- WKBundlePagePostMessage(InjectedBundle::singleton().page()->page(), messageName.get(), messageBody.get());
-}
-
} // namespace WTR
Modified: branches/safari-601.1-branch/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (189099 => 189100)
--- branches/safari-601.1-branch/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2015-08-28 16:40:46 UTC (rev 189099)
+++ branches/safari-601.1-branch/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2015-08-28 16:45:04 UTC (rev 189100)
@@ -281,9 +281,6 @@
JSValueRef numberOfDFGCompiles(JSValueRef theFunction);
JSValueRef neverInlineFunction(JSValueRef theFunction);
- bool shouldDecideNavigationPolicyAfterDelay() const { return m_shouldDecideNavigationPolicyAfterDelay; }
- void setShouldDecideNavigationPolicyAfterDelay(bool);
-
private:
TestRunner();
@@ -334,8 +331,6 @@
double m_databaseDefaultQuota;
double m_databaseMaxQuota;
- bool m_shouldDecideNavigationPolicyAfterDelay { false };
-
bool m_userStyleSheetEnabled;
WKRetainPtr<WKStringRef> m_userStyleSheetLocation;
Modified: branches/safari-601.1-branch/Tools/WebKitTestRunner/TestController.cpp (189099 => 189100)
--- branches/safari-601.1-branch/Tools/WebKitTestRunner/TestController.cpp 2015-08-28 16:40:46 UTC (rev 189099)
+++ branches/safari-601.1-branch/Tools/WebKitTestRunner/TestController.cpp 2015-08-28 16:45:04 UTC (rev 189100)
@@ -55,7 +55,6 @@
#include <ctype.h>
#include <stdlib.h>
#include <string>
-#include <wtf/RunLoop.h>
#include <wtf/text/CString.h>
#if PLATFORM(COCOA)
@@ -312,8 +311,6 @@
void TestController::initialize(int argc, const char* argv[])
{
- RunLoop::initializeMainRunLoop();
-
platformInitialize();
Options options;
@@ -720,8 +717,6 @@
// Reset main page back to about:blank
m_doneResetting = false;
- m_shouldDecideNavigationPolicyAfterDelay = false;
-
WKPageLoadURL(m_mainWebView->page(), blankURL());
runUntil(m_doneResetting, shortTimeout);
return m_doneResetting;
@@ -1553,19 +1548,12 @@
void TestController::decidePolicyForNavigationAction(WKFramePolicyListenerRef listener)
{
- WKRetainPtr<WKFramePolicyListenerRef> retainedListener { listener };
- const bool shouldIgnore { m_policyDelegateEnabled && !m_policyDelegatePermissive };
- std::function<void()> decisionFunction = [shouldIgnore, retainedListener]() {
- if (shouldIgnore)
- WKFramePolicyListenerIgnore(retainedListener.get());
- else
- WKFramePolicyListenerUse(retainedListener.get());
- };
+ if (m_policyDelegateEnabled && !m_policyDelegatePermissive) {
+ WKFramePolicyListenerIgnore(listener);
+ return;
+ }
- if (m_shouldDecideNavigationPolicyAfterDelay)
- RunLoop::main().dispatch(decisionFunction);
- else
- decisionFunction();
+ WKFramePolicyListenerUse(listener);
}
void TestController::decidePolicyForNavigationResponse(WKPageRef, WKNavigationResponseRef navigationResponse, WKFramePolicyListenerRef listener, WKTypeRef, const void* clientInfo)
Modified: branches/safari-601.1-branch/Tools/WebKitTestRunner/TestController.h (189099 => 189100)
--- branches/safari-601.1-branch/Tools/WebKitTestRunner/TestController.h 2015-08-28 16:40:46 UTC (rev 189099)
+++ branches/safari-601.1-branch/Tools/WebKitTestRunner/TestController.h 2015-08-28 16:45:04 UTC (rev 189100)
@@ -121,8 +121,6 @@
bool isCurrentInvocation(TestInvocation* invocation) const { return invocation == m_currentInvocation.get(); }
- void setShouldDecideNavigationPolicyAfterDelay(bool value) { m_shouldDecideNavigationPolicyAfterDelay = value; }
-
private:
void initialize(int argc, const char* argv[]);
void createWebViewWithOptions(WKDictionaryRef);
@@ -275,8 +273,6 @@
bool m_shouldLogHistoryClientCallbacks;
bool m_shouldShowWebView;
- bool m_shouldDecideNavigationPolicyAfterDelay { false };
-
std::unique_ptr<EventSenderProxy> m_eventSenderProxy;
WorkQueueManager m_workQueueManager;
Modified: branches/safari-601.1-branch/Tools/WebKitTestRunner/TestInvocation.cpp (189099 => 189100)
--- branches/safari-601.1-branch/Tools/WebKitTestRunner/TestInvocation.cpp 2015-08-28 16:40:46 UTC (rev 189099)
+++ branches/safari-601.1-branch/Tools/WebKitTestRunner/TestInvocation.cpp 2015-08-28 16:45:04 UTC (rev 189100)
@@ -630,13 +630,6 @@
return;
}
- if (WKStringIsEqualToUTF8CString(messageName, "SetShouldDecideNavigationPolicyAfterDelay")) {
- ASSERT(WKGetTypeID(messageBody) == WKBooleanGetTypeID());
- WKBooleanRef value = static_cast<WKBooleanRef>(messageBody);
- TestController::singleton().setShouldDecideNavigationPolicyAfterDelay(WKBooleanGetValue(value));
- return;
- }
-
ASSERT_NOT_REACHED();
}
