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

Unified Diff: content/renderer/pepper/url_request_info_util.cc

Issue 2928033002: Move GetDocument method from WebFrame to WebLocalFrame. (Closed)
Patch Set: Split a DCHECK in two as suggested by boliu@. Created 3 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/pepper/url_request_info_util.h ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper/url_request_info_util.cc
diff --git a/content/renderer/pepper/url_request_info_util.cc b/content/renderer/pepper/url_request_info_util.cc
index d6ef08e7b7327b51dda4d2d3d8cd23209f327a57..f01f0b734bc2a637cf3bd795b64b3c2d76831a04 100644
--- a/content/renderer/pepper/url_request_info_util.cc
+++ b/content/renderer/pepper/url_request_info_util.cc
@@ -30,7 +30,7 @@
#include "third_party/WebKit/public/platform/WebURL.h"
#include "third_party/WebKit/public/platform/WebURLRequest.h"
#include "third_party/WebKit/public/web/WebDocument.h"
-#include "third_party/WebKit/public/web/WebFrame.h"
+#include "third_party/WebKit/public/web/WebLocalFrame.h"
#include "url/gurl.h"
#include "url/url_util.h"
@@ -40,7 +40,7 @@ using ppapi::thunk::EnterResourceNoLock;
using blink::WebData;
using blink::WebHTTPBody;
using blink::WebString;
-using blink::WebFrame;
+using blink::WebLocalFrame;
using blink::WebURL;
using blink::WebURLRequest;
@@ -146,7 +146,7 @@ std::string MakeXRequestedWithValue(const std::string& name,
bool CreateWebURLRequest(PP_Instance instance,
URLRequestInfoData* data,
- WebFrame* frame,
+ WebLocalFrame* frame,
WebURLRequest* dest) {
// In the out-of-process case, we've received the URLRequestInfoData
// from the untrusted plugin and done no validation on it. We need to be
@@ -154,38 +154,37 @@ bool CreateWebURLRequest(PP_Instance instance,
if (!ValidateURLRequestData(*data))
return false;
- std::string name_version;
-
- // Allow instance to be 0 or -1 for testing purposes.
- if (instance && instance != -1) {
- PepperPluginInstanceImpl* instance_impl =
- HostGlobals::Get()->GetInstance(instance);
- if (instance_impl) {
- name_version = MakeXRequestedWithValue(
- instance_impl->module()->name(),
- instance_impl->module()->version());
- }
- } else {
- name_version = "internal_testing_only";
- }
-
- dest->SetURL(
- frame->GetDocument().CompleteURL(WebString::FromUTF8(data->url)));
- dest->SetDownloadToFile(data->stream_to_file);
- dest->SetReportUploadProgress(data->record_upload_progress);
-
- if (!data->method.empty())
- dest->SetHTTPMethod(WebString::FromUTF8(data->method));
-
- dest->SetFirstPartyForCookies(frame->GetDocument().FirstPartyForCookies());
-
- const std::string& headers = data->headers;
- if (!headers.empty()) {
- net::HttpUtil::HeadersIterator it(headers.begin(), headers.end(), "\n\r");
- while (it.GetNext()) {
- dest->AddHTTPHeaderField(WebString::FromUTF8(it.name()),
- WebString::FromUTF8(it.values()));
- }
+ std::string name_version;
+
+ // Allow instance to be 0 or -1 for testing purposes.
+ if (instance && instance != -1) {
+ PepperPluginInstanceImpl* instance_impl =
+ HostGlobals::Get()->GetInstance(instance);
+ if (instance_impl) {
+ name_version = MakeXRequestedWithValue(
+ instance_impl->module()->name(), instance_impl->module()->version());
+ }
+ } else {
+ name_version = "internal_testing_only";
+ }
+
+ dest->SetURL(
+ frame->GetDocument().CompleteURL(WebString::FromUTF8(data->url)));
+ dest->SetDownloadToFile(data->stream_to_file);
+ dest->SetReportUploadProgress(data->record_upload_progress);
+
+ if (!data->method.empty())
+ dest->SetHTTPMethod(WebString::FromUTF8(data->method));
+
+ dest->SetFirstPartyForCookies(frame->GetDocument().FirstPartyForCookies());
+
+ const std::string& headers = data->headers;
+ if (!headers.empty()) {
+ net::HttpUtil::HeadersIterator it(headers.begin(), headers.end(), "\n\r");
+ while (it.GetNext()) {
+ dest->AddHTTPHeaderField(WebString::FromUTF8(it.name()),
+ WebString::FromUTF8(it.values()));
+ }
}
// Append the upload data.
« no previous file with comments | « content/renderer/pepper/url_request_info_util.h ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698