Title: [112346] trunk/Source/WebKit/chromium
- Revision
- 112346
- Author
- [email protected]
- Date
- 2012-03-27 17:52:40 -0700 (Tue, 27 Mar 2012)
Log Message
Unreviewed, rolling out r112339.
http://trac.webkit.org/changeset/112339
https://bugs.webkit.org/show_bug.cgi?id=82354
webkit_unit_tests crashing on chromium mac bots
* src/AssociatedURLLoader.cpp:
(AssociatedURLLoader::ClientAdapter):
* tests/AssociatedURLLoaderTest.cpp:
(WebKit::AssociatedURLLoaderTest::TearDown):
(WebKit):
(WebKit::TEST_F):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (112345 => 112346)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-03-28 00:49:33 UTC (rev 112345)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-03-28 00:52:40 UTC (rev 112346)
@@ -1,3 +1,18 @@
+2012-03-27 Dirk Pranke <[email protected]>
+
+ Unreviewed, rolling out r112339.
+ http://trac.webkit.org/changeset/112339
+ https://bugs.webkit.org/show_bug.cgi?id=82354
+
+ webkit_unit_tests crashing on chromium mac bots
+
+ * src/AssociatedURLLoader.cpp:
+ (AssociatedURLLoader::ClientAdapter):
+ * tests/AssociatedURLLoaderTest.cpp:
+ (WebKit::AssociatedURLLoaderTest::TearDown):
+ (WebKit):
+ (WebKit::TEST_F):
+
2012-03-27 Kausalya Madhusudhanan <[email protected]>
[Coverity] Address some uninitialized constructor values.
Modified: trunk/Source/WebKit/chromium/src/AssociatedURLLoader.cpp (112345 => 112346)
--- trunk/Source/WebKit/chromium/src/AssociatedURLLoader.cpp 2012-03-28 00:49:33 UTC (rev 112345)
+++ trunk/Source/WebKit/chromium/src/AssociatedURLLoader.cpp 2012-03-28 00:52:40 UTC (rev 112346)
@@ -140,7 +140,6 @@
virtual void didReceiveCachedMetadata(const char*, int /*dataLength*/);
virtual void didFinishLoading(unsigned long /*identifier*/, double /*finishTime*/);
virtual void didFail(const ResourceError&);
- virtual void didFailRedirectCheck();
virtual bool isDocumentThreadableLoaderClient() { return true; }
@@ -264,11 +263,6 @@
notifyError(&m_errorTimer);
}
-void AssociatedURLLoader::ClientAdapter::didFailRedirectCheck()
-{
- m_loader->cancel();
-}
-
void AssociatedURLLoader::ClientAdapter::setDelayedError(const ResourceError& error)
{
didFail(error);
Modified: trunk/Source/WebKit/chromium/tests/AssociatedURLLoaderTest.cpp (112345 => 112346)
--- trunk/Source/WebKit/chromium/tests/AssociatedURLLoaderTest.cpp 2012-03-28 00:49:33 UTC (rev 112345)
+++ trunk/Source/WebKit/chromium/tests/AssociatedURLLoaderTest.cpp 2012-03-28 00:52:40 UTC (rev 112346)
@@ -104,6 +104,7 @@
void TearDown()
{
+ webkit_support::UnregisterAllMockedURLs();
m_webView->close();
}
@@ -431,66 +432,23 @@
EXPECT_TRUE(m_didFinishLoading);
}
-// Test that a cross origin redirect response without CORS headers fails.
-TEST_F(AssociatedURLLoaderTest, RedirectCrossOriginWithAccessControlFailure)
+// Test a successful redirect and cross-origin load using CORS.
+// FIXME: Enable this when DocumentThreadableLoader supports cross-origin redirects.
+TEST_F(AssociatedURLLoaderTest, DISABLED_RedirectCrossOriginWithAccessControlSuccess)
{
- GURL url = ""
- char redirect[] = "http://www.other.com/RedirectCrossOriginWithAccessControlFailure2.html"; // Cross-origin
- GURL redirectURL = GURL(redirect);
-
- WebURLRequest request;
- request.initialize();
- request.setURL(url);
-
- // Create a redirect response without CORS headers.
- m_expectedRedirectResponse = WebURLResponse();
- m_expectedRedirectResponse.initialize();
- m_expectedRedirectResponse.setMIMEType("text/html");
- m_expectedRedirectResponse.setHTTPStatusCode(301);
- m_expectedRedirectResponse.setHTTPHeaderField("Location", redirect);
- webkit_support::RegisterMockedURL(url, m_expectedRedirectResponse, m_frameFilePath);
-
- m_expectedNewRequest = WebURLRequest();
- m_expectedNewRequest.initialize();
- m_expectedNewRequest.setURL(redirectURL);
-
- m_expectedResponse = WebURLResponse();
- m_expectedResponse.initialize();
- m_expectedResponse.setMIMEType("text/html");
- m_expectedResponse.addHTTPHeaderField("access-control-allow-origin", "*");
- webkit_support::RegisterMockedURL(redirectURL, m_expectedResponse, m_frameFilePath);
-
- WebURLLoaderOptions options;
- options.crossOriginRequestPolicy = WebURLLoaderOptions::CrossOriginRequestPolicyUseAccessControl;
- m_expectedLoader = createAssociatedURLLoader(options);
- EXPECT_TRUE(m_expectedLoader);
- m_expectedLoader->loadAsynchronously(request, this);
- serveRequests();
- // We should not receive a notification for the redirect or any response.
- EXPECT_FALSE(m_willSendRequest);
- EXPECT_FALSE(m_didReceiveResponse);
- EXPECT_FALSE(m_didReceiveData);
- EXPECT_FALSE(m_didFail);
-}
-
-// Test that a cross origin redirect response with CORS headers that allow the requesting origin succeeds.
-TEST_F(AssociatedURLLoaderTest, RedirectCrossOriginWithAccessControlSuccess)
-{
GURL url = ""
- char redirect[] = "http://www.other.com/RedirectCrossOriginWithAccessControlSuccess2.html"; // Cross-origin
+ char redirect[] = "http://www.other.com/RedirectCrossOriginWithAccessControlSuccess.html"; // Cross-origin
GURL redirectURL = GURL(redirect);
WebURLRequest request;
request.initialize();
request.setURL(url);
- // Create a redirect response that allows the redirect to pass the access control checks.
m_expectedRedirectResponse = WebURLResponse();
m_expectedRedirectResponse.initialize();
m_expectedRedirectResponse.setMIMEType("text/html");
m_expectedRedirectResponse.setHTTPStatusCode(301);
m_expectedRedirectResponse.setHTTPHeaderField("Location", redirect);
- m_expectedRedirectResponse.addHTTPHeaderField("access-control-allow-origin", "*");
webkit_support::RegisterMockedURL(url, m_expectedRedirectResponse, m_frameFilePath);
m_expectedNewRequest = WebURLRequest();
@@ -509,8 +467,7 @@
EXPECT_TRUE(m_expectedLoader);
m_expectedLoader->loadAsynchronously(request, this);
serveRequests();
- // We should not receive a notification for the redirect.
- EXPECT_FALSE(m_willSendRequest);
+ EXPECT_TRUE(m_willSendRequest);
EXPECT_TRUE(m_didReceiveResponse);
EXPECT_TRUE(m_didReceiveData);
EXPECT_TRUE(m_didFinishLoading);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
