From 79a702895e17d13056da5454830de5a9244b4f04 Mon Sep 17 00:00:00 2001 From: "creis@chromium.org" Date: Mon, 3 Mar 2014 21:29:35 +0000 Subject: Update resource requests to remove redundant frame ID. BUG=314791 TEST=No behavior change. R=battre@chromium.org, nasko@chromium.org TBR=dcheng@chromium.org, jochen@chromium.org Review URL: https://codereview.chromium.org/184873004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254566 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/loader/resource_request_info_impl.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'content/browser/loader/resource_request_info_impl.h') diff --git a/content/browser/loader/resource_request_info_impl.h b/content/browser/loader/resource_request_info_impl.h index 2284274..82c81c0 100644 --- a/content/browser/loader/resource_request_info_impl.h +++ b/content/browser/loader/resource_request_info_impl.h @@ -47,9 +47,8 @@ class ResourceRequestInfoImpl : public ResourceRequestInfo, int request_id, int render_frame_id, bool is_main_frame, - int64 frame_id, bool parent_is_main_frame, - int64 parent_frame_id, + int parent_render_frame_id, ResourceType::Type resource_type, PageTransition transition_type, bool should_replace_current_entry, @@ -72,9 +71,8 @@ class ResourceRequestInfoImpl : public ResourceRequestInfo, virtual int GetRequestID() const OVERRIDE; virtual int GetRenderFrameID() const OVERRIDE; virtual bool IsMainFrame() const OVERRIDE; - virtual int64 GetFrameID() const OVERRIDE; virtual bool ParentIsMainFrame() const OVERRIDE; - virtual int64 GetParentFrameID() const OVERRIDE; + virtual int GetParentRenderFrameID() const OVERRIDE; virtual ResourceType::Type GetResourceType() const OVERRIDE; virtual int GetProcessType() const OVERRIDE; virtual blink::WebReferrerPolicy GetReferrerPolicy() const OVERRIDE; @@ -106,8 +104,7 @@ class ResourceRequestInfoImpl : public ResourceRequestInfo, int route_id, int origin_pid, int request_id, - int64 frame_id, - int64 parent_frame_id, + int parent_render_frame_id, base::WeakPtr filter); // CrossSiteResourceHandler for this request. May be null. @@ -171,9 +168,8 @@ class ResourceRequestInfoImpl : public ResourceRequestInfo, int request_id_; int render_frame_id_; bool is_main_frame_; - int64 frame_id_; bool parent_is_main_frame_; - int64 parent_frame_id_; + int parent_render_frame_id_; bool should_replace_current_entry_; bool is_download_; bool is_stream_; -- cgit v1.1