[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 14:53:48 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 3cdd815a91b1c5e87b6f05d34b271b2a92a36b1f
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Oct 23 07:44:19 2010 +0000
2010-10-23 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r70367.
http://trac.webkit.org/changeset/70367
https://bugs.webkit.org/show_bug.cgi?id=48176
It made 8-10 tests crash on Qt bot (Requested by Ossy on
#webkit).
* fast/loader/decide-policy-for-mime-type-async-expected.txt: Removed.
* fast/loader/decide-policy-for-mime-type-async.html: Removed.
* platform/gtk/Skipped:
* platform/mac-wk2/Skipped:
* platform/qt-wk2/Skipped:
* platform/qt/Skipped:
* platform/win/Skipped:
2010-10-23 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r70367.
http://trac.webkit.org/changeset/70367
https://bugs.webkit.org/show_bug.cgi?id=48176
It made 8-10 tests crash on Qt bot (Requested by Ossy on
#webkit).
* loader/MainResourceLoader.cpp:
(WebCore::MainResourceLoader::MainResourceLoader):
(WebCore::MainResourceLoader::continueAfterContentPolicy):
(WebCore::MainResourceLoader::didReceiveResponse):
(WebCore::MainResourceLoader::setDefersLoading):
* loader/MainResourceLoader.h:
2010-10-23 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r70367.
http://trac.webkit.org/changeset/70367
https://bugs.webkit.org/show_bug.cgi?id=48176
It made 8-10 tests crash on Qt bot (Requested by Ossy on
#webkit).
* DumpRenderTree/LayoutTestController.cpp:
(setCustomPolicyDelegateCallback):
* DumpRenderTree/LayoutTestController.h:
* DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
(LayoutTestController::setCustomPolicyDelegate):
* DumpRenderTree/mac/LayoutTestControllerMac.mm:
(LayoutTestController::setCustomPolicyDelegate):
* DumpRenderTree/mac/PolicyDelegate.h:
* DumpRenderTree/mac/PolicyDelegate.mm:
(-[PolicyDelegate webView:decidePolicyForNavigationAction:request:frame:decisionListener:]):
(-[PolicyDelegate setPermissive:]):
(-[PolicyDelegate setControllerToNotifyDone:]):
* DumpRenderTree/win/LayoutTestControllerWin.cpp:
(LayoutTestController::setCustomPolicyDelegate):
* DumpRenderTree/wx/LayoutTestControllerWx.cpp:
(LayoutTestController::setCustomPolicyDelegate):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70385 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0938c19..7925fb8 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,22 @@
2010-10-23 Sheriff Bot <webkit.review.bot at gmail.com>
+ Unreviewed, rolling out r70367.
+ http://trac.webkit.org/changeset/70367
+ https://bugs.webkit.org/show_bug.cgi?id=48176
+
+ It made 8-10 tests crash on Qt bot (Requested by Ossy on
+ #webkit).
+
+ * fast/loader/decide-policy-for-mime-type-async-expected.txt: Removed.
+ * fast/loader/decide-policy-for-mime-type-async.html: Removed.
+ * platform/gtk/Skipped:
+ * platform/mac-wk2/Skipped:
+ * platform/qt-wk2/Skipped:
+ * platform/qt/Skipped:
+ * platform/win/Skipped:
+
+2010-10-23 Sheriff Bot <webkit.review.bot at gmail.com>
+
Unreviewed, rolling out r70381.
http://trac.webkit.org/changeset/70381
https://bugs.webkit.org/show_bug.cgi?id=48175
diff --git a/LayoutTests/fast/loader/decide-policy-for-mime-type-async-expected.txt b/LayoutTests/fast/loader/decide-policy-for-mime-type-async-expected.txt
deleted file mode 100644
index 2d6d3fb..0000000
--- a/LayoutTests/fast/loader/decide-policy-for-mime-type-async-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Policy delegate: attempt to load data:text/html,Hello,%20I%20am%20a%20subframe! with navigation type 'other'
-Test for Using the decidePolicyForMIMEType delegate message in an asynchronous manner does not work. If the test passes, you should see the word "PASSED" below.
-
-PASSED
-
diff --git a/LayoutTests/fast/loader/decide-policy-for-mime-type-async.html b/LayoutTests/fast/loader/decide-policy-for-mime-type-async.html
deleted file mode 100644
index 31118f8..0000000
--- a/LayoutTests/fast/loader/decide-policy-for-mime-type-async.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <script>
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.setCustomPolicyDelegate(true, true, true);
- }
-
- window.onload = function() {
- var result = document.getElementById('result')
- var frame = document.getElementById('frame')
- if (!window.layoutTestController) {
- result.innerText = "This test can only be run in DumpRenderTree.";
- return;
- }
-
- // We shouldn't have any text in the frame since the load was ignored.
- if (!frame.contentDocument.documentElement.innerText)
- result.innerText = "PASSED";
- }
- </script>
-</head>
-<body>
- <p>Test for <a href="http://webkit.org/b/48014">Using the decidePolicyForMIMEType delegate message in an asynchronous manner does not work</a>. If the test passes, you should see the word "PASSED" below.</p>
- <div id=result>FAILED</div>
- <iframe id="frame" src="data:text/html,Hello, I am a subframe!"></iframe>
-</body>
-</html>
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 2712b4c..a1ef0a0 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -1147,7 +1147,6 @@ fast/forms/textfield-onchange-deletion.html
fast/history/history_reload.html
fast/history/window-open.html
fast/html/tab-order.html
-fast/loader/decide-policy-for-mime-type-async.html
fast/loader/main-document-url-for-non-http-loads.html
fast/loader/onload-policy-ignore-for-frame.html
fast/loader/policy-delegate-action-hit-test-zoomed.html
diff --git a/LayoutTests/platform/mac-wk2/Skipped b/LayoutTests/platform/mac-wk2/Skipped
index 26752f7..2226a13 100644
--- a/LayoutTests/platform/mac-wk2/Skipped
+++ b/LayoutTests/platform/mac-wk2/Skipped
@@ -1524,7 +1524,6 @@ fast/dom/Geolocation/timeout-zero.html
# WebKitTestRunner needs layoutTestController.setCustomPolicyDelegate
# <https://bugs.webkit.org/show_bug.cgi?id=42546>
-fast/loader/decide-policy-for-mime-type-async.html
fast/loader/javascript-url-hierarchical-execution.html
fast/loader/onload-policy-ignore-for-frame.html
fast/loader/reload-policy-delegate.html
diff --git a/LayoutTests/platform/qt-wk2/Skipped b/LayoutTests/platform/qt-wk2/Skipped
index d36600e..25b028c 100644
--- a/LayoutTests/platform/qt-wk2/Skipped
+++ b/LayoutTests/platform/qt-wk2/Skipped
@@ -1472,7 +1472,6 @@ fast/dom/Geolocation/timeout-zero.html
# WebKitTestRunner needs layoutTestController.setCustomPolicyDelegate
# <https://bugs.webkit.org/show_bug.cgi?id=42546>
-fast/loader/decide-policy-for-mime-type-async.html
fast/loader/javascript-url-hierarchical-execution.html
fast/loader/onload-policy-ignore-for-frame.html
fast/loader/reload-policy-delegate.html
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index c442ecf..fe180bd 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -100,7 +100,6 @@ accessibility
transforms/3d
compositing
-fast/loader/decide-policy-for-mime-type-async.html
fast/loader/subframe-navigate-during-main-frame-load.html
# Hyphenation is not implemented yet.
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index bfa26a7..c80cf40 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -1038,6 +1038,3 @@ fast/events/click-focus-control.html
# Requires WebP support.
fast/images/webp-image-decoding.html
-
-# Needs ovelroad of setCustomPolicyDelegate
-fast/loader/decide-policy-for-mime-type-async.html
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0b98c88..e41ee02 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-10-23 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r70367.
+ http://trac.webkit.org/changeset/70367
+ https://bugs.webkit.org/show_bug.cgi?id=48176
+
+ It made 8-10 tests crash on Qt bot (Requested by Ossy on
+ #webkit).
+
+ * loader/MainResourceLoader.cpp:
+ (WebCore::MainResourceLoader::MainResourceLoader):
+ (WebCore::MainResourceLoader::continueAfterContentPolicy):
+ (WebCore::MainResourceLoader::didReceiveResponse):
+ (WebCore::MainResourceLoader::setDefersLoading):
+ * loader/MainResourceLoader.h:
+
2010-10-22 Andy Estes <aestes at apple.com>
Reviewed by Adam Roben and Sam Weinig.
diff --git a/WebCore/loader/MainResourceLoader.cpp b/WebCore/loader/MainResourceLoader.cpp
index d67243e..af30a11 100644
--- a/WebCore/loader/MainResourceLoader.cpp
+++ b/WebCore/loader/MainResourceLoader.cpp
@@ -57,7 +57,6 @@ MainResourceLoader::MainResourceLoader(Frame* frame)
, m_dataLoadTimer(this, &MainResourceLoader::handleDataLoadNow)
, m_loadingMultipartContent(false)
, m_waitingForContentPolicy(false)
- , m_deferLoadingCount(0)
{
}
@@ -232,10 +231,7 @@ void MainResourceLoader::continueAfterContentPolicy(PolicyAction contentPolicy,
{
KURL url = request().url();
const String& mimeType = r.mimeType();
-
- // This is balanced by a call to setDefersLoading(true) in didReceiveResponse.
- setDefersLoading(false);
-
+
switch (contentPolicy) {
case PolicyUse: {
// Prevent remote web archives from loading because they can claim to be from any domain and thus avoid cross-domain security checks (4120255).
@@ -377,10 +373,6 @@ void MainResourceLoader::didReceiveResponse(const ResourceResponse& r)
// reference to this object; one example of this is 3266216.
RefPtr<MainResourceLoader> protect(this);
- // Defer loading while we're waiting for a response.
- // This is balanced by a setDefersLoading(false) call in continueAfterContentPolicy.
- setDefersLoading(true);
-
m_documentLoader->setResponse(r);
m_response = r;
@@ -603,16 +595,6 @@ bool MainResourceLoader::load(const ResourceRequest& r, const SubstituteData& su
void MainResourceLoader::setDefersLoading(bool defers)
{
- if (defers) {
- m_deferLoadingCount++;
- if (m_deferLoadingCount > 1)
- return;
- } else {
- ASSERT(m_deferLoadingCount);
- m_deferLoadingCount--;
- if (m_deferLoadingCount > 0)
- return;
- }
ResourceLoader::setDefersLoading(defers);
if (defers) {
diff --git a/WebCore/loader/MainResourceLoader.h b/WebCore/loader/MainResourceLoader.h
index ff39dda..1620f7a 100644
--- a/WebCore/loader/MainResourceLoader.h
+++ b/WebCore/loader/MainResourceLoader.h
@@ -108,7 +108,6 @@ namespace WebCore {
bool m_loadingMultipartContent;
bool m_waitingForContentPolicy;
double m_timeOfLastDataReceived;
- unsigned m_deferLoadingCount;
};
}
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index db8a5d3..d2dd6cd 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,29 @@
+2010-10-23 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r70367.
+ http://trac.webkit.org/changeset/70367
+ https://bugs.webkit.org/show_bug.cgi?id=48176
+
+ It made 8-10 tests crash on Qt bot (Requested by Ossy on
+ #webkit).
+
+ * DumpRenderTree/LayoutTestController.cpp:
+ (setCustomPolicyDelegateCallback):
+ * DumpRenderTree/LayoutTestController.h:
+ * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
+ (LayoutTestController::setCustomPolicyDelegate):
+ * DumpRenderTree/mac/LayoutTestControllerMac.mm:
+ (LayoutTestController::setCustomPolicyDelegate):
+ * DumpRenderTree/mac/PolicyDelegate.h:
+ * DumpRenderTree/mac/PolicyDelegate.mm:
+ (-[PolicyDelegate webView:decidePolicyForNavigationAction:request:frame:decisionListener:]):
+ (-[PolicyDelegate setPermissive:]):
+ (-[PolicyDelegate setControllerToNotifyDone:]):
+ * DumpRenderTree/win/LayoutTestControllerWin.cpp:
+ (LayoutTestController::setCustomPolicyDelegate):
+ * DumpRenderTree/wx/LayoutTestControllerWx.cpp:
+ (LayoutTestController::setCustomPolicyDelegate):
+
2010-10-22 Eric Seidel <eric at webkit.org>
Reviewed by Adam Barth.
diff --git a/WebKitTools/DumpRenderTree/LayoutTestController.cpp b/WebKitTools/DumpRenderTree/LayoutTestController.cpp
index 63d00d9..b5cc874 100644
--- a/WebKitTools/DumpRenderTree/LayoutTestController.cpp
+++ b/WebKitTools/DumpRenderTree/LayoutTestController.cpp
@@ -971,12 +971,8 @@ static JSValueRef setCustomPolicyDelegateCallback(JSContextRef context, JSObject
if (argumentCount >= 2)
permissive = JSValueToBoolean(context, arguments[1]);
- bool callIgnoreInDecidePolicyForMIMETypeAfterOneSecond = false;
- if (argumentCount >= 3)
- callIgnoreInDecidePolicyForMIMETypeAfterOneSecond = JSValueToBoolean(context, arguments[2]);
-
LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
- controller->setCustomPolicyDelegate(JSValueToBoolean(context, arguments[0]), permissive, callIgnoreInDecidePolicyForMIMETypeAfterOneSecond);
+ controller->setCustomPolicyDelegate(JSValueToBoolean(context, arguments[0]), permissive);
return JSValueMakeUndefined(context);
}
diff --git a/WebKitTools/DumpRenderTree/LayoutTestController.h b/WebKitTools/DumpRenderTree/LayoutTestController.h
index 39e375a..689e114 100644
--- a/WebKitTools/DumpRenderTree/LayoutTestController.h
+++ b/WebKitTools/DumpRenderTree/LayoutTestController.h
@@ -84,7 +84,7 @@ public:
void setApplicationCacheOriginQuota(unsigned long long quota);
void setAuthorAndUserStylesEnabled(bool);
void setCacheModel(int);
- void setCustomPolicyDelegate(bool setDelegate, bool permissive, bool callIgnoreInDecidePolicyForMIMETypeAfterOneSecond);
+ void setCustomPolicyDelegate(bool setDelegate, bool permissive);
void setDatabaseQuota(unsigned long long quota);
void setDomainRelaxationForbiddenForURLScheme(bool forbidden, JSStringRef scheme);
void setIconDatabaseEnabled(bool iconDatabaseEnabled);
diff --git a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
index 1a30663..181ef9f 100644
--- a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
@@ -268,7 +268,7 @@ void LayoutTestController::setAlwaysAcceptCookies(bool alwaysAcceptCookies)
#endif
}
-void LayoutTestController::setCustomPolicyDelegate(bool setDelegate, bool permissive, bool callIgnoreInDecidePolicyForMIMETypeAfterOneSecond)
+void LayoutTestController::setCustomPolicyDelegate(bool setDelegate, bool permissive)
{
// FIXME: implement
}
diff --git a/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm b/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm
index c97a4df..c5d5a90 100644
--- a/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm
+++ b/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm
@@ -319,10 +319,9 @@ void LayoutTestController::setAuthorAndUserStylesEnabled(bool flag)
[[[mainFrame webView] preferences] setAuthorAndUserStylesEnabled:flag];
}
-void LayoutTestController::setCustomPolicyDelegate(bool setDelegate, bool permissive, bool callIgnoreInDecidePolicyForMIMETypeAfterOneSecond)
+void LayoutTestController::setCustomPolicyDelegate(bool setDelegate, bool permissive)
{
if (setDelegate) {
- [policyDelegate setCallIgnoreInDecidePolicyForMIMETypeAfterOneSecond:callIgnoreInDecidePolicyForMIMETypeAfterOneSecond];
[policyDelegate setPermissive:permissive];
[[mainFrame webView] setPolicyDelegate:policyDelegate];
} else
diff --git a/WebKitTools/DumpRenderTree/mac/PolicyDelegate.h b/WebKitTools/DumpRenderTree/mac/PolicyDelegate.h
index e79df9d..3b95455 100644
--- a/WebKitTools/DumpRenderTree/mac/PolicyDelegate.h
+++ b/WebKitTools/DumpRenderTree/mac/PolicyDelegate.h
@@ -31,13 +31,11 @@
class LayoutTestController;
@interface PolicyDelegate : NSObject {
- BOOL _permissiveDelegate;
- BOOL _callIgnoreInDecidePolicyForMIMETypeAfterOneSecond;
- LayoutTestController* _controllerToNotifyDone;
+ BOOL permissiveDelegate;
+ LayoutTestController* controllerToNotifyDone;
}
- (void)setPermissive:(BOOL)permissive;
-- (void)setCallIgnoreInDecidePolicyForMIMETypeAfterOneSecond:(BOOL)callIgnoreInDecidePolicyForMIMETypeAfterOneSecond;
- (void)setControllerToNotifyDone:(LayoutTestController*)controller;
@end
diff --git a/WebKitTools/DumpRenderTree/mac/PolicyDelegate.mm b/WebKitTools/DumpRenderTree/mac/PolicyDelegate.mm
index 5ede65c..6935ea7 100644
--- a/WebKitTools/DumpRenderTree/mac/PolicyDelegate.mm
+++ b/WebKitTools/DumpRenderTree/mac/PolicyDelegate.mm
@@ -83,49 +83,31 @@
printf("%s\n", [message UTF8String]);
- if (_permissiveDelegate)
+ if (permissiveDelegate)
[listener use];
else
[listener ignore];
- if (_controllerToNotifyDone) {
- _controllerToNotifyDone->notifyDone();
- _controllerToNotifyDone = 0;
+ if (controllerToNotifyDone) {
+ controllerToNotifyDone->notifyDone();
+ controllerToNotifyDone = 0;
}
}
-- (void)webView:(WebView *)webView decidePolicyForMIMEType:(NSString *)type
- request:(NSURLRequest *)request
- frame:(WebFrame *)frame
- decisionListener:(id<WebPolicyDecisionListener>)listener
-{
- if (!_callIgnoreInDecidePolicyForMIMETypeAfterOneSecond) {
- [listener use];
- return;
- }
-
- [(NSObject *)listener performSelector:@selector(ignore) withObject:nil afterDelay:1.0];
-}
-
- (void)webView:(WebView *)webView unableToImplementPolicyWithError:(NSError *)error frame:(WebFrame *)frame
{
NSString *message = [NSString stringWithFormat:@"Policy delegate: unable to implement policy with error domain '%@', error code %d, in frame '%@'", [error domain], [error code], [frame name]];
printf("%s\n", [message UTF8String]);
}
-- (void)setCallIgnoreInDecidePolicyForMIMETypeAfterOneSecond:(BOOL)callIgnoreInDecidePolicyForMIMETypeAfterOneSecond
-{
- _callIgnoreInDecidePolicyForMIMETypeAfterOneSecond = callIgnoreInDecidePolicyForMIMETypeAfterOneSecond;
-}
-
- (void)setPermissive:(BOOL)permissive
{
- _permissiveDelegate = permissive;
+ permissiveDelegate = permissive;
}
- (void)setControllerToNotifyDone:(LayoutTestController*)controller
{
- _controllerToNotifyDone = controller;
+ controllerToNotifyDone = controller;
}
@end
diff --git a/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp b/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp
index dbf86ff..9e8ed1e 100644
--- a/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp
+++ b/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp
@@ -368,7 +368,7 @@ void LayoutTestController::setAuthorAndUserStylesEnabled(bool flag)
prefsPrivate->setAuthorAndUserStylesEnabled(flag);
}
-void LayoutTestController::setCustomPolicyDelegate(bool setDelegate, bool permissive , bool callIgnoreInDecidePolicyForMIMETypeAfterOneSecond)
+void LayoutTestController::setCustomPolicyDelegate(bool setDelegate, bool permissive)
{
COMPtr<IWebView> webView;
if (FAILED(frame->webView(&webView)))
diff --git a/WebKitTools/DumpRenderTree/wx/LayoutTestControllerWx.cpp b/WebKitTools/DumpRenderTree/wx/LayoutTestControllerWx.cpp
index 22554c9..eefc587 100644
--- a/WebKitTools/DumpRenderTree/wx/LayoutTestControllerWx.cpp
+++ b/WebKitTools/DumpRenderTree/wx/LayoutTestControllerWx.cpp
@@ -107,7 +107,7 @@ void LayoutTestController::setAlwaysAcceptCookies(bool alwaysAcceptCookies)
// FIXME: Implement this (and restore the default value before running each test in DumpRenderTree.cpp).
}
-void LayoutTestController::setCustomPolicyDelegate(bool, bool, bool)
+void LayoutTestController::setCustomPolicyDelegate(bool, bool)
{
// FIXME: implement
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list