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

Side by Side Diff: third_party/WebKit/Source/core/loader/DocumentLoader.h

Issue 1685003002: Plumb the correct owner document through DocumentInit::m_owner. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 9 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009 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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 return adoptRefWillBeNoop(new DocumentLoader(frame, request, data)); 66 return adoptRefWillBeNoop(new DocumentLoader(frame, request, data));
67 } 67 }
68 ~DocumentLoader() override; 68 ~DocumentLoader() override;
69 69
70 LocalFrame* frame() const { return m_frame; } 70 LocalFrame* frame() const { return m_frame; }
71 71
72 virtual void detachFromFrame(); 72 virtual void detachFromFrame();
73 73
74 unsigned long mainResourceIdentifier() const; 74 unsigned long mainResourceIdentifier() const;
75 75
76 void replaceDocumentWhileExecutingJavaScriptURL(const DocumentInit&, const S tring& source, Document*); 76 void replaceDocumentWhileExecutingJavaScriptURL(const DocumentInit&, const S tring& source);
77 77
78 const AtomicString& mimeType() const; 78 const AtomicString& mimeType() const;
79 79
80 const ResourceRequest& originalRequest() const; 80 const ResourceRequest& originalRequest() const;
81 81
82 const ResourceRequest& request() const; 82 const ResourceRequest& request() const;
83 83
84 ResourceFetcher* fetcher() const { return m_fetcher.get(); } 84 ResourceFetcher* fetcher() const { return m_fetcher.get(); }
85 85
86 const SubstituteData& substituteData() const { return m_substituteData; } 86 const SubstituteData& substituteData() const { return m_substituteData; }
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 Resource* startPreload(Resource::Type, FetchRequest&); 146 Resource* startPreload(Resource::Type, FetchRequest&);
147 147
148 DECLARE_VIRTUAL_TRACE(); 148 DECLARE_VIRTUAL_TRACE();
149 149
150 protected: 150 protected:
151 DocumentLoader(LocalFrame*, const ResourceRequest&, const SubstituteData&); 151 DocumentLoader(LocalFrame*, const ResourceRequest&, const SubstituteData&);
152 152
153 Vector<KURL> m_redirectChain; 153 Vector<KURL> m_redirectChain;
154 154
155 private: 155 private:
156 static PassRefPtrWillBeRawPtr<DocumentWriter> createWriterFor(const Document * ownerDocument, const DocumentInit&, const AtomicString& mimeType, const Atomic String& encoding, bool dispatch, ParserSynchronizationPolicy); 156 static PassRefPtrWillBeRawPtr<DocumentWriter> createWriterFor(const Document Init&, const AtomicString& mimeType, const AtomicString& encoding, bool dispatch , ParserSynchronizationPolicy);
157 157
158 void ensureWriter(const AtomicString& mimeType, const KURL& overridingURL = KURL()); 158 void ensureWriter(const AtomicString& mimeType, const KURL& overridingURL = KURL());
159 void endWriting(DocumentWriter*); 159 void endWriting(DocumentWriter*);
160 160
161 Document* document() const; 161 Document* document() const;
162 FrameLoader* frameLoader() const; 162 FrameLoader* frameLoader() const;
163 163
164 void commitIfReady(); 164 void commitIfReady();
165 void commitData(const char* bytes, size_t length); 165 void commitData(const char* bytes, size_t length);
166 ResourceLoader* mainResourceLoader() const; 166 ResourceLoader* mainResourceLoader() const;
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 // Used to protect against reentrancy into dataReceived(). 234 // Used to protect against reentrancy into dataReceived().
235 bool m_inDataReceived; 235 bool m_inDataReceived;
236 RefPtr<SharedBuffer> m_dataBuffer; 236 RefPtr<SharedBuffer> m_dataBuffer;
237 }; 237 };
238 238
239 DECLARE_WEAK_IDENTIFIER_MAP(DocumentLoader); 239 DECLARE_WEAK_IDENTIFIER_MAP(DocumentLoader);
240 240
241 } // namespace blink 241 } // namespace blink
242 242
243 #endif // DocumentLoader_h 243 #endif // DocumentLoader_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698