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 19 matching lines...) Expand all Loading... |
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/WebURL.h" | 34 #include "public/platform/WebURL.h" |
35 #include "public/platform/WebURLError.h" | 35 #include "public/platform/WebURLError.h" |
36 #include "public/platform/WebVector.h" | 36 #include "public/platform/WebVector.h" |
37 | 37 |
38 namespace blink { | 38 namespace blink { |
39 | 39 |
40 RawPtr<WebDataSourceImpl> WebDataSourceImpl::create(LocalFrame* frame, const Res
ourceRequest& request, const SubstituteData& data) | 40 WebDataSourceImpl* WebDataSourceImpl::create(LocalFrame* frame, const ResourceRe
quest& request, const SubstituteData& data) |
41 { | 41 { |
42 return new WebDataSourceImpl(frame, request, data); | 42 return new WebDataSourceImpl(frame, request, data); |
43 } | 43 } |
44 | 44 |
45 const WebURLRequest& WebDataSourceImpl::originalRequest() const | 45 const WebURLRequest& WebDataSourceImpl::originalRequest() const |
46 { | 46 { |
47 m_originalRequestWrapper.bind(DocumentLoader::originalRequest()); | 47 m_originalRequestWrapper.bind(DocumentLoader::originalRequest()); |
48 return m_originalRequestWrapper; | 48 return m_originalRequestWrapper; |
49 } | 49 } |
50 | 50 |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 } | 136 } |
137 | 137 |
138 WebDataSourceImpl::~WebDataSourceImpl() | 138 WebDataSourceImpl::~WebDataSourceImpl() |
139 { | 139 { |
140 // Verify that detachFromFrame() has been called. | 140 // Verify that detachFromFrame() has been called. |
141 DCHECK(!m_extraData); | 141 DCHECK(!m_extraData); |
142 } | 142 } |
143 | 143 |
144 void WebDataSourceImpl::detachFromFrame() | 144 void WebDataSourceImpl::detachFromFrame() |
145 { | 145 { |
146 RawPtr<DocumentLoader> protect(this); | |
147 | |
148 DocumentLoader::detachFromFrame(); | 146 DocumentLoader::detachFromFrame(); |
149 m_extraData.clear(); | 147 m_extraData.clear(); |
150 } | 148 } |
151 | 149 |
152 DEFINE_TRACE(WebDataSourceImpl) | 150 DEFINE_TRACE(WebDataSourceImpl) |
153 { | 151 { |
154 DocumentLoader::trace(visitor); | 152 DocumentLoader::trace(visitor); |
155 } | 153 } |
156 | 154 |
157 } // namespace blink | 155 } // namespace blink |
OLD | NEW |