| 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 24 matching lines...) Expand all Loading... |
| 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/PtrUtil.h" |
| 39 #include <memory> | 39 #include <memory> |
| 40 | 40 |
| 41 namespace blink { | 41 namespace blink { |
| 42 | 42 |
| 43 WebDataSourceImpl* WebDataSourceImpl::create(LocalFrame* frame, | 43 WebDataSourceImpl* WebDataSourceImpl::create(LocalFrame* frame, |
| 44 const ResourceRequest& request, | 44 const ResourceRequest& request, |
| 45 const SubstituteData& data) { | 45 const SubstituteData& data, |
| 46 return new WebDataSourceImpl(frame, request, data); | 46 bool clientRedirect) { |
| 47 return new WebDataSourceImpl(frame, request, data, clientRedirect); |
| 47 } | 48 } |
| 48 | 49 |
| 49 const WebURLRequest& WebDataSourceImpl::originalRequest() const { | 50 const WebURLRequest& WebDataSourceImpl::originalRequest() const { |
| 50 return m_originalRequestWrapper; | 51 return m_originalRequestWrapper; |
| 51 } | 52 } |
| 52 | 53 |
| 53 const WebURLRequest& WebDataSourceImpl::request() const { | 54 const WebURLRequest& WebDataSourceImpl::request() const { |
| 54 return m_requestWrapper; | 55 return m_requestWrapper; |
| 55 } | 56 } |
| 56 | 57 |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 case NavigationTypeFormResubmitted: | 130 case NavigationTypeFormResubmitted: |
| 130 return WebNavigationTypeFormResubmitted; | 131 return WebNavigationTypeFormResubmitted; |
| 131 case NavigationTypeOther: | 132 case NavigationTypeOther: |
| 132 default: | 133 default: |
| 133 return WebNavigationTypeOther; | 134 return WebNavigationTypeOther; |
| 134 } | 135 } |
| 135 } | 136 } |
| 136 | 137 |
| 137 WebDataSourceImpl::WebDataSourceImpl(LocalFrame* frame, | 138 WebDataSourceImpl::WebDataSourceImpl(LocalFrame* frame, |
| 138 const ResourceRequest& request, | 139 const ResourceRequest& request, |
| 139 const SubstituteData& data) | 140 const SubstituteData& data, |
| 140 : DocumentLoader(frame, request, data), | 141 bool clientRedirect) |
| 142 : DocumentLoader(frame, request, data, clientRedirect), |
| 141 m_originalRequestWrapper(DocumentLoader::originalRequest()), | 143 m_originalRequestWrapper(DocumentLoader::originalRequest()), |
| 142 m_requestWrapper(DocumentLoader::request()), | 144 m_requestWrapper(DocumentLoader::request()), |
| 143 m_responseWrapper(DocumentLoader::response()) {} | 145 m_responseWrapper(DocumentLoader::response()) {} |
| 144 | 146 |
| 145 WebDataSourceImpl::~WebDataSourceImpl() { | 147 WebDataSourceImpl::~WebDataSourceImpl() { |
| 146 // Verify that detachFromFrame() has been called. | 148 // Verify that detachFromFrame() has been called. |
| 147 DCHECK(!m_extraData); | 149 DCHECK(!m_extraData); |
| 148 } | 150 } |
| 149 | 151 |
| 150 void WebDataSourceImpl::detachFromFrame() { | 152 void WebDataSourceImpl::detachFromFrame() { |
| 151 DocumentLoader::detachFromFrame(); | 153 DocumentLoader::detachFromFrame(); |
| 152 m_extraData.reset(); | 154 m_extraData.reset(); |
| 153 } | 155 } |
| 154 | 156 |
| 155 void WebDataSourceImpl::setSubresourceFilter( | 157 void WebDataSourceImpl::setSubresourceFilter( |
| 156 WebDocumentSubresourceFilter* subresourceFilter) { | 158 WebDocumentSubresourceFilter* subresourceFilter) { |
| 157 DocumentLoader::setSubresourceFilter(WTF::wrapUnique(subresourceFilter)); | 159 DocumentLoader::setSubresourceFilter(WTF::wrapUnique(subresourceFilter)); |
| 158 } | 160 } |
| 159 | 161 |
| 160 DEFINE_TRACE(WebDataSourceImpl) { | 162 DEFINE_TRACE(WebDataSourceImpl) { |
| 161 DocumentLoader::trace(visitor); | 163 DocumentLoader::trace(visitor); |
| 162 } | 164 } |
| 163 | 165 |
| 164 } // namespace blink | 166 } // namespace blink |
| OLD | NEW |