Add badge to web notifications.

third_party/WebKit/Source/modules/notifications/NotificationData.cpp

Index: third_party/WebKit/Source/modules/notifications/NotificationData.cpp
diff --git a/third_party/WebKit/Source/modules/notifications/NotificationData.cpp b/third_party/WebKit/Source/modules/notifications/NotificationData.cpp
index e26722f3c95ad6101c87623c5885e12cf251117f..cb440cca77d7b097f4d07748c7d60a45e16d5212 100644
--- a/third_party/WebKit/Source/modules/notifications/NotificationData.cpp
+++ b/third_party/WebKit/Source/modules/notifications/NotificationData.cpp
@@ -27,6 +27,14 @@ WebNotificationData::Direction toDirectionEnumValue(const String& direction)
     return WebNotificationData::DirectionAuto;
 }
 
+KURL completeURL(ExecutionContext* executionContext, const String& url)

[Peter Beverloo, 2016/03/03 17:55:39]

nit: Perhaps be explicit and make this return a WebURL, since we only assign it
to that?

[Michael van Ouwerkerk, 2016/03/09 18:28:25]

Done.

+{
+    KURL kurl = executionContext->completeURL(url);
+    if (kurl.isValid())
+        return kurl;
+    return KURL();
+}
+
 } // namespace
 
 WebNotificationData createWebNotificationData(ExecutionContext* executionContext, const String& title, const NotificationOptions& options, ExceptionState& exceptionState)
@@ -51,15 +59,12 @@ WebNotificationData createWebNotificationData(ExecutionContext* executionContext
     webData.body = options.body();
     webData.tag = options.tag();
 
-    KURL iconUrl;
+    if (options.hasIcon() && !options.icon().isEmpty())
+        webData.icon = completeURL(executionContext, options.icon());
 
-    if (options.hasIcon() && !options.icon().isEmpty()) {
-        iconUrl = executionContext->completeURL(options.icon());
-        if (!iconUrl.isValid())
-            iconUrl = KURL();
-    }
+    if (options.hasSmallIcon() && !options.smallIcon().isEmpty())
+        webData.smallIcon = completeURL(executionContext, options.smallIcon());
 
-    webData.icon = iconUrl;
     webData.vibrate = NavigatorVibration::sanitizeVibrationPattern(options.vibrate());
     webData.timestamp = options.hasTimestamp() ? static_cast<double>(options.timestamp()) : WTF::currentTimeMS();
     webData.renotify = options.renotify();
@@ -88,13 +93,8 @@ WebNotificationData createWebNotificationData(ExecutionContext* executionContext
         webAction.action = action.action();
         webAction.title = action.title();
 
-        KURL iconUrl;
-        if (action.hasIcon() && !action.icon().isEmpty()) {
-            iconUrl = executionContext->completeURL(action.icon());
-            if (!iconUrl.isValid())
-                iconUrl = KURL();
-        }
-        webAction.icon = iconUrl;
+        if (action.hasIcon() && !action.icon().isEmpty())
+            webAction.icon = completeURL(executionContext, action.icon());
 
         actions.append(webAction);
     }