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

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

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) 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 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 #include "web/WebDataSourceImpl.h" 31 #include "web/WebDataSourceImpl.h"
32 32
33 #include "core/dom/Document.h" 33 #include "core/dom/Document.h"
34 #include "public/platform/WebDocumentSubresourceFilter.h" 34 #include "public/platform/WebDocumentSubresourceFilter.h"
35 #include "public/platform/WebURL.h" 35 #include "public/platform/WebURL.h"
36 #include "public/platform/WebURLError.h" 36 #include "public/platform/WebURLError.h"
37 #include "public/platform/WebVector.h" 37 #include "public/platform/WebVector.h"
38 #include "wtf/PtrUtil.h" 38 #include "wtf/PassOwnPtr.h"
39 #include <memory>
40 39
41 namespace blink { 40 namespace blink {
42 41
43 WebDataSourceImpl* WebDataSourceImpl::create(LocalFrame* frame, const ResourceRe quest& request, const SubstituteData& data) 42 WebDataSourceImpl* WebDataSourceImpl::create(LocalFrame* frame, const ResourceRe quest& request, const SubstituteData& data)
44 { 43 {
45 return new WebDataSourceImpl(frame, request, data); 44 return new WebDataSourceImpl(frame, request, data);
46 } 45 }
47 46
48 const WebURLRequest& WebDataSourceImpl::originalRequest() const 47 const WebURLRequest& WebDataSourceImpl::originalRequest() const
49 { 48 {
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 return toWebNavigationType(DocumentLoader::getNavigationType()); 97 return toWebNavigationType(DocumentLoader::getNavigationType());
99 } 98 }
100 99
101 WebDataSource::ExtraData* WebDataSourceImpl::getExtraData() const 100 WebDataSource::ExtraData* WebDataSourceImpl::getExtraData() const
102 { 101 {
103 return m_extraData.get(); 102 return m_extraData.get();
104 } 103 }
105 104
106 void WebDataSourceImpl::setExtraData(ExtraData* extraData) 105 void WebDataSourceImpl::setExtraData(ExtraData* extraData)
107 { 106 {
108 // extraData can't be a std::unique_ptr because setExtraData is a WebKit API function. 107 // extraData can't be a PassOwnPtr because setExtraData is a WebKit API func tion.
109 m_extraData = wrapUnique(extraData); 108 m_extraData = adoptPtr(extraData);
110 } 109 }
111 110
112 void WebDataSourceImpl::setNavigationStartTime(double navigationStart) 111 void WebDataSourceImpl::setNavigationStartTime(double navigationStart)
113 { 112 {
114 timing().setNavigationStart(navigationStart); 113 timing().setNavigationStart(navigationStart);
115 } 114 }
116 115
117 WebNavigationType WebDataSourceImpl::toWebNavigationType(NavigationType type) 116 WebNavigationType WebDataSourceImpl::toWebNavigationType(NavigationType type)
118 { 117 {
119 switch (type) { 118 switch (type) {
(...skipping 25 matching lines...) Expand all
145 } 144 }
146 145
147 void WebDataSourceImpl::detachFromFrame() 146 void WebDataSourceImpl::detachFromFrame()
148 { 147 {
149 DocumentLoader::detachFromFrame(); 148 DocumentLoader::detachFromFrame();
150 m_extraData.reset(); 149 m_extraData.reset();
151 } 150 }
152 151
153 void WebDataSourceImpl::setSubresourceFilter(WebDocumentSubresourceFilter* subre sourceFilter) 152 void WebDataSourceImpl::setSubresourceFilter(WebDocumentSubresourceFilter* subre sourceFilter)
154 { 153 {
155 DocumentLoader::setSubresourceFilter(WTF::wrapUnique(subresourceFilter)); 154 DocumentLoader::setSubresourceFilter(WTF::adoptPtr(subresourceFilter));
156 } 155 }
157 156
158 DEFINE_TRACE(WebDataSourceImpl) 157 DEFINE_TRACE(WebDataSourceImpl)
159 { 158 {
160 DocumentLoader::trace(visitor); 159 DocumentLoader::trace(visitor);
161 } 160 }
162 161
163 } // namespace blink 162 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebDataSourceImpl.h ('k') | third_party/WebKit/Source/web/WebDevToolsAgentImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698