diff options
author | Dana Jansens <danakj@google.com> | 2016-03-09 12:57:22 -0800 |
---|---|---|
committer | Dana Jansens <danakj@google.com> | 2016-03-09 21:00:02 +0000 |
commit | 71331253d6537b9409518dec2368388c5d73cb94 (patch) | |
tree | d3a6572ec863fe33893dd79353f17c763c4194b0 /chrome/renderer | |
parent | aa5b4809788929faac190ac72bdcac0cbb2e7fc4 (diff) | |
download | chromium_src-71331253d6537b9409518dec2368388c5d73cb94.zip chromium_src-71331253d6537b9409518dec2368388c5d73cb94.tar.gz chromium_src-71331253d6537b9409518dec2368388c5d73cb94.tar.bz2 |
blink: Rename modules/ method to prefix with get when they collide.
This focuses on modules/ to rename methods that are named foo() and
that return a Foo*, which will have collisions when foo() is renamed
to Foo() in chromium style.
This patch uses the following to do many of the replacements, so it's
a bit on the larger side..
git gs '\b$foo()'|grep '\.\(cpp\|h\|cc\):'|cut -d: -f1|sort|uniq|xargs sed -ie 's/\b$foo()/$getFoo()/g'
R=haraken@chromium.org
TBR=brettw, chrishtr
BUG=582312
Review URL: https://codereview.chromium.org/1773813007 .
Cr-Commit-Position: refs/heads/master@{#380209}
Diffstat (limited to 'chrome/renderer')
9 files changed, 40 insertions, 39 deletions
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc index 8486b3e..93ef2c2 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -566,7 +566,7 @@ bool ChromeContentRendererClient::OverrideCreatePlugin( GURL url(params.url); #if defined(ENABLE_PLUGINS) ChromeViewHostMsg_GetPluginInfo_Output output; - WebString top_origin = frame->top()->securityOrigin().toString(); + WebString top_origin = frame->top()->getSecurityOrigin().toString(); render_frame->Send(new ChromeViewHostMsg_GetPluginInfo( render_frame->GetRoutingID(), url, blink::WebStringToGURL(top_origin), orig_mime_type, &output)); diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc index 129c3f1..2e48be5 100644 --- a/chrome/renderer/content_settings_observer.cc +++ b/chrome/renderer/content_settings_observer.cc @@ -92,7 +92,7 @@ static const char kDotSWF[] = ".swf"; static const char kDotHTML[] = ".html"; GURL GetOriginOrURL(const WebFrame* frame) { - WebString top_origin = frame->top()->securityOrigin().toString(); + WebString top_origin = frame->top()->getSecurityOrigin().toString(); // The |top_origin| is unique ("null") e.g., for file:// URLs. Use the // document URL as the primary URL in those cases. // TODO(alexmos): This is broken for --site-per-process, since top() can be a @@ -247,7 +247,7 @@ void ContentSettingsObserver::DidCommitProvisionalLoad( GURL url = frame->document().url(); // If we start failing this DCHECK, please makes sure we don't regress // this bug: http://code.google.com/p/chromium/issues/detail?id=79304 - DCHECK(frame->document().securityOrigin().toString() == "null" || + DCHECK(frame->document().getSecurityOrigin().toString() == "null" || !url.SchemeIs(url::kDataScheme)); } @@ -255,15 +255,15 @@ bool ContentSettingsObserver::allowDatabase(const WebString& name, const WebString& display_name, unsigned long estimated_size) { WebFrame* frame = render_frame()->GetWebFrame(); - if (frame->securityOrigin().isUnique() || - frame->top()->securityOrigin().isUnique()) + if (frame->getSecurityOrigin().isUnique() || + frame->top()->getSecurityOrigin().isUnique()) return false; bool result = false; Send(new ChromeViewHostMsg_AllowDatabase( routing_id(), - blink::WebStringToGURL(frame->securityOrigin().toString()), - blink::WebStringToGURL(frame->top()->securityOrigin().toString()), + blink::WebStringToGURL(frame->getSecurityOrigin().toString()), + blink::WebStringToGURL(frame->top()->getSecurityOrigin().toString()), name, display_name, &result)); return result; } @@ -271,8 +271,8 @@ bool ContentSettingsObserver::allowDatabase(const WebString& name, void ContentSettingsObserver::requestFileSystemAccessAsync( const WebContentSettingCallbacks& callbacks) { WebFrame* frame = render_frame()->GetWebFrame(); - if (frame->securityOrigin().isUnique() || - frame->top()->securityOrigin().isUnique()) { + if (frame->getSecurityOrigin().isUnique() || + frame->top()->getSecurityOrigin().isUnique()) { WebContentSettingCallbacks permissionCallbacks(callbacks); permissionCallbacks.doDeny(); return; @@ -287,8 +287,8 @@ void ContentSettingsObserver::requestFileSystemAccessAsync( Send(new ChromeViewHostMsg_RequestFileSystemAccessAsync( routing_id(), current_request_id_, - blink::WebStringToGURL(frame->securityOrigin().toString()), - blink::WebStringToGURL(frame->top()->securityOrigin().toString()))); + blink::WebStringToGURL(frame->getSecurityOrigin().toString()), + blink::WebStringToGURL(frame->top()->getSecurityOrigin().toString()))); } bool ContentSettingsObserver::allowImage(bool enabled_per_settings, @@ -317,15 +317,15 @@ bool ContentSettingsObserver::allowImage(bool enabled_per_settings, bool ContentSettingsObserver::allowIndexedDB(const WebString& name, const WebSecurityOrigin& origin) { WebFrame* frame = render_frame()->GetWebFrame(); - if (frame->securityOrigin().isUnique() || - frame->top()->securityOrigin().isUnique()) + if (frame->getSecurityOrigin().isUnique() || + frame->top()->getSecurityOrigin().isUnique()) return false; bool result = false; Send(new ChromeViewHostMsg_AllowIndexedDB( routing_id(), - blink::WebStringToGURL(frame->securityOrigin().toString()), - blink::WebStringToGURL(frame->top()->securityOrigin().toString()), + blink::WebStringToGURL(frame->getSecurityOrigin().toString()), + blink::WebStringToGURL(frame->top()->getSecurityOrigin().toString()), name, &result)); return result; } @@ -352,10 +352,9 @@ bool ContentSettingsObserver::allowScript(bool enabled_per_settings) { bool allow = true; if (content_setting_rules_) { ContentSetting setting = GetContentSettingFromRules( - content_setting_rules_->script_rules, - frame, + content_setting_rules_->script_rules, frame, blink::WebStringToGURL( - frame->document().securityOrigin().toString())); + frame->document().getSecurityOrigin().toString())); allow = setting != CONTENT_SETTING_BLOCK; } allow = allow || IsWhitelistedForContentSettings(); @@ -385,13 +384,13 @@ bool ContentSettingsObserver::allowScriptFromSource( bool ContentSettingsObserver::allowStorage(bool local) { WebFrame* frame = render_frame()->GetWebFrame(); - if (frame->securityOrigin().isUnique() || - frame->top()->securityOrigin().isUnique()) + if (frame->getSecurityOrigin().isUnique() || + frame->top()->getSecurityOrigin().isUnique()) return false; bool result = false; StoragePermissionsKey key( - blink::WebStringToGURL(frame->document().securityOrigin().toString()), + blink::WebStringToGURL(frame->document().getSecurityOrigin().toString()), local); std::map<StoragePermissionsKey, bool>::const_iterator permissions = cached_storage_permissions_.find(key); @@ -400,8 +399,8 @@ bool ContentSettingsObserver::allowStorage(bool local) { Send(new ChromeViewHostMsg_AllowDOMStorage( routing_id(), - blink::WebStringToGURL(frame->securityOrigin().toString()), - blink::WebStringToGURL(frame->top()->securityOrigin().toString()), + blink::WebStringToGURL(frame->getSecurityOrigin().toString()), + blink::WebStringToGURL(frame->top()->getSecurityOrigin().toString()), local, &result)); cached_storage_permissions_[key] = result; return result; @@ -494,7 +493,7 @@ void ContentSettingsObserver::didUseKeygen() { WebFrame* frame = render_frame()->GetWebFrame(); Send(new ChromeViewHostMsg_DidUseKeygen( routing_id(), - blink::WebStringToGURL(frame->securityOrigin().toString()))); + blink::WebStringToGURL(frame->getSecurityOrigin().toString()))); } void ContentSettingsObserver::didNotAllowPlugins() { @@ -563,7 +562,7 @@ void ContentSettingsObserver::ClearBlockedContentSettings() { bool ContentSettingsObserver::IsPlatformApp() { #if defined(ENABLE_EXTENSIONS) WebFrame* frame = render_frame()->GetWebFrame(); - WebSecurityOrigin origin = frame->document().securityOrigin(); + WebSecurityOrigin origin = frame->document().getSecurityOrigin(); const extensions::Extension* extension = GetExtension(origin); return extension && extension->is_platform_app(); #else @@ -596,8 +595,8 @@ bool ContentSettingsObserver::IsWhitelistedForContentSettings() const { return true; WebFrame* web_frame = render_frame()->GetWebFrame(); - return IsWhitelistedForContentSettings(web_frame->document().securityOrigin(), - web_frame->document().url()); + return IsWhitelistedForContentSettings( + web_frame->document().getSecurityOrigin(), web_frame->document().url()); } bool ContentSettingsObserver::IsWhitelistedForContentSettings( diff --git a/chrome/renderer/extensions/app_bindings.cc b/chrome/renderer/extensions/app_bindings.cc index 1fc204c..0961814 100644 --- a/chrome/renderer/extensions/app_bindings.cc +++ b/chrome/renderer/extensions/app_bindings.cc @@ -73,7 +73,7 @@ void AppBindings::GetDetails( v8::Local<v8::Value> AppBindings::GetDetailsImpl(blink::WebLocalFrame* frame) { v8::Isolate* isolate = frame->mainWorldScriptContext()->GetIsolate(); - if (frame->document().securityOrigin().isUnique()) + if (frame->document().getSecurityOrigin().isUnique()) return v8::Null(isolate); const Extension* extension = @@ -117,7 +117,7 @@ void AppBindings::GetRunningState( // To distinguish between ready_to_run and cannot_run states, we need the app // from the top frame. blink::WebSecurityOrigin top_frame_security_origin = - context()->web_frame()->top()->securityOrigin(); + context()->web_frame()->top()->getSecurityOrigin(); const RendererExtensionRegistry* extensions = RendererExtensionRegistry::Get(); diff --git a/chrome/renderer/extensions/chrome_extensions_renderer_client.cc b/chrome/renderer/extensions/chrome_extensions_renderer_client.cc index 66fca4c..0f3d463 100644 --- a/chrome/renderer/extensions/chrome_extensions_renderer_client.cc +++ b/chrome/renderer/extensions/chrome_extensions_renderer_client.cc @@ -85,7 +85,8 @@ bool CrossesExtensionExtents(blink::WebLocalFrame* frame, // in an extension process (other than the Chrome Web Store), we want to // keep it in process to allow the opener to script it. blink::WebDocument opener_document = opener_frame->document(); - blink::WebSecurityOrigin opener_origin = opener_document.securityOrigin(); + blink::WebSecurityOrigin opener_origin = + opener_document.getSecurityOrigin(); bool opener_is_extension_url = !opener_origin.isUnique() && extension_registry->GetExtensionOrAppByURL( opener_document.url()) != nullptr; diff --git a/chrome/renderer/extensions/media_galleries_custom_bindings.cc b/chrome/renderer/extensions/media_galleries_custom_bindings.cc index a9f4cab..a13ea64 100644 --- a/chrome/renderer/extensions/media_galleries_custom_bindings.cc +++ b/chrome/renderer/extensions/media_galleries_custom_bindings.cc @@ -37,8 +37,8 @@ void MediaGalleriesCustomBindings::GetMediaFileSystemObject( blink::WebLocalFrame* webframe = blink::WebLocalFrame::frameForCurrentContext(); - const GURL origin = - blink::WebStringToGURL(webframe->document().securityOrigin().toString()); + const GURL origin = blink::WebStringToGURL( + webframe->document().getSecurityOrigin().toString()); std::string fs_name = storage::GetFileSystemName(origin, storage::kFileSystemTypeExternal); fs_name.append("_"); diff --git a/chrome/renderer/extensions/resource_request_policy.cc b/chrome/renderer/extensions/resource_request_policy.cc index 0a3464f..4495605 100644 --- a/chrome/renderer/extensions/resource_request_policy.cc +++ b/chrome/renderer/extensions/resource_request_policy.cc @@ -76,7 +76,7 @@ bool ResourceRequestPolicy::CanRequestResource( // but this is ok for the checks below. We only care if it matches the // current extension or has a devtools scheme. GURL page_origin = - blink::WebStringToGURL(frame->top()->securityOrigin().toString()); + blink::WebStringToGURL(frame->top()->getSecurityOrigin().toString()); // Exceptions are: // - empty origin (needed for some edge cases when we have empty origins) diff --git a/chrome/renderer/plugins/chrome_plugin_placeholder.cc b/chrome/renderer/plugins/chrome_plugin_placeholder.cc index f08b9b8..393e915 100644 --- a/chrome/renderer/plugins/chrome_plugin_placeholder.cc +++ b/chrome/renderer/plugins/chrome_plugin_placeholder.cc @@ -260,7 +260,8 @@ void ChromePluginPlaceholder::PluginListChanged() { ChromeViewHostMsg_GetPluginInfo_Output output; std::string mime_type(GetPluginParams().mimeType.utf8()); - blink::WebString top_origin = GetFrame()->top()->securityOrigin().toString(); + blink::WebString top_origin = + GetFrame()->top()->getSecurityOrigin().toString(); render_frame()->Send( new ChromeViewHostMsg_GetPluginInfo(routing_id(), GURL(GetPluginParams().url), diff --git a/chrome/renderer/plugins/power_saver_info.cc b/chrome/renderer/plugins/power_saver_info.cc index c54ed8c..2445c4f 100644 --- a/chrome/renderer/plugins/power_saver_info.cc +++ b/chrome/renderer/plugins/power_saver_info.cc @@ -102,7 +102,7 @@ PowerSaverInfo PowerSaverInfo::Get(content::RenderFrame* render_frame, info.blocked_for_background_tab = render_frame->IsHidden(); auto status = render_frame->GetPeripheralContentStatus( - render_frame->GetWebFrame()->top()->securityOrigin(), + render_frame->GetWebFrame()->top()->getSecurityOrigin(), url::Origin(params.url), gfx::Size()); // Early-exit from the whole Power Saver system if the content is diff --git a/chrome/renderer/worker_content_settings_client_proxy.cc b/chrome/renderer/worker_content_settings_client_proxy.cc index cdf81ae..ce38f34 100644 --- a/chrome/renderer/worker_content_settings_client_proxy.cc +++ b/chrome/renderer/worker_content_settings_client_proxy.cc @@ -19,14 +19,14 @@ WorkerContentSettingsClientProxy::WorkerContentSettingsClientProxy( blink::WebFrame* frame) : routing_id_(render_frame->GetRoutingID()), is_unique_origin_(false) { - if (frame->document().securityOrigin().isUnique() || - frame->top()->securityOrigin().isUnique()) + if (frame->document().getSecurityOrigin().isUnique() || + frame->top()->getSecurityOrigin().isUnique()) is_unique_origin_ = true; sync_message_filter_ = content::RenderThread::Get()->GetSyncMessageFilter(); document_origin_url_ = - blink::WebStringToGURL(frame->document().securityOrigin().toString()); + blink::WebStringToGURL(frame->document().getSecurityOrigin().toString()); top_frame_origin_url_ = - blink::WebStringToGURL(frame->top()->securityOrigin().toString()); + blink::WebStringToGURL(frame->top()->getSecurityOrigin().toString()); } WorkerContentSettingsClientProxy::~WorkerContentSettingsClientProxy() {} |