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 26 matching lines...) Expand all Loading... |
37 #include "core/fetch/MemoryCache.h" | 37 #include "core/fetch/MemoryCache.h" |
38 #include "core/fetch/ResourceFetcher.h" | 38 #include "core/fetch/ResourceFetcher.h" |
39 #include "core/fetch/ResourceLoader.h" | 39 #include "core/fetch/ResourceLoader.h" |
40 #include "core/html/HTMLFrameOwnerElement.h" | 40 #include "core/html/HTMLFrameOwnerElement.h" |
41 #include "core/html/parser/TextResourceDecoder.h" | 41 #include "core/html/parser/TextResourceDecoder.h" |
42 #include "core/inspector/InspectorInstrumentation.h" | 42 #include "core/inspector/InspectorInstrumentation.h" |
43 #include "core/loader/FrameLoader.h" | 43 #include "core/loader/FrameLoader.h" |
44 #include "core/loader/FrameLoaderClient.h" | 44 #include "core/loader/FrameLoaderClient.h" |
45 #include "core/loader/UniqueIdentifier.h" | 45 #include "core/loader/UniqueIdentifier.h" |
46 #include "core/loader/appcache/ApplicationCacheHost.h" | 46 #include "core/loader/appcache/ApplicationCacheHost.h" |
47 #include "core/frame/ContentSecurityPolicy.h" | |
48 #include "core/frame/DOMWindow.h" | 47 #include "core/frame/DOMWindow.h" |
49 #include "core/frame/LocalFrame.h" | 48 #include "core/frame/LocalFrame.h" |
| 49 #include "core/frame/csp/ContentSecurityPolicy.h" |
50 #include "core/page/FrameTree.h" | 50 #include "core/page/FrameTree.h" |
51 #include "core/page/Page.h" | 51 #include "core/page/Page.h" |
52 #include "core/frame/Settings.h" | 52 #include "core/frame/Settings.h" |
53 #include "platform/Logging.h" | 53 #include "platform/Logging.h" |
54 #include "platform/UserGestureIndicator.h" | 54 #include "platform/UserGestureIndicator.h" |
55 #include "platform/mhtml/ArchiveResourceCollection.h" | 55 #include "platform/mhtml/ArchiveResourceCollection.h" |
56 #include "platform/mhtml/MHTMLArchive.h" | 56 #include "platform/mhtml/MHTMLArchive.h" |
57 #include "platform/plugins/PluginData.h" | 57 #include "platform/plugins/PluginData.h" |
58 #include "platform/weborigin/SchemeRegistry.h" | 58 #include "platform/weborigin/SchemeRegistry.h" |
59 #include "platform/weborigin/SecurityPolicy.h" | 59 #include "platform/weborigin/SecurityPolicy.h" |
(...skipping 781 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
841 void DocumentLoader::replaceDocument(const String& source, Document* ownerDocume
nt) | 841 void DocumentLoader::replaceDocument(const String& source, Document* ownerDocume
nt) |
842 { | 842 { |
843 m_frame->loader().stopAllLoaders(); | 843 m_frame->loader().stopAllLoaders(); |
844 m_writer = createWriterFor(m_frame, ownerDocument, m_frame->document()->url(
), mimeType(), m_writer ? m_writer->encoding() : emptyAtom, m_writer ? m_writer
->encodingWasChosenByUser() : false, true); | 844 m_writer = createWriterFor(m_frame, ownerDocument, m_frame->document()->url(
), mimeType(), m_writer ? m_writer->encoding() : emptyAtom, m_writer ? m_writer
->encodingWasChosenByUser() : false, true); |
845 if (!source.isNull()) | 845 if (!source.isNull()) |
846 m_writer->appendReplacingData(source); | 846 m_writer->appendReplacingData(source); |
847 endWriting(m_writer.get()); | 847 endWriting(m_writer.get()); |
848 } | 848 } |
849 | 849 |
850 } // namespace WebCore | 850 } // namespace WebCore |
OLD | NEW |