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

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

Issue 2378323003: Add url::Origin::GetURL() to convert Origins to URLs without reparsing (Closed)
Patch Set: remove fuzzer Created 4 years, 2 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 unified diff | Download patch
« no previous file with comments | « no previous file | url/origin.h » ('j') | url/origin.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 4085 matching lines...) Expand 10 before | Expand all | Expand 10 after
4096 WebFrame* parent = frame->parent(); 4096 WebFrame* parent = frame->parent();
4097 int parent_routing_id = parent ? GetRoutingIdForFrameOrProxy(parent) : -1; 4097 int parent_routing_id = parent ? GetRoutingIdForFrameOrProxy(parent) : -1;
4098 4098
4099 RequestExtraData* extra_data = new RequestExtraData(); 4099 RequestExtraData* extra_data = new RequestExtraData();
4100 extra_data->set_visibility_state(visibilityState()); 4100 extra_data->set_visibility_state(visibilityState());
4101 extra_data->set_custom_user_agent(custom_user_agent); 4101 extra_data->set_custom_user_agent(custom_user_agent);
4102 extra_data->set_requested_with(requested_with); 4102 extra_data->set_requested_with(requested_with);
4103 extra_data->set_render_frame_id(routing_id_); 4103 extra_data->set_render_frame_id(routing_id_);
4104 extra_data->set_is_main_frame(!parent); 4104 extra_data->set_is_main_frame(!parent);
4105 extra_data->set_frame_origin( 4105 extra_data->set_frame_origin(
4106 blink::WebStringToGURL(frame->document().getSecurityOrigin().toString())); 4106 url::Origin(frame->document().getSecurityOrigin()).GetURL());
4107 extra_data->set_parent_is_main_frame(parent && !parent->parent()); 4107 extra_data->set_parent_is_main_frame(parent && !parent->parent());
4108 extra_data->set_parent_render_frame_id(parent_routing_id); 4108 extra_data->set_parent_render_frame_id(parent_routing_id);
4109 extra_data->set_allow_download( 4109 extra_data->set_allow_download(
4110 navigation_state->common_params().allow_download); 4110 navigation_state->common_params().allow_download);
4111 extra_data->set_transition_type(transition_type); 4111 extra_data->set_transition_type(transition_type);
4112 extra_data->set_should_replace_current_entry(should_replace_current_entry); 4112 extra_data->set_should_replace_current_entry(should_replace_current_entry);
4113 extra_data->set_transferred_request_child_id( 4113 extra_data->set_transferred_request_child_id(
4114 navigation_state->start_params().transferred_request_child_id); 4114 navigation_state->start_params().transferred_request_child_id);
4115 extra_data->set_transferred_request_request_id( 4115 extra_data->set_transferred_request_request_id(
4116 navigation_state->start_params().transferred_request_request_id); 4116 navigation_state->start_params().transferred_request_request_id);
(...skipping 2314 matching lines...) Expand 10 before | Expand all | Expand 10 after
6431 // event target. Potentially a Pepper plugin will receive the event. 6431 // event target. Potentially a Pepper plugin will receive the event.
6432 // In order to tell whether a plugin gets the last mouse event and which it 6432 // In order to tell whether a plugin gets the last mouse event and which it
6433 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6433 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6434 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6434 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6435 // |pepper_last_mouse_event_target_|. 6435 // |pepper_last_mouse_event_target_|.
6436 pepper_last_mouse_event_target_ = nullptr; 6436 pepper_last_mouse_event_target_ = nullptr;
6437 #endif 6437 #endif
6438 } 6438 }
6439 6439
6440 } // namespace content 6440 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | url/origin.h » ('j') | url/origin.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698