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

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

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. 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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 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 19 matching lines...) Expand all
30 30
31 #ifndef WebDataSourceImpl_h 31 #ifndef WebDataSourceImpl_h
32 #define WebDataSourceImpl_h 32 #define WebDataSourceImpl_h
33 33
34 #include "core/loader/DocumentLoader.h" 34 #include "core/loader/DocumentLoader.h"
35 #include "platform/exported/WrappedResourceRequest.h" 35 #include "platform/exported/WrappedResourceRequest.h"
36 #include "platform/exported/WrappedResourceResponse.h" 36 #include "platform/exported/WrappedResourceResponse.h"
37 #include "platform/heap/Handle.h" 37 #include "platform/heap/Handle.h"
38 #include "platform/weborigin/KURL.h" 38 #include "platform/weborigin/KURL.h"
39 #include "public/web/WebDataSource.h" 39 #include "public/web/WebDataSource.h"
40 #include "wtf/OwnPtr.h"
41 #include "wtf/PassOwnPtr.h"
42 #include "wtf/Vector.h" 40 #include "wtf/Vector.h"
41 #include <memory>
43 42
44 namespace blink { 43 namespace blink {
45 44
46 class WebDataSourceImpl final : public DocumentLoader, public WebDataSource { 45 class WebDataSourceImpl final : public DocumentLoader, public WebDataSource {
47 public: 46 public:
48 static WebDataSourceImpl* create(LocalFrame*, const ResourceRequest&, const SubstituteData&); 47 static WebDataSourceImpl* create(LocalFrame*, const ResourceRequest&, const SubstituteData&);
49 48
50 static WebDataSourceImpl* fromDocumentLoader(DocumentLoader* loader) 49 static WebDataSourceImpl* fromDocumentLoader(DocumentLoader* loader)
51 { 50 {
52 return static_cast<WebDataSourceImpl*>(loader); 51 return static_cast<WebDataSourceImpl*>(loader);
(...skipping 24 matching lines...) Expand all
77 ~WebDataSourceImpl() override; 76 ~WebDataSourceImpl() override;
78 void detachFromFrame() override; 77 void detachFromFrame() override;
79 String debugName() const override { return "WebDataSourceImpl"; } 78 String debugName() const override { return "WebDataSourceImpl"; }
80 79
81 // Mutable because the const getters will magically sync these to the 80 // Mutable because the const getters will magically sync these to the
82 // latest version from WebKit. 81 // latest version from WebKit.
83 mutable WrappedResourceRequest m_originalRequestWrapper; 82 mutable WrappedResourceRequest m_originalRequestWrapper;
84 mutable WrappedResourceRequest m_requestWrapper; 83 mutable WrappedResourceRequest m_requestWrapper;
85 mutable WrappedResourceResponse m_responseWrapper; 84 mutable WrappedResourceResponse m_responseWrapper;
86 85
87 OwnPtr<ExtraData> m_extraData; 86 std::unique_ptr<ExtraData> m_extraData;
88 }; 87 };
89 88
90 } // namespace blink 89 } // namespace blink
91 90
92 #endif // WebDataSourceImpl_h 91 #endif // WebDataSourceImpl_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebDOMActivityLogger.cpp ('k') | third_party/WebKit/Source/web/WebDataSourceImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698