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

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

Issue 2461043003: Fix for the RedirectTest.ClientServerServer test. (Closed)
Patch Set: More build error fixes Created 4 years, 1 month 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 13 matching lines...) Expand all
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
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 #ifndef WebDataSourceImpl_h 31 #ifndef WebDataSourceImpl_h
32 #define WebDataSourceImpl_h 32 #define WebDataSourceImpl_h
33 33
34 #include "core/frame/FrameTypes.h"
34 #include "core/loader/DocumentLoader.h" 35 #include "core/loader/DocumentLoader.h"
35 #include "platform/exported/WrappedResourceRequest.h" 36 #include "platform/exported/WrappedResourceRequest.h"
36 #include "platform/exported/WrappedResourceResponse.h" 37 #include "platform/exported/WrappedResourceResponse.h"
37 #include "platform/heap/Handle.h" 38 #include "platform/heap/Handle.h"
38 #include "platform/weborigin/KURL.h" 39 #include "platform/weborigin/KURL.h"
39 #include "public/web/WebDataSource.h" 40 #include "public/web/WebDataSource.h"
40 #include "wtf/Vector.h" 41 #include "wtf/Vector.h"
41 #include <memory> 42 #include <memory>
42 43
43 namespace blink { 44 namespace blink {
44 45
45 class WebDataSourceImpl final : public DocumentLoader, public WebDataSource { 46 class WebDataSourceImpl final : public DocumentLoader, public WebDataSource {
46 public: 47 public:
47 static WebDataSourceImpl* create(LocalFrame*, 48 static WebDataSourceImpl* create(LocalFrame*,
48 const ResourceRequest&, 49 const ResourceRequest&,
49 const SubstituteData&); 50 const SubstituteData&,
51 ClientRedirectPolicy);
50 52
51 static WebDataSourceImpl* fromDocumentLoader(DocumentLoader* loader) { 53 static WebDataSourceImpl* fromDocumentLoader(DocumentLoader* loader) {
52 return static_cast<WebDataSourceImpl*>(loader); 54 return static_cast<WebDataSourceImpl*>(loader);
53 } 55 }
54 56
55 // WebDataSource methods: 57 // WebDataSource methods:
56 const WebURLRequest& originalRequest() const override; 58 const WebURLRequest& originalRequest() const override;
57 const WebURLRequest& request() const override; 59 const WebURLRequest& request() const override;
58 const WebURLResponse& response() const override; 60 const WebURLResponse& response() const override;
59 bool hasUnreachableURL() const override; 61 bool hasUnreachableURL() const override;
(...skipping 10 matching lines...) Expand all
70 double redirectEndTime, 72 double redirectEndTime,
71 double fetchStartTime, 73 double fetchStartTime,
72 const WebVector<WebURL>& redirectChain) override; 74 const WebVector<WebURL>& redirectChain) override;
73 void setSubresourceFilter(WebDocumentSubresourceFilter*) override; 75 void setSubresourceFilter(WebDocumentSubresourceFilter*) override;
74 76
75 static WebNavigationType toWebNavigationType(NavigationType); 77 static WebNavigationType toWebNavigationType(NavigationType);
76 78
77 DECLARE_VIRTUAL_TRACE(); 79 DECLARE_VIRTUAL_TRACE();
78 80
79 private: 81 private:
80 WebDataSourceImpl(LocalFrame*, const ResourceRequest&, const SubstituteData&); 82 WebDataSourceImpl(LocalFrame*,
83 const ResourceRequest&,
84 const SubstituteData&,
85 ClientRedirectPolicy);
81 ~WebDataSourceImpl() override; 86 ~WebDataSourceImpl() override;
82 void detachFromFrame() override; 87 void detachFromFrame() override;
83 String debugName() const override { return "WebDataSourceImpl"; } 88 String debugName() const override { return "WebDataSourceImpl"; }
84 89
85 // Mutable because the const getters will magically sync these to the 90 // Mutable because the const getters will magically sync these to the
86 // latest version from WebKit. 91 // latest version from WebKit.
87 mutable WrappedResourceRequest m_originalRequestWrapper; 92 mutable WrappedResourceRequest m_originalRequestWrapper;
88 mutable WrappedResourceRequest m_requestWrapper; 93 mutable WrappedResourceRequest m_requestWrapper;
89 mutable WrappedResourceResponse m_responseWrapper; 94 mutable WrappedResourceResponse m_responseWrapper;
90 95
91 std::unique_ptr<ExtraData> m_extraData; 96 std::unique_ptr<ExtraData> m_extraData;
92 }; 97 };
93 98
94 } // namespace blink 99 } // namespace blink
95 100
96 #endif // WebDataSourceImpl_h 101 #endif // WebDataSourceImpl_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp ('k') | third_party/WebKit/Source/web/WebDataSourceImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698