Chrome changes to extract the code from V8Proxy that special-cases...

webkit/api/src/WebSecurityOrigin.cpp

 /*
  * Copyright (C) 2009 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 37 matching lines @@
 }
 
 void WebSecurityOrigin::assign(const WebSecurityOrigin& other)
 {
     WebSecurityOriginPrivate* p = const_cast<WebSecurityOriginPrivate*>(other.m_private);
     if (p)
         p->ref();
     assign(p);
 }
 
+WebString WebSecurityOrigin::protocol() const
+{
+    ASSERT(m_private);
+    return m_private->protocol();
+}
+
+WebString WebSecurityOrigin::host() const
+{
+    ASSERT(m_private);
+    return m_private->host();
+}
+
+unsigned short WebSecurityOrigin::port() const
+{
+    ASSERT(m_private);
+    return m_private->port();
+}
+
+bool WebSecurityOrigin::isEmpty() const
+{
+    ASSERT(m_private);
+    return m_private->isEmpty();
+}
+
+WebString WebSecurityOrigin::toString() const
+{
+    // FIXME: We should not support calling this method when m_private is null.
+    if (m_private)
+        return m_private->toString();
+
+    return WebString::fromUTF8("null");
+}
+
 WebString WebSecurityOrigin::databaseIdentifier()
 {
+    // FIXME: We should not support calling this method when m_private is null.
     if (m_private)
         return m_private->databaseIdentifier();
 
     return WebString::fromUTF8("null");
 }
 
-WebString WebSecurityOrigin::toString() const
-{
-    if (m_private)
-        return m_private->toString();
-
-    return WebString::fromUTF8("null");
-}
-
 WebSecurityOrigin::WebSecurityOrigin(const WTF::PassRefPtr<WebCore::SecurityOrigin>& origin)
     : m_private(static_cast<WebSecurityOriginPrivate*>(origin.releaseRef()))
 {
 }
 
 WebSecurityOrigin& WebSecurityOrigin::operator=(const WTF::PassRefPtr<WebCore::SecurityOrigin>& origin)
 {
     assign(static_cast<WebSecurityOriginPrivate*>(origin.releaseRef()));
     return *this;
 }
 
 WebSecurityOrigin::operator WTF::PassRefPtr<WebCore::SecurityOrigin>() const
 {
     return PassRefPtr<SecurityOrigin>(const_cast<WebSecurityOriginPrivate*>(m_private));
 }
 
 void WebSecurityOrigin::assign(WebSecurityOriginPrivate* p)
 {
     // p is already ref'd for us by the caller
     if (m_private)
         m_private->deref();
     m_private = p;
 }
 
 } // namespace WebKit