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

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

Issue 2461043003: Fix for the RedirectTest.ClientServerServer test. (Closed)
Patch Set: More build errors 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 28 matching lines...) Expand all
39 #include "public/web/WebDataSource.h" 39 #include "public/web/WebDataSource.h"
40 #include "wtf/Vector.h" 40 #include "wtf/Vector.h"
41 #include <memory> 41 #include <memory>
42 42
43 namespace blink { 43 namespace blink {
44 44
45 class WebDataSourceImpl final : public DocumentLoader, public WebDataSource { 45 class WebDataSourceImpl final : public DocumentLoader, public WebDataSource {
46 public: 46 public:
47 static WebDataSourceImpl* create(LocalFrame*, 47 static WebDataSourceImpl* create(LocalFrame*,
48 const ResourceRequest&, 48 const ResourceRequest&,
49 const SubstituteData&); 49 const SubstituteData&,
50 bool clientRedirect);
50 51
51 static WebDataSourceImpl* fromDocumentLoader(DocumentLoader* loader) { 52 static WebDataSourceImpl* fromDocumentLoader(DocumentLoader* loader) {
52 return static_cast<WebDataSourceImpl*>(loader); 53 return static_cast<WebDataSourceImpl*>(loader);
53 } 54 }
54 55
55 // WebDataSource methods: 56 // WebDataSource methods:
56 const WebURLRequest& originalRequest() const override; 57 const WebURLRequest& originalRequest() const override;
57 const WebURLRequest& request() const override; 58 const WebURLRequest& request() const override;
58 const WebURLResponse& response() const override; 59 const WebURLResponse& response() const override;
59 bool hasUnreachableURL() const override; 60 bool hasUnreachableURL() const override;
(...skipping 10 matching lines...) Expand all
70 double redirectEndTime, 71 double redirectEndTime,
71 double fetchStartTime, 72 double fetchStartTime,
72 const WebVector<WebURL>& redirectChain) override; 73 const WebVector<WebURL>& redirectChain) override;
73 void setSubresourceFilter(WebDocumentSubresourceFilter*) override; 74 void setSubresourceFilter(WebDocumentSubresourceFilter*) override;
74 75
75 static WebNavigationType toWebNavigationType(NavigationType); 76 static WebNavigationType toWebNavigationType(NavigationType);
76 77
77 DECLARE_VIRTUAL_TRACE(); 78 DECLARE_VIRTUAL_TRACE();
78 79
79 private: 80 private:
80 WebDataSourceImpl(LocalFrame*, const ResourceRequest&, const SubstituteData&); 81 WebDataSourceImpl(LocalFrame*,
82 const ResourceRequest&,
83 const SubstituteData&,
84 bool clientRedirect);
81 ~WebDataSourceImpl() override; 85 ~WebDataSourceImpl() override;
82 void detachFromFrame() override; 86 void detachFromFrame() override;
83 String debugName() const override { return "WebDataSourceImpl"; } 87 String debugName() const override { return "WebDataSourceImpl"; }
84 88
85 // Mutable because the const getters will magically sync these to the 89 // Mutable because the const getters will magically sync these to the
86 // latest version from WebKit. 90 // latest version from WebKit.
87 mutable WrappedResourceRequest m_originalRequestWrapper; 91 mutable WrappedResourceRequest m_originalRequestWrapper;
88 mutable WrappedResourceRequest m_requestWrapper; 92 mutable WrappedResourceRequest m_requestWrapper;
89 mutable WrappedResourceResponse m_responseWrapper; 93 mutable WrappedResourceResponse m_responseWrapper;
90 94
91 std::unique_ptr<ExtraData> m_extraData; 95 std::unique_ptr<ExtraData> m_extraData;
92 }; 96 };
93 97
94 } // namespace blink 98 } // namespace blink
95 99
96 #endif // WebDataSourceImpl_h 100 #endif // WebDataSourceImpl_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698