Rubber-stamped by Adam Roben.

        Rename SecurityOrigin::allowsAccessFrom to SecurityOrigin::canAccess to
        clear up ambiguity.

        * bindings/js/kjs_window.cpp:
        (KJS::Window::isSafeScript):
        * platform/SecurityOrigin.cpp:
        (WebCore::SecurityOrigin::canAccess):
        * platform/SecurityOrigin.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@27433 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5b2bb4671360885a50c675739c22e6dfc48a0a00..701b90737e539469fde17d1c485a2a1cf8268123 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2007-11-04  Sam Weinig  <sam@webkit.org>
+
+        Rubber-stamped by Adam Roben.
+
+        Rename SecurityOrigin::allowsAccessFrom to SecurityOrigin::canAccess to 
+        clear up ambiguity.
+
+        * bindings/js/kjs_window.cpp:
+        (KJS::Window::isSafeScript):
+        * platform/SecurityOrigin.cpp:
+        (WebCore::SecurityOrigin::canAccess):
+        * platform/SecurityOrigin.h:
+
 2007-11-04  Timothy Hatcher  <timothy@apple.com>
 
         Reviewed by Adam.

diff --git a/WebCore/bindings/js/kjs_window.cpp b/WebCore/bindings/js/kjs_window.cpp
index 6c81d72de99a1fcd7d5311534a4deb680425bd63..bdcd39297cc49aafc6fb6a017eb88e6a07b75475 100644 (file)
--- a/WebCore/bindings/js/kjs_window.cpp
+++ b/WebCore/bindings/js/kjs_window.cpp
@@ -933,7 +933,7 @@ bool Window::isSafeScript(ExecState *exec) const
   const SecurityOrigin& actSecurityOrigin = actDocument->securityOrigin();
   const SecurityOrigin& thisSecurityOrigin = thisDocument->securityOrigin();
 
-  if (actSecurityOrigin.allowsAccessFrom(thisSecurityOrigin))
+  if (actSecurityOrigin.canAccess(thisSecurityOrigin))
     return true;
 
   // FIXME: this error message should contain more specifics of why the same origin check has failed.

diff --git a/WebCore/platform/SecurityOrigin.cpp b/WebCore/platform/SecurityOrigin.cpp
index 1f5107c7cdce6bb2889999cb24d52815f6bbc039..862d8ef858323a67d400587a4af93db6d4a7cb44 100644 (file)
--- a/WebCore/platform/SecurityOrigin.cpp
+++ b/WebCore/platform/SecurityOrigin.cpp
@@ -107,7 +107,7 @@ void SecurityOrigin::setDomainFromDOM(const String& newDomain)
     m_host = newDomain.lower();
 }
 
-bool SecurityOrigin::allowsAccessFrom(const SecurityOrigin& other) const
+bool SecurityOrigin::canAccess(const SecurityOrigin& other) const
 {
     if (m_protocol == "file")
         return true;

diff --git a/WebCore/platform/SecurityOrigin.h b/WebCore/platform/SecurityOrigin.h
index e6c9afc6864daba39844887a3674815449fdcc10..6d972bd9774b771931d74a1203ef4e0b93c9bfb2 100644 (file)
--- a/WebCore/platform/SecurityOrigin.h
+++ b/WebCore/platform/SecurityOrigin.h
@@ -43,7 +43,7 @@ namespace WebCore {
         void setForFrame(Frame*);
         void setDomainFromDOM(const String& newDomain);
 
-        bool allowsAccessFrom(const SecurityOrigin&) const;
+        bool canAccess(const SecurityOrigin&) const;
         bool isSecureTransitionTo(const KURL&) const;
 
         String toString() const;