[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 96f6162c8139d0b5308799e98a089b6188dc2daa
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Mar 13 08:31:14 2010 +0000

    2010-03-13  Eric Roman  <eroman at chromium.org>
    
            Reviewed by Adam Barth.
    
            Add a firstPartyForCookies() property to WebDocument.
            https://bugs.webkit.org/show_bug.cgi?id=35592
    
            * public/WebDocument.h:
            * src/WebDocument.cpp:
            (WebKit::WebDocument::firstPartyForCookies):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55952 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 7385c58..d929cf1 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-13  Eric Roman  <eroman at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Add a firstPartyForCookies() property to WebDocument.
+        https://bugs.webkit.org/show_bug.cgi?id=35592
+
+        * public/WebDocument.h:
+        * src/WebDocument.cpp:
+        (WebKit::WebDocument::firstPartyForCookies):
+
 2010-03-12  Garret Kelly  <gdk at chromium.org>
 
         Unreiviewed.
diff --git a/WebKit/chromium/public/WebDocument.h b/WebKit/chromium/public/WebDocument.h
index 8397af7..d98c003 100644
--- a/WebKit/chromium/public/WebDocument.h
+++ b/WebKit/chromium/public/WebDocument.h
@@ -63,6 +63,7 @@ public:
     WEBKIT_API WebFrame* frame() const;
     WEBKIT_API bool isHTMLDocument() const;
     WEBKIT_API WebURL baseURL() const;
+    WEBKIT_API WebURL firstPartyForCookies() const;
     WEBKIT_API WebElement documentElement() const;
     WEBKIT_API WebElement body() const;
     WEBKIT_API WebElement head();
diff --git a/WebKit/chromium/src/WebDocument.cpp b/WebKit/chromium/src/WebDocument.cpp
index ac33d57..73dc365 100644
--- a/WebKit/chromium/src/WebDocument.cpp
+++ b/WebKit/chromium/src/WebDocument.cpp
@@ -67,6 +67,11 @@ WebURL WebDocument::baseURL() const
     return constUnwrap<Document>()->baseURL();
 }
 
+WebURL WebDocument::firstPartyForCookies() const
+{
+    return constUnwrap<Document>()->firstPartyForCookies();
+}
+
 WebElement WebDocument::documentElement() const
 {
     return WebElement(constUnwrap<Document>()->documentElement());

-- 
WebKit Debian packaging