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

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

Issue 2611183007: PlzNavigate: Fix for the http/tests/inspector/resource-har-conversion.html layout test failure. (Closed)
Patch Set: Fix line endings Created 3 years, 11 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 | third_party/WebKit/LayoutTests/FlagExpectations/enable-browser-side-navigation » ('j') | no next file with comments »
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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 #include "media/base/media_log.h" 150 #include "media/base/media_log.h"
151 #include "media/base/media_switches.h" 151 #include "media/base/media_switches.h"
152 #include "media/blink/url_index.h" 152 #include "media/blink/url_index.h"
153 #include "media/blink/webencryptedmediaclient_impl.h" 153 #include "media/blink/webencryptedmediaclient_impl.h"
154 #include "media/blink/webmediaplayer_impl.h" 154 #include "media/blink/webmediaplayer_impl.h"
155 #include "media/media_features.h" 155 #include "media/media_features.h"
156 #include "media/renderers/gpu_video_accelerator_factories.h" 156 #include "media/renderers/gpu_video_accelerator_factories.h"
157 #include "mojo/edk/js/core.h" 157 #include "mojo/edk/js/core.h"
158 #include "mojo/edk/js/support.h" 158 #include "mojo/edk/js/support.h"
159 #include "net/base/data_url.h" 159 #include "net/base/data_url.h"
160 #include "net/base/load_flags.h"
160 #include "net/base/net_errors.h" 161 #include "net/base/net_errors.h"
161 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 162 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
162 #include "net/http/http_util.h" 163 #include "net/http/http_util.h"
163 #include "ppapi/features/features.h" 164 #include "ppapi/features/features.h"
164 #include "services/service_manager/public/cpp/interface_provider.h" 165 #include "services/service_manager/public/cpp/interface_provider.h"
165 #include "services/service_manager/public/cpp/interface_registry.h" 166 #include "services/service_manager/public/cpp/interface_registry.h"
166 #include "services/ui/public/cpp/gpu/context_provider_command_buffer.h" 167 #include "services/ui/public/cpp/gpu/context_provider_command_buffer.h"
167 #include "storage/common/data_element.h" 168 #include "storage/common/data_element.h"
168 #include "third_party/WebKit/public/platform/FilePathConversion.h" 169 #include "third_party/WebKit/public/platform/FilePathConversion.h"
169 #include "third_party/WebKit/public/platform/URLConversion.h" 170 #include "third_party/WebKit/public/platform/URLConversion.h"
(...skipping 6035 matching lines...) Expand 10 before | Expand all | Expand 10 after
6205 GetRequestContextFrameTypeForWebURLRequest(info.urlRequest) == 6206 GetRequestContextFrameTypeForWebURLRequest(info.urlRequest) ==
6206 REQUEST_CONTEXT_FRAME_TYPE_TOP_LEVEL); 6207 REQUEST_CONTEXT_FRAME_TYPE_TOP_LEVEL);
6207 DCHECK(!frame_->parent() || 6208 DCHECK(!frame_->parent() ||
6208 GetRequestContextFrameTypeForWebURLRequest(info.urlRequest) == 6209 GetRequestContextFrameTypeForWebURLRequest(info.urlRequest) ==
6209 REQUEST_CONTEXT_FRAME_TYPE_NESTED); 6210 REQUEST_CONTEXT_FRAME_TYPE_NESTED);
6210 6211
6211 base::Optional<url::Origin> initiator_origin = 6212 base::Optional<url::Origin> initiator_origin =
6212 info.urlRequest.requestorOrigin().isNull() 6213 info.urlRequest.requestorOrigin().isNull()
6213 ? base::Optional<url::Origin>() 6214 ? base::Optional<url::Origin>()
6214 : base::Optional<url::Origin>(info.urlRequest.requestorOrigin()); 6215 : base::Optional<url::Origin>(info.urlRequest.requestorOrigin());
6216
6217 int load_flags = GetLoadFlagsForWebURLRequest(info.urlRequest);
6218
6219 // Requests initiated via devtools can have caching disabled.
6220 if (info.isCacheDisabled) {
6221 // Turn off all caching related flags and set LOAD_BYPASS_CACHE.
6222 load_flags &= ~(net::LOAD_VALIDATE_CACHE | net::LOAD_SKIP_CACHE_VALIDATION |
6223 net::LOAD_ONLY_FROM_CACHE | net::LOAD_DISABLE_CACHE);
6224 load_flags |= net::LOAD_BYPASS_CACHE;
6225 }
6215 BeginNavigationParams begin_navigation_params( 6226 BeginNavigationParams begin_navigation_params(
6216 GetWebURLRequestHeaders(info.urlRequest), 6227 GetWebURLRequestHeaders(info.urlRequest), load_flags,
6217 GetLoadFlagsForWebURLRequest(info.urlRequest),
6218 info.urlRequest.hasUserGesture(), 6228 info.urlRequest.hasUserGesture(),
6219 info.urlRequest.skipServiceWorker() != 6229 info.urlRequest.skipServiceWorker() !=
6220 blink::WebURLRequest::SkipServiceWorker::None, 6230 blink::WebURLRequest::SkipServiceWorker::None,
6221 GetRequestContextTypeForWebURLRequest(info.urlRequest), initiator_origin); 6231 GetRequestContextTypeForWebURLRequest(info.urlRequest), initiator_origin);
6222 6232
6223 if (!info.form.isNull()) { 6233 if (!info.form.isNull()) {
6224 WebSearchableFormData web_searchable_form_data(info.form); 6234 WebSearchableFormData web_searchable_form_data(info.form);
6225 begin_navigation_params.searchable_form_url = 6235 begin_navigation_params.searchable_form_url =
6226 web_searchable_form_data.url(); 6236 web_searchable_form_data.url();
6227 begin_navigation_params.searchable_form_encoding = 6237 begin_navigation_params.searchable_form_encoding =
(...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after
6785 // event target. Potentially a Pepper plugin will receive the event. 6795 // event target. Potentially a Pepper plugin will receive the event.
6786 // In order to tell whether a plugin gets the last mouse event and which it 6796 // In order to tell whether a plugin gets the last mouse event and which it
6787 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6797 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6788 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6798 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6789 // |pepper_last_mouse_event_target_|. 6799 // |pepper_last_mouse_event_target_|.
6790 pepper_last_mouse_event_target_ = nullptr; 6800 pepper_last_mouse_event_target_ = nullptr;
6791 #endif 6801 #endif
6792 } 6802 }
6793 6803
6794 } // namespace content 6804 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/FlagExpectations/enable-browser-side-navigation » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698