| 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 525 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 536 void DocumentLoader::clearRedirectChain() | 536 void DocumentLoader::clearRedirectChain() |
| 537 { | 537 { |
| 538 m_redirectChain.clear(); | 538 m_redirectChain.clear(); |
| 539 } | 539 } |
| 540 | 540 |
| 541 void DocumentLoader::appendRedirect(const KURL& url) | 541 void DocumentLoader::appendRedirect(const KURL& url) |
| 542 { | 542 { |
| 543 m_redirectChain.append(url); | 543 m_redirectChain.append(url); |
| 544 } | 544 } |
| 545 | 545 |
| 546 bool DocumentLoader::loadingMultipartContent() const |
| 547 { |
| 548 return mainResourceLoader() ? mainResourceLoader()->loadingMultipartContent(
) : false; |
| 549 } |
| 550 |
| 546 void DocumentLoader::detachFromFrame() | 551 void DocumentLoader::detachFromFrame() |
| 547 { | 552 { |
| 548 ASSERT(m_frame); | 553 ASSERT(m_frame); |
| 549 RefPtrWillBeRawPtr<LocalFrame> protectFrame(m_frame); | 554 RefPtrWillBeRawPtr<LocalFrame> protectFrame(m_frame); |
| 550 RefPtr<DocumentLoader> protectLoader(this); | 555 RefPtr<DocumentLoader> protectLoader(this); |
| 551 | 556 |
| 552 // It never makes sense to have a document loader that is detached from its | 557 // It never makes sense to have a document loader that is detached from its |
| 553 // frame have any loads active, so go ahead and kill all the loads. | 558 // frame have any loads active, so go ahead and kill all the loads. |
| 554 stopLoading(); | 559 stopLoading(); |
| 555 | 560 |
| (...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 767 // This is only called by FrameLoader::replaceDocumentWhileExecutingJavaScriptUR
L() | 772 // This is only called by FrameLoader::replaceDocumentWhileExecutingJavaScriptUR
L() |
| 768 void DocumentLoader::replaceDocumentWhileExecutingJavaScriptURL(const DocumentIn
it& init, const String& source, Document* ownerDocument) | 773 void DocumentLoader::replaceDocumentWhileExecutingJavaScriptURL(const DocumentIn
it& init, const String& source, Document* ownerDocument) |
| 769 { | 774 { |
| 770 m_writer = createWriterFor(ownerDocument, init, mimeType(), m_writer ? m_wri
ter->encoding() : emptyAtom, true, ForceSynchronousParsing); | 775 m_writer = createWriterFor(ownerDocument, init, mimeType(), m_writer ? m_wri
ter->encoding() : emptyAtom, true, ForceSynchronousParsing); |
| 771 if (!source.isNull()) | 776 if (!source.isNull()) |
| 772 m_writer->appendReplacingData(source); | 777 m_writer->appendReplacingData(source); |
| 773 endWriting(m_writer.get()); | 778 endWriting(m_writer.get()); |
| 774 } | 779 } |
| 775 | 780 |
| 776 } // namespace blink | 781 } // namespace blink |
| OLD | NEW |