OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. |
3 * Copyright (C) 2011 Google Inc. All rights reserved. | 3 * Copyright (C) 2011 Google Inc. All rights reserved. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
7 * are met: | 7 * are met: |
8 * | 8 * |
9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
390 m_frame, this, mainResourceIdentifier(), response, m_mainResource.get()); | 390 m_frame, this, mainResourceIdentifier(), response, m_mainResource.get()); |
391 | 391 |
392 setWasBlockedAfterXFrameOptionsOrCSP(); | 392 setWasBlockedAfterXFrameOptionsOrCSP(); |
393 | 393 |
394 // Pretend that this was an empty HTTP 200 response. Don't reuse the original | 394 // Pretend that this was an empty HTTP 200 response. Don't reuse the original |
395 // URL for the empty page (https://crbug.com/622385). | 395 // URL for the empty page (https://crbug.com/622385). |
396 // | 396 // |
397 // TODO(mkwst): Remove this once XFO moves to the browser. | 397 // TODO(mkwst): Remove this once XFO moves to the browser. |
398 // https://crbug.com/555418. | 398 // https://crbug.com/555418. |
399 clearMainResourceHandle(); | 399 clearMainResourceHandle(); |
| 400 m_contentSecurityPolicy.clear(); |
400 KURL blockedURL = SecurityOrigin::urlWithUniqueSecurityOrigin(); | 401 KURL blockedURL = SecurityOrigin::urlWithUniqueSecurityOrigin(); |
401 m_originalRequest.setURL(blockedURL); | 402 m_originalRequest.setURL(blockedURL); |
402 m_request.setURL(blockedURL); | 403 m_request.setURL(blockedURL); |
403 m_redirectChain.pop_back(); | 404 m_redirectChain.pop_back(); |
404 appendRedirect(blockedURL); | 405 appendRedirect(blockedURL); |
405 m_response = ResourceResponse(blockedURL, "text/html", 0, nullAtom, String()); | 406 m_response = ResourceResponse(blockedURL, "text/html", 0, nullAtom, String()); |
406 finishedLoading(monotonicallyIncreasingTime()); | 407 finishedLoading(monotonicallyIncreasingTime()); |
407 | 408 |
408 return; | 409 return; |
409 } | 410 } |
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
793 m_writer ? m_writer->encoding() : emptyAtom, true, | 794 m_writer ? m_writer->encoding() : emptyAtom, true, |
794 ForceSynchronousParsing); | 795 ForceSynchronousParsing); |
795 if (!source.isNull()) | 796 if (!source.isNull()) |
796 m_writer->appendReplacingData(source); | 797 m_writer->appendReplacingData(source); |
797 endWriting(); | 798 endWriting(); |
798 } | 799 } |
799 | 800 |
800 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader); | 801 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader); |
801 | 802 |
802 } // namespace blink | 803 } // namespace blink |
OLD | NEW |