blink: Rename modules/ method to prefix with get when they collide.

third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp

 /*
  * Copyright (C) 2008, 2009, 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 239 matching lines @@
 
     if (!installDOMWindow()) {
         disposeContext(DoNotDetachGlobal);
         return false;
     }
 
     SecurityOrigin* origin = 0;
     if (m_world->isMainWorld()) {
         // ActivityLogger for main world is updated within updateDocument().
         updateDocument();
-        origin = m_frame->securityContext()->securityOrigin();
+        origin = m_frame->securityContext()->getSecurityOrigin();
         // FIXME: Can this be removed when CSP moves to browser?
         ContentSecurityPolicy* csp = m_frame->securityContext()->contentSecurityPolicy();
         context->AllowCodeGenerationFromStrings(csp->allowEval(0, ContentSecurityPolicy::SuppressReport));
         context->SetErrorMessageForCodeGenerationFromStrings(v8String(m_isolate, csp->evalDisabledErrorMessage()));
     } else {
         updateActivityLogger();
         origin = m_world->isolatedWorldSecurityOrigin();
         setSecurityToken(origin);
     }
     if (m_frame->isLocalFrame()) {
@@ skipping 197 matching lines @@
     v8::HandleScope handleScope(m_isolate);
     v8::Local<v8::Context> context = m_scriptState->context();
     if (token.isEmpty() || token == "null") {
         context->UseDefaultSecurityToken();
         return;
     }
 
     if (m_world->isPrivateScriptIsolatedWorld()) {
         token = "private-script://" + token;
     } else if (m_world->isIsolatedWorld()) {
-        SecurityOrigin* frameSecurityOrigin = m_frame->securityContext()->securityOrigin();
+        SecurityOrigin* frameSecurityOrigin = m_frame->securityContext()->getSecurityOrigin();
         String frameSecurityToken = frameSecurityOrigin->toString();
         // We need to check the return value of domainWasSetInDOM() on the
         // frame's SecurityOrigin because, if that's the case, only
         // SecurityOrigin::m_domain would have been modified.
         // m_domain is not used by SecurityOrigin::toString(), so we would end
         // up generating the same token that was already set.
         if (frameSecurityOrigin->domainWasSetInDOM() || frameSecurityToken.isEmpty() || frameSecurityToken == "null") {
             context->UseDefaultSecurityToken();
             return;
         }
         token = frameSecurityToken + token;
     }
 
     CString utf8Token = token.utf8();
     // NOTE: V8 does identity comparison in fast path, must use a symbol
     // as the security token.
     context->SetSecurityToken(v8AtomicString(m_isolate, utf8Token.data(), utf8Token.length()));
 }
 
 void WindowProxy::updateDocument()
 {
     ASSERT(m_world->isMainWorld());
     if (!isGlobalInitialized())
         return;
     if (!isContextInitialized())
         return;
     updateActivityLogger();
     updateDocumentProperty();
-    updateSecurityOrigin(m_frame->securityContext()->securityOrigin());
+    updateSecurityOrigin(m_frame->securityContext()->getSecurityOrigin());
 }
 
 static v8::Local<v8::Value> getNamedProperty(HTMLDocument* htmlDocument, const AtomicString& key, v8::Local<v8::Object> creationContext, v8::Isolate* isolate)
 {
     if (!htmlDocument->hasNamedItem(key) && !htmlDocument->hasExtraNamedItem(key))
         return v8Undefined();
 
     RefPtrWillBeRawPtr<DocumentNameCollection> items = htmlDocument->documentNamedItems(key);
     if (items->isEmpty())
         return v8Undefined();
@@ skipping 61 matching lines @@
 }
 
 void WindowProxy::updateSecurityOrigin(SecurityOrigin* origin)
 {
     if (!isContextInitialized())
         return;
     setSecurityToken(origin);
 }
 
 } // namespace blink