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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 2557673006: Move Origin::GetURL() out of resource request critical path (Closed)
Patch Set: Created 4 years 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 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 4242 matching lines...) Expand 10 before | Expand all | Expand 10 after
4253 WebFrame* parent = frame->parent(); 4253 WebFrame* parent = frame->parent();
4254 int parent_routing_id = parent ? GetRoutingIdForFrameOrProxy(parent) : -1; 4254 int parent_routing_id = parent ? GetRoutingIdForFrameOrProxy(parent) : -1;
4255 4255
4256 RequestExtraData* extra_data = new RequestExtraData(); 4256 RequestExtraData* extra_data = new RequestExtraData();
4257 extra_data->set_visibility_state(visibilityState()); 4257 extra_data->set_visibility_state(visibilityState());
4258 extra_data->set_custom_user_agent(custom_user_agent); 4258 extra_data->set_custom_user_agent(custom_user_agent);
4259 extra_data->set_requested_with(requested_with); 4259 extra_data->set_requested_with(requested_with);
4260 extra_data->set_render_frame_id(routing_id_); 4260 extra_data->set_render_frame_id(routing_id_);
4261 extra_data->set_is_main_frame(!parent); 4261 extra_data->set_is_main_frame(!parent);
4262 extra_data->set_frame_origin( 4262 extra_data->set_frame_origin(
4263 url::Origin(frame->document().getSecurityOrigin()).GetURL()); 4263 url::Origin(frame->document().getSecurityOrigin()));
4264 extra_data->set_parent_is_main_frame(parent && !parent->parent()); 4264 extra_data->set_parent_is_main_frame(parent && !parent->parent());
4265 extra_data->set_parent_render_frame_id(parent_routing_id); 4265 extra_data->set_parent_render_frame_id(parent_routing_id);
4266 extra_data->set_allow_download( 4266 extra_data->set_allow_download(
4267 navigation_state->common_params().allow_download); 4267 navigation_state->common_params().allow_download);
4268 extra_data->set_transition_type(transition_type); 4268 extra_data->set_transition_type(transition_type);
4269 extra_data->set_should_replace_current_entry(should_replace_current_entry); 4269 extra_data->set_should_replace_current_entry(should_replace_current_entry);
4270 extra_data->set_service_worker_provider_id(provider_id); 4270 extra_data->set_service_worker_provider_id(provider_id);
4271 extra_data->set_stream_override(std::move(stream_override)); 4271 extra_data->set_stream_override(std::move(stream_override));
4272 bool is_prefetch = 4272 bool is_prefetch =
4273 GetContentClient()->renderer()->IsPrefetchOnly(this, request); 4273 GetContentClient()->renderer()->IsPrefetchOnly(this, request);
(...skipping 2422 matching lines...) Expand 10 before | Expand all | Expand 10 after
6696 // event target. Potentially a Pepper plugin will receive the event. 6696 // event target. Potentially a Pepper plugin will receive the event.
6697 // In order to tell whether a plugin gets the last mouse event and which it 6697 // In order to tell whether a plugin gets the last mouse event and which it
6698 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6698 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6699 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6699 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6700 // |pepper_last_mouse_event_target_|. 6700 // |pepper_last_mouse_event_target_|.
6701 pepper_last_mouse_event_target_ = nullptr; 6701 pepper_last_mouse_event_target_ = nullptr;
6702 #endif 6702 #endif
6703 } 6703 }
6704 6704
6705 } // namespace content 6705 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698