[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[jorlow at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 75b4d2581b3e4479378b87c336ad44f03a609eaf
Author: jorlow at chromium.org <jorlow at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 2 08:52:11 2010 +0000

    2010-02-01  Jeremy Orlow  <jorlow at chromium.org>
    
            Reviewed by Darin Fisher.
    
            [Chromium] Add WebSecurityOrigin::createFromString factory
            https://bugs.webkit.org/show_bug.cgi?id=34460
    
            * public/WebSecurityOrigin.h:
            * src/WebSecurityOrigin.cpp:
            (WebKit::WebSecurityOrigin::createFromString):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54214 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 058279e..7961c7a 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2010-02-01  Jeremy Orlow  <jorlow at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [Chromium] Add WebSecurityOrigin::createFromString factory
+        https://bugs.webkit.org/show_bug.cgi?id=34460
+
+        * public/WebSecurityOrigin.h:
+        * src/WebSecurityOrigin.cpp:
+        (WebKit::WebSecurityOrigin::createFromString):
+
 2010-02-02  Kent Tamura  <tkent at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/public/WebSecurityOrigin.h b/WebKit/chromium/public/WebSecurityOrigin.h
index 7b04aac..1285b10 100644
--- a/WebKit/chromium/public/WebSecurityOrigin.h
+++ b/WebKit/chromium/public/WebSecurityOrigin.h
@@ -55,7 +55,9 @@ public:
         return *this;
     }
 
+    // FIXME: This should return a WebSecurityOrigin, not a pointer to one.
     WEBKIT_API static WebSecurityOrigin* createFromDatabaseIdentifier(const WebString& databaseIdentifier);
+    WEBKIT_API static WebSecurityOrigin createFromString(const WebString&);
 
     WEBKIT_API void reset();
     WEBKIT_API void assign(const WebSecurityOrigin&);
diff --git a/WebKit/chromium/src/WebSecurityOrigin.cpp b/WebKit/chromium/src/WebSecurityOrigin.cpp
index 87916ca..81546da 100644
--- a/WebKit/chromium/src/WebSecurityOrigin.cpp
+++ b/WebKit/chromium/src/WebSecurityOrigin.cpp
@@ -47,6 +47,11 @@ WebSecurityOrigin* WebSecurityOrigin::createFromDatabaseIdentifier(const WebStri
     return new WebSecurityOrigin(SecurityOrigin::createFromDatabaseIdentifier(databaseIdentifier));
 }
 
+WebSecurityOrigin WebSecurityOrigin::createFromString(const WebString& origin)
+{
+    return WebSecurityOrigin(SecurityOrigin::createFromString(origin));
+}
+
 void WebSecurityOrigin::reset()
 {
     assign(0);

-- 
WebKit Debian packaging