| 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 746 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 757 ParserSynchronizationPolicy parsingPolicy, | 757 ParserSynchronizationPolicy parsingPolicy, |
| 758 const KURL& overridingURL) { | 758 const KURL& overridingURL) { |
| 759 LocalFrame* frame = init.frame(); | 759 LocalFrame* frame = init.frame(); |
| 760 | 760 |
| 761 DCHECK(!frame->document() || !frame->document()->isActive()); | 761 DCHECK(!frame->document() || !frame->document()->isActive()); |
| 762 DCHECK_EQ(frame->tree().childCount(), 0u); | 762 DCHECK_EQ(frame->tree().childCount(), 0u); |
| 763 | 763 |
| 764 if (!init.shouldReuseDefaultView()) | 764 if (!init.shouldReuseDefaultView()) |
| 765 frame->setDOMWindow(LocalDOMWindow::create(*frame)); | 765 frame->setDOMWindow(LocalDOMWindow::create(*frame)); |
| 766 | 766 |
| 767 Document* document = | 767 Document* document = frame->domWindow()->installNewDocument(mimeType, init); |
| 768 frame->localDOMWindow()->installNewDocument(mimeType, init); | |
| 769 | 768 |
| 770 if (!init.shouldReuseDefaultView()) | 769 if (!init.shouldReuseDefaultView()) |
| 771 frame->page()->chromeClient().installSupplements(*frame); | 770 frame->page()->chromeClient().installSupplements(*frame); |
| 772 | 771 |
| 773 // This should be set before receivedFirstData(). | 772 // This should be set before receivedFirstData(). |
| 774 if (!overridingURL.isEmpty()) | 773 if (!overridingURL.isEmpty()) |
| 775 frame->document()->setBaseURLOverride(overridingURL); | 774 frame->document()->setBaseURLOverride(overridingURL); |
| 776 | 775 |
| 777 frame->loader().didInstallNewDocument(dispatchWindowObjectAvailable); | 776 frame->loader().didInstallNewDocument(dispatchWindowObjectAvailable); |
| 778 | 777 |
| (...skipping 22 matching lines...) Expand all Loading... |
| 801 m_writer ? m_writer->encoding() : emptyAtom, true, | 800 m_writer ? m_writer->encoding() : emptyAtom, true, |
| 802 ForceSynchronousParsing); | 801 ForceSynchronousParsing); |
| 803 if (!source.isNull()) | 802 if (!source.isNull()) |
| 804 m_writer->appendReplacingData(source); | 803 m_writer->appendReplacingData(source); |
| 805 endWriting(); | 804 endWriting(); |
| 806 } | 805 } |
| 807 | 806 |
| 808 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader); | 807 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader); |
| 809 | 808 |
| 810 } // namespace blink | 809 } // namespace blink |
| OLD | NEW |