WebKit Bugzilla
New
Browse
Search+
Log In
×
Sign in with GitHub
or
Remember my login
Create Account
·
Forgot Password
Forgotten password account recovery
[patch]
ROLLOUT of r70367
bug-48176-20101023073903.patch (text/plain), 18.95 KB, created by
WebKit Review Bot
on 2010-10-23 00:39:06 PDT
(
hide
)
Description:
ROLLOUT of r70367
Filename:
MIME Type:
Creator:
WebKit Review Bot
Created:
2010-10-23 00:39:06 PDT
Size:
18.95 KB
patch
obsolete
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog >index 0938c19ba353946e0f8eaba783134eea8f03ce72..7925fb8658f7d819372b872274e78453aaddfb88 100644 >--- a/LayoutTests/ChangeLog >+++ b/LayoutTests/ChangeLog >@@ -1,5 +1,22 @@ > 2010-10-23 Sheriff Bot <webkit.review.bot@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@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 2d6d3fb539fa475f450f55a6e85b4a5bc3966318..0000000000000000000000000000000000000000 >--- 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 31118f8d686da7f422699fda94dbde7407188b54..0000000000000000000000000000000000000000 >--- 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 2712b4c5d59f5500a200f4b8fb79ea07eb6f553f..a1ef0a082f7de8e18162716a01c37f085c677e3a 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 26752f7a4bee32382ecbe43b73bdb301dc597aec..2226a13baf1c2a5a08a1cc61a1cf567415ea8f2e 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 d36600e7c9eb72873878db53b8d864bbc08f8720..25b028c1c4164eca3a8fa9af983e47424613e2d2 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 c442ecf4437924c3430e7fda83b7ceba8c78ff9e..fe180bd0b1056c3a226a42a79341809782e292f9 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 bfa26a78e95a8545e152619f6b6d7291059b429c..c80cf40b3d5d1362eef54a9c25645916eccf82f6 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 0b98c88ad8b23025c31f135487d8b3fb9e7dfd8c..e41ee027a9ab1aca41088b7f0db14a7d30115b73 100644 >--- a/WebCore/ChangeLog >+++ b/WebCore/ChangeLog >@@ -1,3 +1,19 @@ >+2010-10-23 Sheriff Bot <webkit.review.bot@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@apple.com> > > Reviewed by Adam Roben and Sam Weinig. >diff --git a/WebCore/loader/MainResourceLoader.cpp b/WebCore/loader/MainResourceLoader.cpp >index d67243eccc4c85a7efc518d27c86b590fb521bb8..af30a11913dbb00bb4371911e050328439f459aa 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 ff39ddae9606f800363e52c62d85dae8c6903f90..1620f7aa0636b7892306f7872bedb64a9f226c97 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 db8a5d3c5daf64ef03eb09620e133b7c6eeaa61d..d2dd6cd0a628a501b8301a7a19302653d427ec2a 100644 >--- a/WebKitTools/ChangeLog >+++ b/WebKitTools/ChangeLog >@@ -1,3 +1,29 @@ >+2010-10-23 Sheriff Bot <webkit.review.bot@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@webkit.org> > > Reviewed by Adam Barth. >diff --git a/WebKitTools/DumpRenderTree/LayoutTestController.cpp b/WebKitTools/DumpRenderTree/LayoutTestController.cpp >index 63d00d9add1376ffb490698d1b1ee91b1b3f97a3..b5cc874215b40f590755a4047ebdd5d9f8ed6279 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 39e375a65951c509b7162e770bcff70a013d001c..689e11457508dffe7d887bde16482140ba75bc1a 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 1a306636841010b1eef5300a1b4ad92ba1bd88f8..181ef9f0b29ce6098b18bd6403e1ecab18e03b44 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 c97a4df0a1a8faf0b2ea299b0f13b82e0729d1b7..c5d5a9069599ba4bcfc2aca311c7a3a765ab5e1d 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 e79df9d9c3d53679a4a277844fbb812321cebb6e..3b954557d73632f80e9332e138d4e48cc17ebf31 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 5ede65cf630df8da5efb0d8f8c914d4d50d2ba45..6935ea7217ae8f25f4ce836114b2c338472636b4 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 dbf86ff832718c799360e7abe7748c575f6b3ad4..9e8ed1e6957d7f7ca4fead91d87b9b56fb421459 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 22554c993a5032a36cc3ea53f8d47dfab4e6e40a..eefc58781e0a1eabcd0fd8138932cc43c4d7847f 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 > }
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 48176
: 71627