bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Add CefPostData::HasExcludedElements which returns true if the underlying

Browse Source 
POST data includes elements that are not represented (issue #1761).
- Add CefRequest::SetReferrer and CefRequest::GetReferrer[URL|Policy]. The
  Referer value will no longer be stored in the header map.
- Move request-related conversion logic to CefRequestImpl and standardize the
  implementation.
This commit is contained in:
Marshall Greenblatt
2015-12-01 13:22:28 -05:00
parent 2a658c414b
commit 9bc8da1e02
18 changed files with 793 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
libcef/common/request_impl.h
View File

@ -21,6 +21,7 @@ class UploadData;
class UploadDataStream;
class UploadElement;
class UploadElementReader;
class URLFetcher;
class URLRequest;
};
@ -28,6 +29,9 @@ namespace blink {
class WebURLRequest;
}
struct CefMsg_LoadRequest_Params;
struct CefNavigateParams;
// Implementation of CefRequest
class CefRequestImpl : public CefRequest {
public:
@ -35,10 +39,11 @@ class CefRequestImpl : public CefRequest {
kChangedNone = 0,
kChangedUrl = 1 << 0,
kChangedMethod = 1 << 1,
kChangedPostData = 1 << 2,
kChangedHeaderMap = 1 << 3,
kChangedFlags = 1 << 4,
kChangedFirstPartyForCookies = 1 << 5,
kChangedReferrer = 1 << 2,
kChangedPostData = 1 << 3,
kChangedHeaderMap = 1 << 4,
kChangedFlags = 1 << 5,
kChangedFirstPartyForCookies = 1 << 6,
};
CefRequestImpl();
@ -48,6 +53,10 @@ class CefRequestImpl : public CefRequest {
void SetURL(const CefString& url) override;
CefString GetMethod() override;
void SetMethod(const CefString& method) override;
void SetReferrer(const CefString& referrer_url,
ReferrerPolicy policy) override;
CefString GetReferrerURL() override;
ReferrerPolicy GetReferrerPolicy() override;
CefRefPtr<CefPostData> GetPostData() override;
void SetPostData(CefRefPtr<CefPostData> postData) override;
void GetHeaderMap(HeaderMap& headerMap) override;
@ -74,28 +83,36 @@ class CefRequestImpl : public CefRequest {
// Populate this object from the NavigationParams object.
// TODO(cef): Remove the |is_main_frame| argument once NavigationParams is
// reliable in reporting that value.
// Called from content_browser_client.cc NavigationOnUIThread().
void Set(const navigation_interception::NavigationParams& params,
bool is_main_frame);
// Populate this object from a WebURLRequest object.
// Called from CefContentRendererClient::HandleNavigation().
void Set(const blink::WebURLRequest& request);
// Populate the WebURLRequest object from this object.
// If |changed_only| is true then only the changed fields will be updated.
void Get(blink::WebURLRequest& request, bool changed_only) const;
// Called from CefRenderURLRequest::Context::Start().
void Get(blink::WebURLRequest& request, int64& upload_data_size) const;
// Populate the WebURLRequest object based on the contents of |params|.
// Called from CefBrowserImpl::LoadRequest().
static void Get(const CefMsg_LoadRequest_Params& params,
blink::WebURLRequest& request);
// Populate the CefNavigateParams object from this object.
// Called from CefBrowserHostImpl::LoadRequest().
void Get(CefNavigateParams& params) const;
// Populate the URLFetcher object from this object.
// Called from CefBrowserURLRequest::Context::ContinueOnOriginatingThread().
void Get(net::URLFetcher& fetcher, int64& upload_data_size) const;
void SetReadOnly(bool read_only);
void SetTrackChanges(bool track_changes);
uint8 GetChanges() const;
static void GetHeaderMap(const net::HttpRequestHeaders& headers,
HeaderMap& map);
static void GetHeaderMap(const blink::WebURLRequest& request,
HeaderMap& map);
static void SetHeaderMap(const HeaderMap& map,
blink::WebURLRequest& request);
private:
void Changed(uint8 changes);
bool ShouldSet(uint8 changes, bool changed_only) const;
@ -104,6 +121,8 @@ class CefRequestImpl : public CefRequest {
CefString url_;
CefString method_;
CefString referrer_url_;
ReferrerPolicy referrer_policy_;
CefRefPtr<CefPostData> postdata_;
HeaderMap headermap_;
ResourceType resource_type_;
@ -134,6 +153,7 @@ class CefPostDataImpl : public CefPostData {
CefPostDataImpl();
bool IsReadOnly() override;
bool HasExcludedElements() override;
size_t GetElementCount() override;
void GetElements(ElementVector& elements) override;
bool RemoveElement(CefRefPtr<CefPostDataElement> element) override;
@ -160,6 +180,9 @@ class CefPostDataImpl : public CefPostData {
// True if this object is read-only.
bool read_only_;
// True if this object has excluded elements.
bool has_excluded_elements_;
// True if this object should track changes.
bool track_changes_;