| 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 602 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 613 // request. | 613 // request. |
| 614 if (m_frame && m_frame->document()->isMediaDocument()) | 614 if (m_frame && m_frame->document()->isMediaDocument()) |
| 615 m_fetcher->stopFetching(); | 615 m_fetcher->stopFetching(); |
| 616 } | 616 } |
| 617 | 617 |
| 618 void DocumentLoader::clearRedirectChain() { | 618 void DocumentLoader::clearRedirectChain() { |
| 619 m_redirectChain.clear(); | 619 m_redirectChain.clear(); |
| 620 } | 620 } |
| 621 | 621 |
| 622 void DocumentLoader::appendRedirect(const KURL& url) { | 622 void DocumentLoader::appendRedirect(const KURL& url) { |
| 623 m_redirectChain.append(url); | 623 m_redirectChain.push_back(url); |
| 624 } | 624 } |
| 625 | 625 |
| 626 void DocumentLoader::detachFromFrame() { | 626 void DocumentLoader::detachFromFrame() { |
| 627 DCHECK(m_frame); | 627 DCHECK(m_frame); |
| 628 | 628 |
| 629 // It never makes sense to have a document loader that is detached from its | 629 // It never makes sense to have a document loader that is detached from its |
| 630 // frame have any loads active, so go ahead and kill all the loads. | 630 // frame have any loads active, so go ahead and kill all the loads. |
| 631 m_fetcher->stopFetching(); | 631 m_fetcher->stopFetching(); |
| 632 | 632 |
| 633 if (frameLoader() && !sentDidFinishLoad()) | 633 if (frameLoader() && !sentDidFinishLoad()) |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 801 m_writer ? m_writer->encoding() : emptyAtom, true, | 801 m_writer ? m_writer->encoding() : emptyAtom, true, |
| 802 ForceSynchronousParsing); | 802 ForceSynchronousParsing); |
| 803 if (!source.isNull()) | 803 if (!source.isNull()) |
| 804 m_writer->appendReplacingData(source); | 804 m_writer->appendReplacingData(source); |
| 805 endWriting(); | 805 endWriting(); |
| 806 } | 806 } |
| 807 | 807 |
| 808 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader); | 808 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader); |
| 809 | 809 |
| 810 } // namespace blink | 810 } // namespace blink |
| OLD | NEW |