Title: [145460] branches/chromium/1410
- Revision
- 145460
- Author
- [email protected]
- Date
- 2013-03-11 18:55:34 -0700 (Mon, 11 Mar 2013)
Log Message
Merge 144338
BUG=178797
Review URL: https://codereview.chromium.org/12638027
Modified Paths
Added Paths
Diff
Copied: branches/chromium/1410/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-multiple-clients-expected.txt (from rev 144338, trunk/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-multiple-clients-expected.txt) (0 => 145460)
--- branches/chromium/1410/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-multiple-clients-expected.txt (rev 0)
+++ branches/chromium/1410/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-multiple-clients-expected.txt 2013-03-12 01:55:34 UTC (rev 145460)
@@ -0,0 +1,2 @@
+CONSOLE MESSAGE: Refused to display 'http://127.0.0.1:8000/security/XFrameOptions/resources/x-frame-options-deny.cgi' in a frame because it set 'X-Frame-Options' to 'deny'.
+Test that two main resources pointing to the same url that are canceled within didReceiveResponse() don't cause us to crash.
Copied: branches/chromium/1410/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-multiple-clients.html (from rev 144338, trunk/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-multiple-clients.html) (0 => 145460)
--- branches/chromium/1410/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-multiple-clients.html (rev 0)
+++ branches/chromium/1410/LayoutTests/http/tests/security/XFrameOptions/x-frame-options-deny-multiple-clients.html 2013-03-12 01:55:34 UTC (rev 145460)
@@ -0,0 +1,14 @@
+<html>
+<head>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</head>
+<body>
+Test that two main resources pointing to the same url that are canceled within didReceiveResponse() don't cause us to crash.
+
+<iframe src=""
+<iframe src=""
+</body>
+</html>
Modified: branches/chromium/1410/Source/WebCore/loader/cache/CachedRawResource.cpp (145459 => 145460)
--- branches/chromium/1410/Source/WebCore/loader/cache/CachedRawResource.cpp 2013-03-12 01:50:07 UTC (rev 145459)
+++ branches/chromium/1410/Source/WebCore/loader/cache/CachedRawResource.cpp 2013-03-12 01:55:34 UTC (rev 145460)
@@ -128,6 +128,7 @@
void CachedRawResource::responseReceived(const ResourceResponse& response)
{
+ CachedResourceHandle<CachedRawResource> protect(this);
if (!m_identifier)
m_identifier = m_loader->identifier();
CachedResource::responseReceived(response);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
