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

Side by Side Diff: chrome/renderer/worker_content_settings_client_proxy.cc

Issue 2382973002: Convert WebSecurityOrigin -> GURL without re-parsing the url (Closed)
Patch Set: rebase on #427122 Created 4 years, 1 month 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 "chrome/renderer/worker_content_settings_client_proxy.h" 5 #include "chrome/renderer/worker_content_settings_client_proxy.h"
6 6
7 #include "chrome/common/render_messages.h" 7 #include "chrome/common/render_messages.h"
8 #include "content/public/renderer/render_frame.h" 8 #include "content/public/renderer/render_frame.h"
9 #include "content/public/renderer/render_thread.h" 9 #include "content/public/renderer/render_thread.h"
10 #include "ipc/ipc_sync_message_filter.h" 10 #include "ipc/ipc_sync_message_filter.h"
11 #include "third_party/WebKit/public/platform/URLConversion.h" 11 #include "third_party/WebKit/public/platform/URLConversion.h"
12 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h" 12 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
13 #include "third_party/WebKit/public/web/WebDocument.h" 13 #include "third_party/WebKit/public/web/WebDocument.h"
14 #include "third_party/WebKit/public/web/WebFrame.h" 14 #include "third_party/WebKit/public/web/WebFrame.h"
15 #include "url/origin.h"
15 16
16 WorkerContentSettingsClientProxy::WorkerContentSettingsClientProxy( 17 WorkerContentSettingsClientProxy::WorkerContentSettingsClientProxy(
17 content::RenderFrame* render_frame, 18 content::RenderFrame* render_frame,
18 blink::WebFrame* frame) 19 blink::WebFrame* frame)
19 : routing_id_(render_frame->GetRoutingID()), 20 : routing_id_(render_frame->GetRoutingID()),
20 is_unique_origin_(false) { 21 is_unique_origin_(false) {
21 if (frame->document().getSecurityOrigin().isUnique() || 22 if (frame->document().getSecurityOrigin().isUnique() ||
22 frame->top()->getSecurityOrigin().isUnique()) 23 frame->top()->getSecurityOrigin().isUnique())
23 is_unique_origin_ = true; 24 is_unique_origin_ = true;
24 sync_message_filter_ = content::RenderThread::Get()->GetSyncMessageFilter(); 25 sync_message_filter_ = content::RenderThread::Get()->GetSyncMessageFilter();
25 document_origin_url_ = 26 document_origin_url_ =
26 blink::WebStringToGURL(frame->document().getSecurityOrigin().toString()); 27 url::Origin(frame->document().getSecurityOrigin()).GetURL();
27 top_frame_origin_url_ = 28 top_frame_origin_url_ =
28 blink::WebStringToGURL(frame->top()->getSecurityOrigin().toString()); 29 url::Origin(frame->top()->getSecurityOrigin()).GetURL();
29 } 30 }
30 31
31 WorkerContentSettingsClientProxy::~WorkerContentSettingsClientProxy() {} 32 WorkerContentSettingsClientProxy::~WorkerContentSettingsClientProxy() {}
32 33
33 bool WorkerContentSettingsClientProxy::requestFileSystemAccessSync() { 34 bool WorkerContentSettingsClientProxy::requestFileSystemAccessSync() {
34 if (is_unique_origin_) 35 if (is_unique_origin_)
35 return false; 36 return false;
36 37
37 bool result = false; 38 bool result = false;
38 sync_message_filter_->Send(new ChromeViewHostMsg_RequestFileSystemAccessSync( 39 sync_message_filter_->Send(new ChromeViewHostMsg_RequestFileSystemAccessSync(
39 routing_id_, document_origin_url_, top_frame_origin_url_, &result)); 40 routing_id_, document_origin_url_, top_frame_origin_url_, &result));
40 return result; 41 return result;
41 } 42 }
42 43
43 bool WorkerContentSettingsClientProxy::allowIndexedDB( 44 bool WorkerContentSettingsClientProxy::allowIndexedDB(
44 const blink::WebString& name) { 45 const blink::WebString& name) {
45 if (is_unique_origin_) 46 if (is_unique_origin_)
46 return false; 47 return false;
47 48
48 bool result = false; 49 bool result = false;
49 sync_message_filter_->Send(new ChromeViewHostMsg_AllowIndexedDB( 50 sync_message_filter_->Send(new ChromeViewHostMsg_AllowIndexedDB(
50 routing_id_, document_origin_url_, top_frame_origin_url_, name, &result)); 51 routing_id_, document_origin_url_, top_frame_origin_url_, name, &result));
51 return result; 52 return result;
52 } 53 }
OLDNEW
« no previous file with comments | « chrome/renderer/plugins/chrome_plugin_placeholder.cc ('k') | content/child/notifications/notification_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698