| 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 const ResourceRequest& request, | 45 const ResourceRequest& request, |
| 46 const SubstituteData& data, | 46 const SubstituteData& data, |
| 47 ClientRedirectPolicy clientRedirectPolicy) { | 47 ClientRedirectPolicy clientRedirectPolicy) { |
| 48 return new WebDataSourceImpl(frame, request, data, clientRedirectPolicy); | 48 return new WebDataSourceImpl(frame, request, data, clientRedirectPolicy); |
| 49 } | 49 } |
| 50 | 50 |
| 51 const WebURLRequest& WebDataSourceImpl::originalRequest() const { | 51 const WebURLRequest& WebDataSourceImpl::originalRequest() const { |
| 52 return m_originalRequestWrapper; | 52 return m_originalRequestWrapper; |
| 53 } | 53 } |
| 54 | 54 |
| 55 const WebURLRequest& WebDataSourceImpl::request() const { | 55 const WebURLRequest& WebDataSourceImpl::getRequest() const { |
| 56 return m_requestWrapper; | 56 return m_requestWrapper; |
| 57 } | 57 } |
| 58 | 58 |
| 59 const WebURLResponse& WebDataSourceImpl::response() const { | 59 const WebURLResponse& WebDataSourceImpl::response() const { |
| 60 return m_responseWrapper; | 60 return m_responseWrapper; |
| 61 } | 61 } |
| 62 | 62 |
| 63 bool WebDataSourceImpl::hasUnreachableURL() const { | 63 bool WebDataSourceImpl::hasUnreachableURL() const { |
| 64 return !DocumentLoader::unreachableURL().isEmpty(); | 64 return !DocumentLoader::unreachableURL().isEmpty(); |
| 65 } | 65 } |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 return WebNavigationTypeOther; | 135 return WebNavigationTypeOther; |
| 136 } | 136 } |
| 137 } | 137 } |
| 138 | 138 |
| 139 WebDataSourceImpl::WebDataSourceImpl(LocalFrame* frame, | 139 WebDataSourceImpl::WebDataSourceImpl(LocalFrame* frame, |
| 140 const ResourceRequest& request, | 140 const ResourceRequest& request, |
| 141 const SubstituteData& data, | 141 const SubstituteData& data, |
| 142 ClientRedirectPolicy clientRedirectPolicy) | 142 ClientRedirectPolicy clientRedirectPolicy) |
| 143 : DocumentLoader(frame, request, data, clientRedirectPolicy), | 143 : DocumentLoader(frame, request, data, clientRedirectPolicy), |
| 144 m_originalRequestWrapper(DocumentLoader::originalRequest()), | 144 m_originalRequestWrapper(DocumentLoader::originalRequest()), |
| 145 m_requestWrapper(DocumentLoader::request()), | 145 m_requestWrapper(DocumentLoader::getRequest()), |
| 146 m_responseWrapper(DocumentLoader::response()) {} | 146 m_responseWrapper(DocumentLoader::response()) {} |
| 147 | 147 |
| 148 WebDataSourceImpl::~WebDataSourceImpl() { | 148 WebDataSourceImpl::~WebDataSourceImpl() { |
| 149 // Verify that detachFromFrame() has been called. | 149 // Verify that detachFromFrame() has been called. |
| 150 DCHECK(!m_extraData); | 150 DCHECK(!m_extraData); |
| 151 } | 151 } |
| 152 | 152 |
| 153 void WebDataSourceImpl::detachFromFrame() { | 153 void WebDataSourceImpl::detachFromFrame() { |
| 154 DocumentLoader::detachFromFrame(); | 154 DocumentLoader::detachFromFrame(); |
| 155 m_extraData.reset(); | 155 m_extraData.reset(); |
| 156 } | 156 } |
| 157 | 157 |
| 158 void WebDataSourceImpl::setSubresourceFilter( | 158 void WebDataSourceImpl::setSubresourceFilter( |
| 159 WebDocumentSubresourceFilter* subresourceFilter) { | 159 WebDocumentSubresourceFilter* subresourceFilter) { |
| 160 DocumentLoader::setSubresourceFilter(WTF::wrapUnique(subresourceFilter)); | 160 DocumentLoader::setSubresourceFilter(WTF::wrapUnique(subresourceFilter)); |
| 161 } | 161 } |
| 162 | 162 |
| 163 DEFINE_TRACE(WebDataSourceImpl) { | 163 DEFINE_TRACE(WebDataSourceImpl) { |
| 164 DocumentLoader::trace(visitor); | 164 DocumentLoader::trace(visitor); |
| 165 } | 165 } |
| 166 | 166 |
| 167 } // namespace blink | 167 } // namespace blink |
| OLD | NEW |