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

webkit/pending/SecurityOrigin.cpp

 /*
  * Copyright (C) 2007 Apple 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 96 matching lines @@
     return adoptRef(new SecurityOrigin(this));
 }
 
 void SecurityOrigin::setDomainFromDOM(const String& newDomain)
 {
     m_domainWasSetInDOM = true;
     m_domain = newDomain.lower();
 }
 
 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;
 
     // Here are two cases where we should permit access:
     //
     // 1) Neither document has set document.domain.  In this case, we insist
     //    that the scheme, host, and port of the URLs match.
     //
     // 2) Both documents have set document.domain.  In this case, we insist
     //    that the documents have set document.domain to the same value and
@@ skipping 173 matching lines @@
         // We could encode the document.domain state into the security token,
         // but this is an uncommon case and leads to complexity.  We're better
         // off sending these accesses down the slow path.
         return String();
     }
 
     return toString();
 }
 
 } // namespace WebCore