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

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

Issue 2567173002: Clean up Document::isSecureContext (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 4237 matching lines...) Expand 10 before | Expand all | Expand 10 after
4248 extra_data->set_transition_type(transition_type); 4248 extra_data->set_transition_type(transition_type);
4249 extra_data->set_should_replace_current_entry(should_replace_current_entry); 4249 extra_data->set_should_replace_current_entry(should_replace_current_entry);
4250 extra_data->set_service_worker_provider_id(provider_id); 4250 extra_data->set_service_worker_provider_id(provider_id);
4251 extra_data->set_stream_override(std::move(stream_override)); 4251 extra_data->set_stream_override(std::move(stream_override));
4252 bool is_prefetch = 4252 bool is_prefetch =
4253 GetContentClient()->renderer()->IsPrefetchOnly(this, request); 4253 GetContentClient()->renderer()->IsPrefetchOnly(this, request);
4254 extra_data->set_is_prefetch(is_prefetch); 4254 extra_data->set_is_prefetch(is_prefetch);
4255 extra_data->set_download_to_network_cache_only( 4255 extra_data->set_download_to_network_cache_only(
4256 is_prefetch && 4256 is_prefetch &&
4257 WebURLRequestToResourceType(request) != RESOURCE_TYPE_MAIN_FRAME); 4257 WebURLRequestToResourceType(request) != RESOURCE_TYPE_MAIN_FRAME);
4258 WebString error;
4259 extra_data->set_initiated_in_secure_context( 4258 extra_data->set_initiated_in_secure_context(
4260 frame->document().isSecureContext(error)); 4259 frame->document().isSecureContext());
4261 4260
4262 // Renderer process transfers apply only to navigational requests. 4261 // Renderer process transfers apply only to navigational requests.
4263 bool is_navigational_request = 4262 bool is_navigational_request =
4264 request.getFrameType() != WebURLRequest::FrameTypeNone; 4263 request.getFrameType() != WebURLRequest::FrameTypeNone;
4265 if (is_navigational_request) { 4264 if (is_navigational_request) {
4266 extra_data->set_transferred_request_child_id( 4265 extra_data->set_transferred_request_child_id(
4267 navigation_state->start_params().transferred_request_child_id); 4266 navigation_state->start_params().transferred_request_child_id);
4268 extra_data->set_transferred_request_request_id( 4267 extra_data->set_transferred_request_request_id(
4269 navigation_state->start_params().transferred_request_request_id); 4268 navigation_state->start_params().transferred_request_request_id);
4270 } 4269 }
(...skipping 2410 matching lines...) Expand 10 before | Expand all | Expand 10 after
6681 // event target. Potentially a Pepper plugin will receive the event. 6680 // event target. Potentially a Pepper plugin will receive the event.
6682 // In order to tell whether a plugin gets the last mouse event and which it 6681 // In order to tell whether a plugin gets the last mouse event and which it
6683 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6682 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6684 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6683 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6685 // |pepper_last_mouse_event_target_|. 6684 // |pepper_last_mouse_event_target_|.
6686 pepper_last_mouse_event_target_ = nullptr; 6685 pepper_last_mouse_event_target_ = nullptr;
6687 #endif 6686 #endif
6688 } 6687 }
6689 6688
6690 } // namespace content 6689 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/pepper/host_dispatcher_wrapper.cc ('k') | third_party/WebKit/Source/core/dom/Document.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698