Title: [127009] trunk/Source/WebKit/mac
- Revision
- 127009
- Author
- [email protected]
- Date
- 2012-08-29 10:12:28 -0700 (Wed, 29 Aug 2012)
Log Message
[Mac] Add iconURL to WebNotification
https://bugs.webkit.org/show_bug.cgi?id=95249
<rdar://problem/12192060>
Reviewed by Jessie Berlin.
* WebView/WebNotification.h: Expose iconURL.
* WebView/WebNotification.mm: Remove unnecessary ASSERTs.
(-[WebNotification title]):
(-[WebNotification body]):
(-[WebNotification tag]):
(-[WebNotification iconURL]): Added.
(-[WebNotification origin]):
(-[WebNotification notificationID]):
(-[WebNotification dispatchShowEvent]):
(-[WebNotification dispatchCloseEvent]):
(-[WebNotification dispatchClickEvent]):
(-[WebNotification dispatchErrorEvent]):
Reviewed by Jessie Berlin.
* WebView/WebNotification.h: Expose iconURL.
* WebView/WebNotification.mm:
(-[WebNotification iconURL]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (127008 => 127009)
--- trunk/Source/WebKit/mac/ChangeLog 2012-08-29 17:09:12 UTC (rev 127008)
+++ trunk/Source/WebKit/mac/ChangeLog 2012-08-29 17:12:28 UTC (rev 127009)
@@ -1,3 +1,31 @@
+2012-08-29 Jon Lee <[email protected]>
+
+ [Mac] Add iconURL to WebNotification
+ https://bugs.webkit.org/show_bug.cgi?id=95249
+ <rdar://problem/12192060>
+
+ Reviewed by Jessie Berlin.
+
+ * WebView/WebNotification.h: Expose iconURL.
+ * WebView/WebNotification.mm: Remove unnecessary ASSERTs.
+ (-[WebNotification title]):
+ (-[WebNotification body]):
+ (-[WebNotification tag]):
+ (-[WebNotification iconURL]): Added.
+ (-[WebNotification origin]):
+ (-[WebNotification notificationID]):
+ (-[WebNotification dispatchShowEvent]):
+ (-[WebNotification dispatchCloseEvent]):
+ (-[WebNotification dispatchClickEvent]):
+ (-[WebNotification dispatchErrorEvent]):
+
+
+ Reviewed by Jessie Berlin.
+
+ * WebView/WebNotification.h: Expose iconURL.
+ * WebView/WebNotification.mm:
+ (-[WebNotification iconURL]):
+
2012-08-28 Geoffrey Garen <[email protected]>
Added JSScope::objectInScope(), and refactored callers to use it
Modified: trunk/Source/WebKit/mac/WebView/WebNotification.h (127008 => 127009)
--- trunk/Source/WebKit/mac/WebView/WebNotification.h 2012-08-29 17:09:12 UTC (rev 127008)
+++ trunk/Source/WebKit/mac/WebView/WebNotification.h 2012-08-29 17:12:28 UTC (rev 127009)
@@ -37,6 +37,7 @@
- (NSString *)title;
- (NSString *)body;
- (NSString *)tag;
+- (NSString *)iconURL;
- (WebSecurityOrigin *)origin;
- (uint64_t)notificationID;
Modified: trunk/Source/WebKit/mac/WebView/WebNotification.mm (127008 => 127009)
--- trunk/Source/WebKit/mac/WebView/WebNotification.mm 2012-08-29 17:09:12 UTC (rev 127008)
+++ trunk/Source/WebKit/mac/WebView/WebNotification.mm 2012-08-29 17:12:28 UTC (rev 127009)
@@ -84,7 +84,6 @@
- (NSString *)title
{
#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
- ASSERT(core(self));
return core(self)->title();
#else
return nil;
@@ -94,7 +93,6 @@
- (NSString *)body
{
#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
- ASSERT(core(self));
return core(self)->body();
#else
return nil;
@@ -104,17 +102,24 @@
- (NSString *)tag
{
#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
- ASSERT(core(self));
return core(self)->tag();
#else
return nil;
#endif
}
+- (NSString *)iconURL
+{
+#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
+ return core(self)->iconURL();
+#else
+ return nil;
+#endif
+}
+
- (WebSecurityOrigin *)origin
{
#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
- ASSERT(core(self));
return [[[WebSecurityOrigin alloc] _initWithWebCoreSecurityOrigin:core(self)->scriptExecutionContext()->securityOrigin()] autorelease];
#else
return nil;
@@ -124,7 +129,6 @@
- (uint64_t)notificationID
{
#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
- ASSERT(core(self));
return _private->_notificationID;
#else
return 0;
@@ -134,7 +138,6 @@
- (void)dispatchShowEvent
{
#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
- ASSERT(core(self));
core(self)->dispatchShowEvent();
#endif
}
@@ -142,7 +145,6 @@
- (void)dispatchCloseEvent
{
#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
- ASSERT(core(self));
core(self)->dispatchCloseEvent();
#endif
}
@@ -150,7 +152,6 @@
- (void)dispatchClickEvent
{
#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
- ASSERT(core(self));
core(self)->dispatchClickEvent();
#endif
}
@@ -158,7 +159,6 @@
- (void)dispatchErrorEvent
{
#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
- ASSERT(core(self));
core(self)->dispatchErrorEvent();
#endif
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
