Changeset 56043 in webkit


Ignore:
Timestamp:
Mar 15, 2010 11:42:30 PM (14 years ago)
Author:
eric@webkit.org
Message:

2010-03-15 John Gregg <​johnnyg@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@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):
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r56042 r56043  
     12010-03-15  John Gregg  <johnnyg@google.com>
     2
     3        Reviewed by David Levin.
     4
     5        Notification object should expose absolute URL of icon
     6        https://bugs.webkit.org/show_bug.cgi?id=35800
     7
     8        Covered by existing tests.
     9
     10        * notifications/Notification.cpp:
     11        (WebCore::Notification::Notification):
     12        * notifications/Notification.h:
     13        (WebCore::Notification::iconURL):
     14
    1152010-03-15  Leandro Pereira  <leandro@profusion.mobi>
    216

  • trunk/WebCore/notifications/Notification.cpp

    r55888 r56043  
    7474        return;
    7575    }
    76    
    77     KURL icon = context->completeURL(contents.icon());
    78     if (!icon.isEmpty() && !icon.isValid()) {
     76
     77    m_iconURL = context->completeURL(contents.icon());
     78    if (!m_iconURL.isEmpty() && !m_iconURL.isValid()) {
    7979        ec = SYNTAX_ERR;
    8080        return;

  • trunk/WebCore/notifications/Notification.h

    r48701 r56043  
    6666        bool isHTML() { return m_isHTML; }
    6767        KURL url() { return m_notificationURL; }
     68        KURL iconURL() { return m_iconURL; }
    6869        NotificationContents& contents() { return m_contents; }
    6970
    … …  
    9192        bool m_isHTML;
    9293        KURL m_notificationURL;
     94        KURL m_iconURL;
    9395        NotificationContents m_contents;
    9496

  • trunk/WebKit/chromium/ChangeLog

    r56030 r56043  
     12010-03-15  John Gregg  <johnnyg@google.com>
     2
     3        Reviewed by David Levin.
     4
     5        Notification object should expose absolute URL of icon
     6        https://bugs.webkit.org/show_bug.cgi?id=35800
     7
     8        * public/WebNotification.h:
     9        * src/WebNotification.cpp:
     10        (WebKit::WebNotification::iconURL):
     11
    1122010-03-15  Darin Fisher  <darin@chromium.org>
    213

  • trunk/WebKit/chromium/public/WebNotification.h

    r50696 r56043  
    7373
    7474    // If not HTML, the parameters for the icon-title-text notification.
     75    // FIXME: Deprecated; use iconURL() instead.
    7576    WEBKIT_API WebString icon() const;
     77    WEBKIT_API WebURL iconURL() const;
    7678    WEBKIT_API WebString title() const;
    7779    WEBKIT_API WebString body() const;

  • trunk/WebKit/chromium/src/WebNotification.cpp

    r50721 r56043  
    7777}
    7878
     79// FIXME: remove this deprecated function once all callers use iconURL()
    7980WebString WebNotification::icon() const
    8081{
    8182    ASSERT(!isHTML());
    8283    return m_private->contents().icon();
     84}
     85
     86WebURL WebNotification::iconURL() const
     87{
     88    ASSERT(!isHTML());
     89    return m_private->iconURL();
    8390}
    8491
Note: See TracChangeset for help on using the changeset viewer.