diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-18 06:21:09 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-18 06:21:09 +0000 |
| commit | 91733b650d1e31b84a50860b3e5780d97b11d86d (patch) | |
| tree | ba9408fd798e6e7ea3ad13219e6feea2689118cb /chrome/renderer | |
| parent | 90e11737beffdf76a1cab1868ec8456c5580d2fe (diff) | |
| download | chromium_src-91733b650d1e31b84a50860b3e5780d97b11d86d.zip chromium_src-91733b650d1e31b84a50860b3e5780d97b11d86d.tar.gz chromium_src-91733b650d1e31b84a50860b3e5780d97b11d86d.tar.bz2 | |
Introduce WebKit::WebSecurityOrigin as a wrapper around
WebCore::SecurityOrigin.
This provides us a little wiggle room in the future in
case we ever want to provide more details about a
security origin beyond just its stringified value.
This was done on recommendation from Adam Barth.
R=jorlow
BUG=21967
TEST=none
Review URL: http://codereview.chromium.org/211013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26554 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/render_view.cc | 7 | ||||
| -rw-r--r-- | chrome/renderer/render_view.h | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 4a2335c..36f472a 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -65,6 +65,7 @@ #include "webkit/api/public/WebPoint.h" #include "webkit/api/public/WebRect.h" #include "webkit/api/public/WebScriptSource.h" +#include "webkit/api/public/WebSecurityOrigin.h" #include "webkit/api/public/WebSize.h" #include "webkit/api/public/WebURL.h" #include "webkit/api/public/WebURLError.h" @@ -1325,7 +1326,7 @@ WebView* RenderView::createView(WebFrame* creator) { view->opened_by_user_gesture_ = user_gesture; // Record the security origin of the creator. - GURL creator_url(creator->securityOrigin().utf8()); + GURL creator_url(creator->securityOrigin().toString().utf8()); if (!creator_url.is_valid() || !creator_url.IsStandard()) creator_url = GURL(); view->creator_url_ = creator_url; @@ -2230,8 +2231,8 @@ void RenderView::didLoadResourceFromMemoryCache( Send(new ViewHostMsg_DidLoadResourceFromMemoryCache( routing_id_, request.url(), - frame->securityOrigin().utf8(), - frame->top()->securityOrigin().utf8(), + frame->securityOrigin().toString().utf8(), + frame->top()->securityOrigin().toString().utf8(), response.securityInfo())); } diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h index 218d617..b647e65 100644 --- a/chrome/renderer/render_view.h +++ b/chrome/renderer/render_view.h @@ -354,7 +354,7 @@ class RenderView : public RenderWidget, const WebKit::WebURLResponse&); virtual void didDisplayInsecureContent(WebKit::WebFrame* frame) {} virtual void didRunInsecureContent( - WebKit::WebFrame* frame, const WebKit::WebString& security_origin) {} + WebKit::WebFrame* frame, const WebKit::WebSecurityOrigin& origin) {} virtual void didExhaustMemoryAvailableForScript(WebKit::WebFrame* frame); virtual void didChangeContentsSize( WebKit::WebFrame* frame, const WebKit::WebSize& size); |