| 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 #include "core/loader/archive/MHTMLArchive.h" | 50 #include "core/loader/archive/MHTMLArchive.h" |
| 51 #include "core/frame/ContentSecurityPolicy.h" | 51 #include "core/frame/ContentSecurityPolicy.h" |
| 52 #include "core/frame/DOMWindow.h" | 52 #include "core/frame/DOMWindow.h" |
| 53 #include "core/frame/Frame.h" | 53 #include "core/frame/Frame.h" |
| 54 #include "core/page/FrameTree.h" | 54 #include "core/page/FrameTree.h" |
| 55 #include "core/page/Page.h" | 55 #include "core/page/Page.h" |
| 56 #include "core/page/Settings.h" | 56 #include "core/page/Settings.h" |
| 57 #include "platform/Logging.h" | 57 #include "platform/Logging.h" |
| 58 #include "platform/UserGestureIndicator.h" | 58 #include "platform/UserGestureIndicator.h" |
| 59 #include "platform/plugins/PluginData.h" | 59 #include "platform/plugins/PluginData.h" |
| 60 #include "platform/weborigin/SchemeRegistry.h" |
| 61 #include "platform/weborigin/SecurityPolicy.h" |
| 60 #include "public/platform/Platform.h" | 62 #include "public/platform/Platform.h" |
| 61 #include "public/platform/WebMimeRegistry.h" | 63 #include "public/platform/WebMimeRegistry.h" |
| 62 #include "weborigin/SchemeRegistry.h" | |
| 63 #include "weborigin/SecurityPolicy.h" | |
| 64 #include "wtf/Assertions.h" | 64 #include "wtf/Assertions.h" |
| 65 #include "wtf/text/WTFString.h" | 65 #include "wtf/text/WTFString.h" |
| 66 | 66 |
| 67 namespace WebCore { | 67 namespace WebCore { |
| 68 | 68 |
| 69 static bool isArchiveMIMEType(const String& mimeType) | 69 static bool isArchiveMIMEType(const String& mimeType) |
| 70 { | 70 { |
| 71 return mimeType == "multipart/related"; | 71 return mimeType == "multipart/related"; |
| 72 } | 72 } |
| 73 | 73 |
| (...skipping 863 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 937 void DocumentLoader::replaceDocument(const String& source, Document* ownerDocume
nt) | 937 void DocumentLoader::replaceDocument(const String& source, Document* ownerDocume
nt) |
| 938 { | 938 { |
| 939 m_frame->loader().stopAllLoaders(); | 939 m_frame->loader().stopAllLoaders(); |
| 940 m_writer = createWriterFor(m_frame, ownerDocument, m_frame->document()->url(
), mimeType(), m_writer ? m_writer->encoding() : "", m_writer ? m_writer->encod
ingWasChosenByUser() : false, true); | 940 m_writer = createWriterFor(m_frame, ownerDocument, m_frame->document()->url(
), mimeType(), m_writer ? m_writer->encoding() : "", m_writer ? m_writer->encod
ingWasChosenByUser() : false, true); |
| 941 if (!source.isNull()) | 941 if (!source.isNull()) |
| 942 m_writer->appendReplacingData(source); | 942 m_writer->appendReplacingData(source); |
| 943 endWriting(m_writer.get()); | 943 endWriting(m_writer.get()); |
| 944 } | 944 } |
| 945 | 945 |
| 946 } // namespace WebCore | 946 } // namespace WebCore |
| OLD | NEW |