Fix some XSS test by fixing an improperly merged file and falling back on...

webkit/pending/SecurityOrigin.cpp

Index: webkit/pending/SecurityOrigin.cpp
===================================================================
--- webkit/pending/SecurityOrigin.cpp	(revision 2575)
+++ webkit/pending/SecurityOrigin.cpp	(working copy)
@@ -114,8 +114,10 @@
 }
 
 bool SecurityOrigin::canAccess(const SecurityOrigin* other) const
-{
+{  

[Evan Martin, 2008/09/25 00:56:11]

This looks funny, but it's what the upstream version has, and I'd prefer to
reduce merge conflicts.

     if (isLocal())
+        return true;
+
     if (m_noAccess || other->m_noAccess)
         return false;