| 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 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 339 | 339 |
| 340 // If the redirecting url is not allowed to display content from the target
origin, | 340 // If the redirecting url is not allowed to display content from the target
origin, |
| 341 // then block the redirect. | 341 // then block the redirect. |
| 342 const KURL& requestURL = m_request.url(); | 342 const KURL& requestURL = m_request.url(); |
| 343 RefPtr<SecurityOrigin> redirectingOrigin = SecurityOrigin::create(redirectRe
sponse.url()); | 343 RefPtr<SecurityOrigin> redirectingOrigin = SecurityOrigin::create(redirectRe
sponse.url()); |
| 344 if (!redirectingOrigin->canDisplay(requestURL)) { | 344 if (!redirectingOrigin->canDisplay(requestURL)) { |
| 345 FrameLoader::reportLocalLoadFailed(m_frame, requestURL.string()); | 345 FrameLoader::reportLocalLoadFailed(m_frame, requestURL.string()); |
| 346 cancelMainResourceLoad(ResourceError::cancelledError(requestURL)); | 346 cancelMainResourceLoad(ResourceError::cancelledError(requestURL)); |
| 347 return; | 347 return; |
| 348 } | 348 } |
| 349 if (!frameLoader()->shouldContinueForNavigationPolicy(m_request, SubstituteD
ata(), this, CheckContentSecurityPolicy, m_navigationType, NavigationPolicyCurre
ntTab, replacesCurrentHistoryItem(), isClientRedirect())) { | 349 if (!frameLoader()->shouldContinueForNavigationPolicy(m_request, SubstituteD
ata(), this, CheckContentSecurityPolicy, m_navigationType, NavigationPolicyCurre
ntTab, replacesCurrentHistoryItem(), isClientRedirect(), nullptr)) { |
| 350 cancelMainResourceLoad(ResourceError::cancelledError(requestURL)); | 350 cancelMainResourceLoad(ResourceError::cancelledError(requestURL)); |
| 351 return; | 351 return; |
| 352 } | 352 } |
| 353 | 353 |
| 354 ASSERT(timing().fetchStart()); | 354 ASSERT(timing().fetchStart()); |
| 355 timing().addRedirect(redirectResponse.url(), requestURL); | 355 timing().addRedirect(redirectResponse.url(), requestURL); |
| 356 appendRedirect(requestURL); | 356 appendRedirect(requestURL); |
| 357 frameLoader()->receivedMainResourceRedirect(requestURL); | 357 frameLoader()->receivedMainResourceRedirect(requestURL); |
| 358 } | 358 } |
| 359 | 359 |
| (...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 784 { | 784 { |
| 785 m_writer = createWriterFor(init, mimeType(), m_writer ? m_writer->encoding()
: emptyAtom, true, ForceSynchronousParsing); | 785 m_writer = createWriterFor(init, mimeType(), m_writer ? m_writer->encoding()
: emptyAtom, true, ForceSynchronousParsing); |
| 786 if (!source.isNull()) | 786 if (!source.isNull()) |
| 787 m_writer->appendReplacingData(source); | 787 m_writer->appendReplacingData(source); |
| 788 endWriting(m_writer.get()); | 788 endWriting(m_writer.get()); |
| 789 } | 789 } |
| 790 | 790 |
| 791 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader); | 791 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader); |
| 792 | 792 |
| 793 } // namespace blink | 793 } // namespace blink |
| OLD | NEW |