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

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: propagate file:/// change to weborigin 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
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 4078 matching lines...) Expand 10 before | Expand all | Expand 10 after
4089 WebFrame* parent = frame->parent(); 4089 WebFrame* parent = frame->parent();
4090 int parent_routing_id = parent ? GetRoutingIdForFrameOrProxy(parent) : -1; 4090 int parent_routing_id = parent ? GetRoutingIdForFrameOrProxy(parent) : -1;
4091 4091
4092 RequestExtraData* extra_data = new RequestExtraData(); 4092 RequestExtraData* extra_data = new RequestExtraData();
4093 extra_data->set_visibility_state(visibilityState()); 4093 extra_data->set_visibility_state(visibilityState());
4094 extra_data->set_custom_user_agent(custom_user_agent); 4094 extra_data->set_custom_user_agent(custom_user_agent);
4095 extra_data->set_requested_with(requested_with); 4095 extra_data->set_requested_with(requested_with);
4096 extra_data->set_render_frame_id(routing_id_); 4096 extra_data->set_render_frame_id(routing_id_);
4097 extra_data->set_is_main_frame(!parent); 4097 extra_data->set_is_main_frame(!parent);
4098 extra_data->set_frame_origin( 4098 extra_data->set_frame_origin(
4099 blink::WebStringToGURL(frame->document().getSecurityOrigin().toString())); 4099 url::Origin(frame->document().getSecurityOrigin()).GetURL());
4100 extra_data->set_parent_is_main_frame(parent && !parent->parent()); 4100 extra_data->set_parent_is_main_frame(parent && !parent->parent());
4101 extra_data->set_parent_render_frame_id(parent_routing_id); 4101 extra_data->set_parent_render_frame_id(parent_routing_id);
4102 extra_data->set_allow_download( 4102 extra_data->set_allow_download(
4103 navigation_state->common_params().allow_download); 4103 navigation_state->common_params().allow_download);
4104 extra_data->set_transition_type(transition_type); 4104 extra_data->set_transition_type(transition_type);
4105 extra_data->set_should_replace_current_entry(should_replace_current_entry); 4105 extra_data->set_should_replace_current_entry(should_replace_current_entry);
4106 extra_data->set_transferred_request_child_id( 4106 extra_data->set_transferred_request_child_id(
4107 navigation_state->start_params().transferred_request_child_id); 4107 navigation_state->start_params().transferred_request_child_id);
4108 extra_data->set_transferred_request_request_id( 4108 extra_data->set_transferred_request_request_id(
4109 navigation_state->start_params().transferred_request_request_id); 4109 navigation_state->start_params().transferred_request_request_id);
(...skipping 2320 matching lines...) Expand 10 before | Expand all | Expand 10 after
6430 // event target. Potentially a Pepper plugin will receive the event. 6430 // event target. Potentially a Pepper plugin will receive the event.
6431 // In order to tell whether a plugin gets the last mouse event and which it 6431 // In order to tell whether a plugin gets the last mouse event and which it
6432 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6432 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6433 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6433 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6434 // |pepper_last_mouse_event_target_|. 6434 // |pepper_last_mouse_event_target_|.
6435 pepper_last_mouse_event_target_ = nullptr; 6435 pepper_last_mouse_event_target_ = nullptr;
6436 #endif 6436 #endif
6437 } 6437 }
6438 6438
6439 } // namespace content 6439 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp » ('j') | url/origin.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698