Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(508)

Side by Side Diff: Source/core/loader/DocumentLoader.cpp

Issue 25195003: Prepare to move core/platform/text into blink_platform.dll (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: re-attempt upload Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/html/track/TextTrackRegion.cpp ('k') | Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 #include "core/loader/SinkDocument.h" 49 #include "core/loader/SinkDocument.h"
50 #include "core/loader/UniqueIdentifier.h" 50 #include "core/loader/UniqueIdentifier.h"
51 #include "core/loader/appcache/ApplicationCacheHost.h" 51 #include "core/loader/appcache/ApplicationCacheHost.h"
52 #include "core/loader/archive/ArchiveResourceCollection.h" 52 #include "core/loader/archive/ArchiveResourceCollection.h"
53 #include "core/loader/archive/MHTMLArchive.h" 53 #include "core/loader/archive/MHTMLArchive.h"
54 #include "core/page/DOMWindow.h" 54 #include "core/page/DOMWindow.h"
55 #include "core/page/Frame.h" 55 #include "core/page/Frame.h"
56 #include "core/page/FrameTree.h" 56 #include "core/page/FrameTree.h"
57 #include "core/page/Page.h" 57 #include "core/page/Page.h"
58 #include "core/page/Settings.h" 58 #include "core/page/Settings.h"
59 #include "core/platform/Logging.h" 59 #include "platform/Logging.h"
60 #include "core/plugins/PluginData.h" 60 #include "core/plugins/PluginData.h"
61 #include "public/platform/Platform.h" 61 #include "public/platform/Platform.h"
62 #include "public/platform/WebMimeRegistry.h" 62 #include "public/platform/WebMimeRegistry.h"
63 #include "weborigin/SchemeRegistry.h" 63 #include "weborigin/SchemeRegistry.h"
64 #include "weborigin/SecurityPolicy.h" 64 #include "weborigin/SecurityPolicy.h"
65 #include "wtf/Assertions.h" 65 #include "wtf/Assertions.h"
66 #include "wtf/text/WTFString.h" 66 #include "wtf/text/WTFString.h"
67 67
68 namespace WebCore { 68 namespace WebCore {
69 69
(...skipping 860 matching lines...) Expand 10 before | Expand all | Expand 10 after
930 void DocumentLoader::replaceDocument(const String& source, Document* ownerDocume nt) 930 void DocumentLoader::replaceDocument(const String& source, Document* ownerDocume nt)
931 { 931 {
932 m_frame->loader()->stopAllLoaders(); 932 m_frame->loader()->stopAllLoaders();
933 m_writer = createWriterFor(m_frame, ownerDocument, m_frame->document()->url( ), mimeType(), m_writer ? m_writer->encoding() : "", m_writer ? m_writer->encod ingWasChosenByUser() : false, true); 933 m_writer = createWriterFor(m_frame, ownerDocument, m_frame->document()->url( ), mimeType(), m_writer ? m_writer->encoding() : "", m_writer ? m_writer->encod ingWasChosenByUser() : false, true);
934 if (!source.isNull()) 934 if (!source.isNull())
935 m_writer->appendReplacingData(source); 935 m_writer->appendReplacingData(source);
936 endWriting(m_writer.get()); 936 endWriting(m_writer.get());
937 } 937 }
938 938
939 } // namespace WebCore 939 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/html/track/TextTrackRegion.cpp ('k') | Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698