[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 3f35a770d93d49f13d93a4208d42226f503851a5
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 16 06:42:30 2010 +0000

    2010-03-15  John Gregg  <johnnyg at google.com>
    
            Reviewed by David Levin.
    
            Notification object should expose absolute URL of icon
            https://bugs.webkit.org/show_bug.cgi?id=35800
    
            Covered by existing tests.
    
            * notifications/Notification.cpp:
            (WebCore::Notification::Notification):
            * notifications/Notification.h:
            (WebCore::Notification::iconURL):
    2010-03-15  John Gregg  <johnnyg at google.com>
    
            Reviewed by David Levin.
    
            Notification object should expose absolute URL of icon
            https://bugs.webkit.org/show_bug.cgi?id=35800
    
            * public/WebNotification.h:
            * src/WebNotification.cpp:
            (WebKit::WebNotification::iconURL):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@56043 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d26c5b1..20c9950 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-03-15  John Gregg  <johnnyg at google.com>
+
+        Reviewed by David Levin.
+
+        Notification object should expose absolute URL of icon
+        https://bugs.webkit.org/show_bug.cgi?id=35800
+
+        Covered by existing tests.
+
+        * notifications/Notification.cpp:
+        (WebCore::Notification::Notification):
+        * notifications/Notification.h:
+        (WebCore::Notification::iconURL):
+
 2010-03-15  Leandro Pereira  <leandro at profusion.mobi>
 
         Reviewed by Holger Freyther.
diff --git a/WebCore/notifications/Notification.cpp b/WebCore/notifications/Notification.cpp
index 874d2f0..9763f7b 100644
--- a/WebCore/notifications/Notification.cpp
+++ b/WebCore/notifications/Notification.cpp
@@ -73,9 +73,9 @@ Notification::Notification(const NotificationContents& contents, ScriptExecution
         ec = SECURITY_ERR;
         return;
     }
-    
-    KURL icon = context->completeURL(contents.icon());
-    if (!icon.isEmpty() && !icon.isValid()) {
+
+    m_iconURL = context->completeURL(contents.icon());
+    if (!m_iconURL.isEmpty() && !m_iconURL.isValid()) {
         ec = SYNTAX_ERR;
         return;
     }
diff --git a/WebCore/notifications/Notification.h b/WebCore/notifications/Notification.h
index 6545579..c2ba5d9 100644
--- a/WebCore/notifications/Notification.h
+++ b/WebCore/notifications/Notification.h
@@ -65,6 +65,7 @@ namespace WebCore {
     
         bool isHTML() { return m_isHTML; }
         KURL url() { return m_notificationURL; }
+        KURL iconURL() { return m_iconURL; }
         NotificationContents& contents() { return m_contents; }
 
         DEFINE_ATTRIBUTE_EVENT_LISTENER(display);
@@ -90,6 +91,7 @@ namespace WebCore {
 
         bool m_isHTML;
         KURL m_notificationURL;
+        KURL m_iconURL;
         NotificationContents m_contents;
 
         bool m_isShowing;
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index d602480..20d036e 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-15  John Gregg  <johnnyg at google.com>
+
+        Reviewed by David Levin.
+
+        Notification object should expose absolute URL of icon
+        https://bugs.webkit.org/show_bug.cgi?id=35800
+
+        * public/WebNotification.h:
+        * src/WebNotification.cpp:
+        (WebKit::WebNotification::iconURL):
+
 2010-03-15  Darin Fisher  <darin at chromium.org>
 
         Fix build bustage.  We also need to pull down "third_party/tcmalloc"
diff --git a/WebKit/chromium/public/WebNotification.h b/WebKit/chromium/public/WebNotification.h
index 1a41252..b63dd20 100644
--- a/WebKit/chromium/public/WebNotification.h
+++ b/WebKit/chromium/public/WebNotification.h
@@ -72,7 +72,9 @@ public:
     WEBKIT_API WebURL url() const;
 
     // If not HTML, the parameters for the icon-title-text notification.
+    // FIXME: Deprecated; use iconURL() instead.
     WEBKIT_API WebString icon() const;
+    WEBKIT_API WebURL iconURL() const;
     WEBKIT_API WebString title() const;
     WEBKIT_API WebString body() const;
 
diff --git a/WebKit/chromium/src/WebNotification.cpp b/WebKit/chromium/src/WebNotification.cpp
index 1f6916e..26fd4bc 100644
--- a/WebKit/chromium/src/WebNotification.cpp
+++ b/WebKit/chromium/src/WebNotification.cpp
@@ -76,12 +76,19 @@ WebURL WebNotification::url() const
     return m_private->url();
 }
 
+// FIXME: remove this deprecated function once all callers use iconURL()
 WebString WebNotification::icon() const
 {
     ASSERT(!isHTML());
     return m_private->contents().icon();
 }
 
+WebURL WebNotification::iconURL() const
+{
+    ASSERT(!isHTML());
+    return m_private->iconURL();
+}
+
 WebString WebNotification::title() const
 {
     ASSERT(!isHTML());

-- 
WebKit Debian packaging