Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(949)

Unified Diff: Source/modules/notifications/Notification.cpp

Issue 993893002: Add the data attribute to the Notification object (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: [WIP] modified wrong comment. Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/modules/notifications/Notification.cpp
diff --git a/Source/modules/notifications/Notification.cpp b/Source/modules/notifications/Notification.cpp
index 0a8cf69dae08118ca53c7ea87a16e0f59bf85c07..b916441eefa1c2d9f0e295c29693320e59307d55 100644
--- a/Source/modules/notifications/Notification.cpp
+++ b/Source/modules/notifications/Notification.cpp
@@ -1,3 +1,4 @@
+
Peter Beverloo 2015/03/10 23:34:26 nit: no blank line
Sanghyun Park 2015/03/11 10:59:52 Oops, this is my fault;; I'll remove this.
/*
* Copyright (C) 2013 Google Inc. All rights reserved.
*
@@ -31,7 +32,9 @@
#include "config.h"
#include "modules/notifications/Notification.h"
+#include "bindings/core/v8/ScriptValue.h"
#include "bindings/core/v8/ScriptWrappable.h"
+#include "bindings/core/v8/SerializedScriptValueFactory.h"
#include "core/dom/Document.h"
#include "core/dom/ExecutionContext.h"
#include "core/dom/ExecutionContextTask.h"
@@ -85,6 +88,11 @@ Notification* Notification::create(ExecutionContext* context, const String& titl
notification->setIconUrl(iconUrl);
}
+ if (options.hasData()) {
+ notification->setData(SerializedScriptValueFactory::instance().create(options.data(), 0, exceptionState, options.data().isolate()));
Peter Beverloo 2015/03/10 23:34:26 We would need to abort after this call if an excep
Peter Beverloo 2015/03/10 23:34:26 nit: s/0/nullptr/
Sanghyun Park 2015/03/11 10:59:52 I'll fix this.
Sanghyun Park 2015/03/11 10:59:52 I fully agree about your opinion. I think that to
+ notification->data()->registerMemoryAllocatedWithCurrentScriptContext();
Peter Beverloo 2015/03/10 23:34:26 I don't think we need this here. If I read the co
Sanghyun Park 2015/03/11 10:59:52 I had checked about this again. You are right! I
+ }
+
String insecureOriginMessage;
UseCounter::Feature feature = context->securityOrigin()->canAccessFeatureRequiringSecureOrigin(insecureOriginMessage)
? UseCounter::NotificationSecureOrigin : UseCounter::NotificationInsecureOrigin;
@@ -109,6 +117,11 @@ Notification* Notification::create(ExecutionContext* context, const String& pers
if (!data.icon.isEmpty())
notification->setIconUrl(data.icon);
+ if (!data.data.isNull()) {
+ notification->setData(data.data);
+ notification->data()->registerMemoryAllocatedWithCurrentScriptContext();
+ }
+
notification->setState(NotificationStateShowing);
notification->suspendIfNeeded();
return notification;
@@ -150,7 +163,7 @@ void Notification::show()
// FIXME: Do CSP checks on the associated notification icon.
WebNotificationData::Direction dir = m_dir == "rtl" ? WebNotificationData::DirectionRightToLeft : WebNotificationData::DirectionLeftToRight;
- WebNotificationData notificationData(m_title, dir, m_lang, m_body, m_tag, m_iconUrl, m_silent);
+ WebNotificationData notificationData(m_title, dir, m_lang, m_body, m_tag, m_iconUrl, m_silent, m_data.release());
Peter Beverloo 2015/03/10 23:34:26 Why does the embedder need to know about the data
Sanghyun Park 2015/03/11 10:59:52 Oops, This is my mistake. I'll change to data.get(
notificationManager()->show(WebSerializedOrigin(*origin), notificationData, this);
m_state = NotificationStateShowing;

Powered by Google App Engine
This is Rietveld 408576698