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