Merge webkit.org at r58033 : Initial merge by git

Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1

1 files changed, 4 insertions, 3 deletions

diff --git a/WebCore/notifications/Notification.h b/WebCore/notifications/Notification.h
index 6545579..98cbfdf 100644
--- a/WebCore/notifications/Notification.h
+++ b/WebCore/notifications/Notification.h
@@ -55,7 +55,7 @@ namespace WebCore {
 
     class Notification : public RefCounted<Notification>, public ActiveDOMObject, public EventTarget { 
     public:
-        static Notification* create(const String& url, ScriptExecutionContext* context, ExceptionCode& ec, NotificationPresenter* provider) { return new Notification(url, context, ec, provider); }
+        static Notification* create(const KURL& url, ScriptExecutionContext* context, ExceptionCode& ec, NotificationPresenter* provider) { return new Notification(url, context, ec, provider); }
         static Notification* create(const NotificationContents& contents, ScriptExecutionContext* context, ExceptionCode& ec, NotificationPresenter* provider) { return new Notification(contents, context, ec, provider); }
         
         virtual ~Notification();
@@ -65,6 +65,7 @@ namespace WebCore {
     
         bool isHTML() { return m_isHTML; }
         KURL url() { return m_notificationURL; }
+        KURL iconURL() { return m_contents.icon(); }
         NotificationContents& contents() { return m_contents; }
 
         DEFINE_ATTRIBUTE_EVENT_LISTENER(display);
@@ -79,8 +80,8 @@ namespace WebCore {
         virtual Notification* toNotification() { return this; }
 
     private:
-        Notification(const String& url, ScriptExecutionContext* context, ExceptionCode& ec, NotificationPresenter* provider);
-        Notification(const NotificationContents& fields, ScriptExecutionContext* context, ExceptionCode& ec, NotificationPresenter* provider);
+        Notification(const KURL&, ScriptExecutionContext*, ExceptionCode&, NotificationPresenter*);
+        Notification(const NotificationContents&, ScriptExecutionContext*, ExceptionCode&, NotificationPresenter*);
 
         // EventTarget interface
         virtual void refEventTarget() { ref(); }