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 606 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
617 if (!shouldLoadEmpty) | 617 if (!shouldLoadEmpty) |
618 return false; | 618 return false; |
619 | 619 |
620 if (m_request.url().isEmpty() && !frameLoader()->stateMachine()->creatingIni
tialEmptyDocument()) | 620 if (m_request.url().isEmpty() && !frameLoader()->stateMachine()->creatingIni
tialEmptyDocument()) |
621 m_request.setURL(blankURL()); | 621 m_request.setURL(blankURL()); |
622 m_response = ResourceResponse(m_request.url(), "text/html", 0, nullAtom, Str
ing()); | 622 m_response = ResourceResponse(m_request.url(), "text/html", 0, nullAtom, Str
ing()); |
623 finishedLoading(monotonicallyIncreasingTime()); | 623 finishedLoading(monotonicallyIncreasingTime()); |
624 return true; | 624 return true; |
625 } | 625 } |
626 | 626 |
| 627 void DocumentLoader::upgradeInsecureRequest() |
| 628 { |
| 629 fetcher()->context().upgradeInsecureRequest(m_request); |
| 630 } |
| 631 |
627 void DocumentLoader::startLoadingMainResource() | 632 void DocumentLoader::startLoadingMainResource() |
628 { | 633 { |
629 timing().markNavigationStart(); | 634 timing().markNavigationStart(); |
630 ASSERT(!m_mainResource); | 635 ASSERT(!m_mainResource); |
631 ASSERT(m_state == NotStarted); | 636 ASSERT(m_state == NotStarted); |
632 m_state = Provisional; | 637 m_state = Provisional; |
633 | 638 |
634 if (maybeLoadEmpty()) | 639 if (maybeLoadEmpty()) |
635 return; | 640 return; |
636 | 641 |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
700 { | 705 { |
701 m_writer = createWriterFor(init, mimeType(), m_writer ? m_writer->encoding()
: emptyAtom, true, ForceSynchronousParsing); | 706 m_writer = createWriterFor(init, mimeType(), m_writer ? m_writer->encoding()
: emptyAtom, true, ForceSynchronousParsing); |
702 if (!source.isNull()) | 707 if (!source.isNull()) |
703 m_writer->appendReplacingData(source); | 708 m_writer->appendReplacingData(source); |
704 endWriting(m_writer.get()); | 709 endWriting(m_writer.get()); |
705 } | 710 } |
706 | 711 |
707 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader); | 712 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader); |
708 | 713 |
709 } // namespace blink | 714 } // namespace blink |
OLD | NEW |