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

Unified Diff: Source/core/loader/DocumentLoader.h

Issue 495743003: Add an extra guard to replaceDocument() (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Landing Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/frame/LocalFrame.cpp ('k') | Source/core/loader/DocumentLoader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/loader/DocumentLoader.h
diff --git a/Source/core/loader/DocumentLoader.h b/Source/core/loader/DocumentLoader.h
index 1406584a11bfd900398258c84350db4daa7dce3c..4afb0cbe90447589a610be6dc1ceb30241aaebee 100644
--- a/Source/core/loader/DocumentLoader.h
+++ b/Source/core/loader/DocumentLoader.h
@@ -57,6 +57,7 @@ namespace blink {
class ArchiveResourceCollection;
class ResourceFetcher;
class ContentFilter;
+ class DocumentInit;
class FormState;
class LocalFrame;
class FrameLoader;
@@ -80,7 +81,7 @@ namespace blink {
unsigned long mainResourceIdentifier() const;
- void replaceDocument(const String& source, Document*);
+ void replaceDocumentWhileExecutingJavaScriptURL(const DocumentInit&, const String& source, Document*);
const AtomicString& mimeType() const;
@@ -141,7 +142,7 @@ namespace blink {
Vector<KURL> m_redirectChain;
private:
- static PassRefPtrWillBeRawPtr<DocumentWriter> createWriterFor(LocalFrame*, const Document* ownerDocument, const KURL&, const AtomicString& mimeType, const AtomicString& encoding, bool dispatch);
+ static PassRefPtrWillBeRawPtr<DocumentWriter> createWriterFor(const Document* ownerDocument, const DocumentInit&, const AtomicString& mimeType, const AtomicString& encoding, bool dispatch);
void ensureWriter(const AtomicString& mimeType, const KURL& overridingURL = KURL());
void endWriting(DocumentWriter*);
« no previous file with comments | « Source/core/frame/LocalFrame.cpp ('k') | Source/core/loader/DocumentLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698