1 files changed, 35 insertions, 4 deletions

diff --git a/WebKit/chromium/src/WebSecurityOrigin.cpp b/WebKit/chromium/src/WebSecurityOrigin.cpp
index 81546da..adccb31 100644
--- a/WebKit/chromium/src/WebSecurityOrigin.cpp
+++ b/WebKit/chromium/src/WebSecurityOrigin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Google Inc. All rights reserved.
+ * Copyright (C) 2010 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
@@ -31,8 +31,10 @@
 #include "config.h"
 #include "WebSecurityOrigin.h"
 
+#include "KURL.h"
 #include "SecurityOrigin.h"
 #include "WebString.h"
+#include "WebURL.h"
 #include <wtf/PassRefPtr.h>
 
 using namespace WebCore;
@@ -42,9 +44,9 @@ namespace WebKit {
 class WebSecurityOriginPrivate : public SecurityOrigin {
 };
 
-WebSecurityOrigin* WebSecurityOrigin::createFromDatabaseIdentifier(const WebString& databaseIdentifier)
+WebSecurityOrigin WebSecurityOrigin::createFromDatabaseIdentifier(const WebString& databaseIdentifier)
 {
-    return new WebSecurityOrigin(SecurityOrigin::createFromDatabaseIdentifier(databaseIdentifier));
+    return WebSecurityOrigin(SecurityOrigin::createFromDatabaseIdentifier(databaseIdentifier));
 }
 
 WebSecurityOrigin WebSecurityOrigin::createFromString(const WebString& origin)
@@ -52,6 +54,11 @@ WebSecurityOrigin WebSecurityOrigin::createFromString(const WebString& origin)
     return WebSecurityOrigin(SecurityOrigin::createFromString(origin));
 }
 
+WebSecurityOrigin WebSecurityOrigin::create(const WebURL& url)
+{
+    return WebSecurityOrigin(SecurityOrigin::create(url));
+}
+
 void WebSecurityOrigin::reset()
 {
     assign(0);
@@ -89,18 +96,37 @@ bool WebSecurityOrigin::isEmpty() const
     return m_private->isEmpty();
 }
 
+bool WebSecurityOrigin::canAccess(const WebSecurityOrigin& other) const
+{
+    ASSERT(m_private);
+    ASSERT(other.m_private);
+    return m_private->canAccess(other.m_private);
+}
+
+bool WebSecurityOrigin::canRequest(const WebURL& url) const
+{
+    ASSERT(m_private);
+    return m_private->canRequest(url);
+}
+
 WebString WebSecurityOrigin::toString() const
 {
     ASSERT(m_private);
     return m_private->toString();
 }
 
-WebString WebSecurityOrigin::databaseIdentifier()
+WebString WebSecurityOrigin::databaseIdentifier() const
 {
     ASSERT(m_private);
     return m_private->databaseIdentifier();
 }
 
+bool WebSecurityOrigin::canAccessPasswordManager() const
+{
+    ASSERT(m_private);
+    return m_private->canAccessPasswordManager();
+}
+
 WebSecurityOrigin::WebSecurityOrigin(const WTF::PassRefPtr<WebCore::SecurityOrigin>& origin)
     : m_private(static_cast<WebSecurityOriginPrivate*>(origin.releaseRef()))
 {
@@ -117,6 +143,11 @@ WebSecurityOrigin::operator WTF::PassRefPtr<WebCore::SecurityOrigin>() const
     return PassRefPtr<SecurityOrigin>(const_cast<WebSecurityOriginPrivate*>(m_private));
 }
 
+SecurityOrigin* WebSecurityOrigin::get() const
+{
+    return m_private;
+}
+
 void WebSecurityOrigin::assign(WebSecurityOriginPrivate* p)
 {
     // p is already ref'd for us by the caller