| 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 713 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 724 m_request.setURL(blankURL()); | 724 m_request.setURL(blankURL()); |
| 725 m_response = ResourceResponse(m_request.url(), "text/html", 0, nullAtom, Str
ing()); | 725 m_response = ResourceResponse(m_request.url(), "text/html", 0, nullAtom, Str
ing()); |
| 726 finishedLoading(monotonicallyIncreasingTime()); | 726 finishedLoading(monotonicallyIncreasingTime()); |
| 727 return true; | 727 return true; |
| 728 } | 728 } |
| 729 | 729 |
| 730 void DocumentLoader::startLoadingMainResource() | 730 void DocumentLoader::startLoadingMainResource() |
| 731 { | 731 { |
| 732 RefPtrWillBeRawPtr<DocumentLoader> protect(this); | 732 RefPtrWillBeRawPtr<DocumentLoader> protect(this); |
| 733 m_mainDocumentError = ResourceError(); | 733 m_mainDocumentError = ResourceError(); |
| 734 timing().markNavigationStart(); | 734 if (!timing().navigationStart()) |
| 735 timing().markNavigationStart(); |
| 735 ASSERT(!m_mainResource); | 736 ASSERT(!m_mainResource); |
| 736 ASSERT(m_state == NotStarted); | 737 ASSERT(m_state == NotStarted); |
| 737 m_state = Provisional; | 738 m_state = Provisional; |
| 738 | 739 |
| 739 if (maybeLoadEmpty()) | 740 if (maybeLoadEmpty()) |
| 740 return; | 741 return; |
| 741 | 742 |
| 742 ASSERT(timing().navigationStart()); | 743 ASSERT(timing().navigationStart()); |
| 743 ASSERT(!timing().fetchStart()); | 744 ASSERT(!timing().fetchStart()); |
| 744 timing().markFetchStart(); | 745 timing().markFetchStart(); |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 841 { | 842 { |
| 842 m_writer = createWriterFor(ownerDocument, init, mimeType(), m_writer ? m_wri
ter->encoding() : emptyAtom, true, ForceSynchronousParsing); | 843 m_writer = createWriterFor(ownerDocument, init, mimeType(), m_writer ? m_wri
ter->encoding() : emptyAtom, true, ForceSynchronousParsing); |
| 843 if (!source.isNull()) | 844 if (!source.isNull()) |
| 844 m_writer->appendReplacingData(source); | 845 m_writer->appendReplacingData(source); |
| 845 endWriting(m_writer.get()); | 846 endWriting(m_writer.get()); |
| 846 } | 847 } |
| 847 | 848 |
| 848 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader); | 849 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader); |
| 849 | 850 |
| 850 } // namespace blink | 851 } // namespace blink |
| OLD | NEW |