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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/api/web_navigation/web_navigation_api.cc

Issue 10808097: Revert 148074 - Pass the render process id to the FrameNavigationState. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/api/web_navigation/web_navigation_api.h ('k') | chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
===================================================================
--- chrome/browser/extensions/api/web_navigation/web_navigation_api.cc (revision 148085)
+++ chrome/browser/extensions/api/web_navigation/web_navigation_api.cc (working copy)
@@ -180,10 +180,7 @@
const FrameNavigationState& frame_navigation_state =
tab_observer->frame_navigation_state();
- FrameNavigationState::FrameID frame_id(
- details->source_frame_id,
- details->source_web_contents->GetRenderViewHost()->GetProcess()->GetID());
- if (!frame_navigation_state.CanSendEvents(frame_id))
+ if (!frame_navigation_state.CanSendEvents(details->source_frame_id))
return;
// If the WebContents was created as a response to an IPC from a renderer
@@ -196,7 +193,7 @@
PendingWebContents(
details->source_web_contents,
details->source_frame_id,
- frame_navigation_state.IsMainFrame(frame_id),
+ frame_navigation_state.IsMainFrame(details->source_frame_id),
details->target_web_contents,
details->target_url);
} else {
@@ -204,7 +201,7 @@
details->source_web_contents,
details->target_web_contents->GetBrowserContext(),
details->source_frame_id,
- frame_navigation_state.IsMainFrame(frame_id),
+ frame_navigation_state.IsMainFrame(details->source_frame_id),
details->target_web_contents,
details->target_url);
}
@@ -271,9 +268,7 @@
resource_redirect_details->resource_type;
if (resource_type == ResourceType::MAIN_FRAME ||
resource_type == ResourceType::SUB_FRAME) {
- FrameNavigationState::FrameID frame_id(
- resource_redirect_details->frame_id,
- resource_redirect_details->origin_child_id);
+ int64 frame_id = resource_redirect_details->frame_id;
if (!navigation_state_.CanSendEvents(frame_id))
return;
navigation_state_.SetIsServerRedirected(frame_id);
@@ -298,7 +293,7 @@
}
void WebNavigationTabObserver::DidStartProvisionalLoadForFrame(
- int64 frame_num,
+ int64 frame_id,
bool is_main_frame,
const GURL& validated_url,
bool is_error_page,
@@ -309,9 +304,6 @@
render_view_host != pending_render_view_host_)
return;
- FrameNavigationState::FrameID frame_id(
- frame_num, render_view_host->GetProcess()->GetID());
-
navigation_state_.TrackFrame(frame_id,
validated_url,
is_main_frame,
@@ -320,12 +312,12 @@
return;
helpers::DispatchOnBeforeNavigate(
- web_contents(), render_view_host->GetProcess()->GetID(), frame_num,
+ web_contents(), render_view_host->GetProcess()->GetID(), frame_id,
is_main_frame, validated_url);
}
void WebNavigationTabObserver::DidCommitProvisionalLoadForFrame(
- int64 frame_num,
+ int64 frame_id,
bool is_main_frame,
const GURL& url,
content::PageTransition transition_type,
@@ -338,8 +330,6 @@
render_view_host_ = render_view_host;
pending_render_view_host_ = NULL;
- FrameNavigationState::FrameID frame_id(
- frame_num, render_view_host->GetProcess()->GetID());
if (!navigation_state_.CanSendEvents(frame_id))
return;
@@ -356,7 +346,7 @@
helpers::DispatchOnCommitted(
keys::kOnReferenceFragmentUpdated,
web_contents(),
- frame_num,
+ frame_id,
is_main_frame,
url,
transition_type);
@@ -368,7 +358,7 @@
helpers::DispatchOnCommitted(
keys::kOnHistoryStateUpdated,
web_contents(),
- frame_num,
+ frame_id,
is_main_frame,
url,
transition_type);
@@ -381,7 +371,7 @@
helpers::DispatchOnCommitted(
keys::kOnCommitted,
web_contents(),
- frame_num,
+ frame_id,
is_main_frame,
url,
transition_type);
@@ -389,7 +379,7 @@
}
void WebNavigationTabObserver::DidFailProvisionalLoad(
- int64 frame_num,
+ int64 frame_id,
bool is_main_frame,
const GURL& validated_url,
int error_code,
@@ -401,41 +391,35 @@
if (render_view_host == pending_render_view_host_)
pending_render_view_host_ = NULL;
- FrameNavigationState::FrameID frame_id(
- frame_num, render_view_host->GetProcess()->GetID());
if (!navigation_state_.CanSendEvents(frame_id))
return;
navigation_state_.SetErrorOccurredInFrame(frame_id);
helpers::DispatchOnErrorOccurred(
web_contents(), render_view_host->GetProcess()->GetID(), validated_url,
- frame_num, is_main_frame, error_code);
+ frame_id, is_main_frame, error_code);
}
void WebNavigationTabObserver::DocumentLoadedInFrame(
- int64 frame_num,
+ int64 frame_id,
content::RenderViewHost* render_view_host) {
if (render_view_host != render_view_host_)
return;
- FrameNavigationState::FrameID frame_id(
- frame_num, render_view_host->GetProcess()->GetID());
if (!navigation_state_.CanSendEvents(frame_id))
return;
helpers::DispatchOnDOMContentLoaded(web_contents(),
navigation_state_.GetUrl(frame_id),
navigation_state_.IsMainFrame(frame_id),
- frame_num);
+ frame_id);
}
void WebNavigationTabObserver::DidFinishLoad(
- int64 frame_num,
+ int64 frame_id,
const GURL& validated_url,
bool is_main_frame,
content::RenderViewHost* render_view_host) {
if (render_view_host != render_view_host_)
return;
- FrameNavigationState::FrameID frame_id(
- frame_num, render_view_host->GetProcess()->GetID());
if (!navigation_state_.CanSendEvents(frame_id))
return;
navigation_state_.SetNavigationCompleted(frame_id);
@@ -444,11 +428,11 @@
helpers::DispatchOnCompleted(web_contents(),
validated_url,
is_main_frame,
- frame_num);
+ frame_id);
}
void WebNavigationTabObserver::DidFailLoad(
- int64 frame_num,
+ int64 frame_id,
const GURL& validated_url,
bool is_main_frame,
int error_code,
@@ -456,14 +440,12 @@
content::RenderViewHost* render_view_host) {
if (render_view_host != render_view_host_)
return;
- FrameNavigationState::FrameID frame_id(
- frame_num, render_view_host->GetProcess()->GetID());
if (!navigation_state_.CanSendEvents(frame_id))
return;
navigation_state_.SetErrorOccurredInFrame(frame_id);
helpers::DispatchOnErrorOccurred(
web_contents(), render_view_host->GetProcess()->GetID(), validated_url,
- frame_num, is_main_frame, error_code);
+ frame_id, is_main_frame, error_code);
}
void WebNavigationTabObserver::DidOpenRequestedURL(
@@ -472,10 +454,8 @@
const content::Referrer& referrer,
WindowOpenDisposition disposition,
content::PageTransition transition,
- int64 source_frame_num) {
- FrameNavigationState::FrameID frame_id(
- source_frame_num, render_view_host_->GetProcess()->GetID());
- if (!navigation_state_.CanSendEvents(frame_id))
+ int64 source_frame_id) {
+ if (!navigation_state_.CanSendEvents(source_frame_id))
return;
// We only send the onCreatedNavigationTarget if we end up creating a new
@@ -491,8 +471,8 @@
helpers::DispatchOnCreatedNavigationTarget(
web_contents(),
new_contents->GetBrowserContext(),
- source_frame_num,
- navigation_state_.IsMainFrame(frame_id),
+ source_frame_id,
+ navigation_state_.IsMainFrame(source_frame_id),
new_contents,
url);
}
@@ -505,9 +485,9 @@
navigation_state_.CanSendEvents(*frame)) {
helpers::DispatchOnErrorOccurred(
tab,
- frame->render_process_id,
+ tab->GetRenderViewHost()->GetProcess()->GetID(),
navigation_state_.GetUrl(*frame),
- frame->frame_num,
+ *frame,
navigation_state_.IsMainFrame(*frame),
net::ERR_ABORTED);
}
@@ -516,7 +496,7 @@
// See also NavigationController::IsURLInPageNavigation.
bool WebNavigationTabObserver::IsReferenceFragmentNavigation(
- FrameNavigationState::FrameID frame_id,
+ int64 frame_id,
const GURL& url) {
GURL existing_url = navigation_state_.GetUrl(frame_id);
if (existing_url == url)
@@ -533,7 +513,6 @@
EXTENSION_FUNCTION_VALIDATE(params.get());
int tab_id = params->details.tab_id;
int frame_id = params->details.frame_id;
- int process_id = params->details.process_id;
SetResult(Value::CreateNullValue());
@@ -557,20 +536,18 @@
observer->frame_navigation_state();
if (frame_id == 0)
- frame_id = frame_navigation_state.GetMainFrameID().frame_num;
-
- FrameNavigationState::FrameID internal_frame_id(frame_id, process_id);
- if (!frame_navigation_state.IsValidFrame(internal_frame_id))
+ frame_id = frame_navigation_state.GetMainFrameID();
+ if (!frame_navigation_state.IsValidFrame(frame_id))
return true;
- GURL frame_url = frame_navigation_state.GetUrl(internal_frame_id);
+ GURL frame_url = frame_navigation_state.GetUrl(frame_id);
if (!frame_navigation_state.IsValidUrl(frame_url))
return true;
GetFrame::Results::Details frame_details;
frame_details.url = frame_url.spec();
frame_details.error_occurred =
- frame_navigation_state.GetErrorOccurredInFrame(internal_frame_id);
+ frame_navigation_state.GetErrorOccurredInFrame(frame_id);
results_ = GetFrame::Results::Create(frame_details);
return true;
}
@@ -604,7 +581,7 @@
std::vector<linked_ptr<GetAllFrames::Results::DetailsElement> > result_list;
for (FrameNavigationState::const_iterator it = navigation_state.begin();
it != navigation_state.end(); ++it) {
- FrameNavigationState::FrameID frame_id = *it;
+ int64 frame_id = *it;
GURL frame_url = navigation_state.GetUrl(frame_id);
if (!navigation_state.IsValidUrl(frame_url))
continue;
@@ -612,8 +589,7 @@
new GetAllFrames::Results::DetailsElement());
frame->url = frame_url.spec();
frame->frame_id = helpers::GetFrameId(
- navigation_state.IsMainFrame(frame_id), frame_id.frame_num);
- frame->process_id = frame_id.render_process_id;
+ navigation_state.IsMainFrame(frame_id), frame_id);
frame->error_occurred = navigation_state.GetErrorOccurredInFrame(frame_id);
result_list.push_back(frame);
}
« no previous file with comments | « chrome/browser/extensions/api/web_navigation/web_navigation_api.h ('k') | chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698