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

Side by Side Diff: third_party/WebKit/Source/web/AssociatedURLLoader.h

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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) 2010, 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2010, 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 17 matching lines...) Expand all
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #ifndef AssociatedURLLoader_h 31 #ifndef AssociatedURLLoader_h
32 #define AssociatedURLLoader_h 32 #define AssociatedURLLoader_h
33 33
34 #include "platform/heap/Handle.h" 34 #include "platform/heap/Handle.h"
35 #include "public/platform/WebURLLoader.h" 35 #include "public/platform/WebURLLoader.h"
36 #include "public/web/WebURLLoaderOptions.h" 36 #include "public/web/WebURLLoaderOptions.h"
37 #include "wtf/Noncopyable.h" 37 #include "wtf/Noncopyable.h"
38 #include "wtf/OwnPtr.h"
38 #include "wtf/RefPtr.h" 39 #include "wtf/RefPtr.h"
39 #include <memory>
40 40
41 namespace blink { 41 namespace blink {
42 42
43 class DocumentThreadableLoader; 43 class DocumentThreadableLoader;
44 class WebLocalFrameImpl; 44 class WebLocalFrameImpl;
45 45
46 // This class is used to implement WebFrame::createAssociatedURLLoader. 46 // This class is used to implement WebFrame::createAssociatedURLLoader.
47 class AssociatedURLLoader final : public WebURLLoader { 47 class AssociatedURLLoader final : public WebURLLoader {
48 WTF_MAKE_NONCOPYABLE(AssociatedURLLoader); 48 WTF_MAKE_NONCOPYABLE(AssociatedURLLoader);
49 public: 49 public:
(...skipping 26 matching lines...) Expand all
76 WebURLLoaderClient* client = m_client; 76 WebURLLoaderClient* client = m_client;
77 m_client = nullptr; 77 m_client = nullptr;
78 return client; 78 return client;
79 } 79 }
80 80
81 WebURLLoaderClient* m_client; 81 WebURLLoaderClient* m_client;
82 WebURLLoaderOptions m_options; 82 WebURLLoaderOptions m_options;
83 83
84 // An adapter which converts the DocumentThreadableLoaderClient method 84 // An adapter which converts the DocumentThreadableLoaderClient method
85 // calls into the WebURLLoaderClient method calls. 85 // calls into the WebURLLoaderClient method calls.
86 std::unique_ptr<ClientAdapter> m_clientAdapter; 86 OwnPtr<ClientAdapter> m_clientAdapter;
87 std::unique_ptr<DocumentThreadableLoader> m_loader; 87 OwnPtr<DocumentThreadableLoader> m_loader;
88 88
89 // A ContextLifecycleObserver for cancelling |m_loader| when the Document 89 // A ContextLifecycleObserver for cancelling |m_loader| when the Document
90 // is detached. 90 // is detached.
91 Persistent<Observer> m_observer; 91 Persistent<Observer> m_observer;
92 }; 92 };
93 93
94 } // namespace blink 94 } // namespace blink
95 95
96 #endif 96 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/weborigin/SecurityPolicy.cpp ('k') | third_party/WebKit/Source/web/AssociatedURLLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698