| 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 485 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 496 mainResourceIdentifier()); | 496 mainResourceIdentifier()); |
| 497 m_frame->document()->addConsoleMessage(consoleMessage); | 497 m_frame->document()->addConsoleMessage(consoleMessage); |
| 498 cancelLoadAfterCSPDenied(response); | 498 cancelLoadAfterCSPDenied(response); |
| 499 return; | 499 return; |
| 500 } | 500 } |
| 501 } | 501 } |
| 502 } | 502 } |
| 503 | 503 |
| 504 DCHECK(!m_frame->page()->suspended()); | 504 DCHECK(!m_frame->page()->suspended()); |
| 505 | 505 |
| 506 if (response.didServiceWorkerNavigationPreload()) |
| 507 UseCounter::count(m_frame, UseCounter::ServiceWorkerNavigationPreload); |
| 506 m_response = response; | 508 m_response = response; |
| 507 | 509 |
| 508 if (isArchiveMIMEType(m_response.mimeType()) && | 510 if (isArchiveMIMEType(m_response.mimeType()) && |
| 509 m_mainResource->getDataBufferingPolicy() != BufferData) | 511 m_mainResource->getDataBufferingPolicy() != BufferData) |
| 510 m_mainResource->setDataBufferingPolicy(BufferData); | 512 m_mainResource->setDataBufferingPolicy(BufferData); |
| 511 | 513 |
| 512 if (!shouldContinueForResponse()) { | 514 if (!shouldContinueForResponse()) { |
| 513 InspectorInstrumentation::continueWithPolicyIgnore( | 515 InspectorInstrumentation::continueWithPolicyIgnore( |
| 514 m_frame, this, m_mainResource->identifier(), m_response, | 516 m_frame, this, m_mainResource->identifier(), m_response, |
| 515 m_mainResource.get()); | 517 m_mainResource.get()); |
| (...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 813 m_writer ? m_writer->encoding() : emptyAtom, true, | 815 m_writer ? m_writer->encoding() : emptyAtom, true, |
| 814 ForceSynchronousParsing); | 816 ForceSynchronousParsing); |
| 815 if (!source.isNull()) | 817 if (!source.isNull()) |
| 816 m_writer->appendReplacingData(source); | 818 m_writer->appendReplacingData(source); |
| 817 endWriting(); | 819 endWriting(); |
| 818 } | 820 } |
| 819 | 821 |
| 820 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader); | 822 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader); |
| 821 | 823 |
| 822 } // namespace blink | 824 } // namespace blink |
| OLD | NEW |