Diff
Modified: branches/safari-536.28-branch/LayoutTests/ChangeLog (134479 => 134480)
--- branches/safari-536.28-branch/LayoutTests/ChangeLog 2012-11-13 21:50:12 UTC (rev 134479)
+++ branches/safari-536.28-branch/LayoutTests/ChangeLog 2012-11-13 21:53:27 UTC (rev 134480)
@@ -1,5 +1,22 @@
2012-11-13 Lucas Forschler <[email protected]>
+ Merge r125280
+
+ 2012-08-10 Jon Lee <[email protected]>
+
+ Change Notification.permissionLevel() to Notification.permission
+ https://bugs.webkit.org/show_bug.cgi?id=88919
+ <rdar://problem/11650319>
+
+ Reviewed by Kentaro Hara.
+
+ * fast/notifications/notifications-permission-expected.txt: Added.
+ * fast/notifications/notifications-permission.html: Added.
+ * platform/chromium/TestExpectations: V8 does not properly support IDL static
+ attributes. This is tracked in bug 93488.
+
+2012-11-13 Lucas Forschler <[email protected]>
+
Merge r127000
2012-08-29 Alexander Pavlov <[email protected]>
@@ -11416,3 +11433,4 @@
.
.
.
+.
Copied: branches/safari-536.28-branch/LayoutTests/fast/notifications/notifications-permission-expected.txt (from rev 125280, trunk/LayoutTests/fast/notifications/notifications-permission-expected.txt) (0 => 134480)
--- branches/safari-536.28-branch/LayoutTests/fast/notifications/notifications-permission-expected.txt (rev 0)
+++ branches/safari-536.28-branch/LayoutTests/fast/notifications/notifications-permission-expected.txt 2012-11-13 21:53:27 UTC (rev 134480)
@@ -0,0 +1,10 @@
+Check for existence of Notification.permission
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+PASS window.Notification is defined.
+PASS window.Notification.permission is defined.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Copied: branches/safari-536.28-branch/LayoutTests/fast/notifications/notifications-permission.html (from rev 125280, trunk/LayoutTests/fast/notifications/notifications-permission.html) (0 => 134480)
--- branches/safari-536.28-branch/LayoutTests/fast/notifications/notifications-permission.html (rev 0)
+++ branches/safari-536.28-branch/LayoutTests/fast/notifications/notifications-permission.html 2012-11-13 21:53:27 UTC (rev 134480)
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <script src=""
+</head>
+
+<body>
+<div id="description"></div>
+<div id="console"></div>
+
+<script type="text/_javascript_">
+description("Check for existence of Notification.permission");
+
+shouldBeDefined("window.Notification");
+shouldBeDefined("window.Notification.permission");
+
+var successfullyParsed = true;
+</script>
+<script src=""
+</body>
+</html>
Modified: branches/safari-536.28-branch/Source/WebCore/ChangeLog (134479 => 134480)
--- branches/safari-536.28-branch/Source/WebCore/ChangeLog 2012-11-13 21:50:12 UTC (rev 134479)
+++ branches/safari-536.28-branch/Source/WebCore/ChangeLog 2012-11-13 21:53:27 UTC (rev 134480)
@@ -1,5 +1,28 @@
2012-11-13 Lucas Forschler <[email protected]>
+ Merge r125280
+
+ 2012-08-10 Jon Lee <[email protected]>
+
+ Change Notification.permissionLevel() to Notification.permission
+ https://bugs.webkit.org/show_bug.cgi?id=88919
+ <rdar://problem/11650319>
+
+ Reviewed by Kentaro Hara.
+
+ Retrieving the permission level has changed to Notification.permission, per this discussion:
+ http://lists.w3.org/Archives/Public/public-web-notification/2012Jun/0000.html
+
+ Test: fast/notifications/notifications-permission.html
+
+ * Modules/notifications/Notification.cpp: Rename to match attribute name.
+ (WebCore::Notification::permission):
+ * Modules/notifications/Notification.h: Rename to match attribute name.
+ (Notification):
+ * Modules/notifications/Notification.idl: Change to static readonly attribute.
+
+2012-11-13 Lucas Forschler <[email protected]>
+
Merge r127000
2012-08-29 Alexander Pavlov <[email protected]>
@@ -207420,3 +207443,4 @@
.
.
.
+.
Modified: branches/safari-536.28-branch/Source/WebCore/notifications/Notification.cpp (134479 => 134480)
--- branches/safari-536.28-branch/Source/WebCore/notifications/Notification.cpp 2012-11-13 21:50:12 UTC (rev 134479)
+++ branches/safari-536.28-branch/Source/WebCore/notifications/Notification.cpp 2012-11-13 21:53:27 UTC (rev 134480)
@@ -252,7 +252,7 @@
#if ENABLE(NOTIFICATIONS)
-const String& Notification::permissionLevel(ScriptExecutionContext* context)
+const String& Notification::permission(ScriptExecutionContext* context)
{
ASSERT(context->isDocument());
ASSERT(static_cast<Document*>(context)->page());
Modified: branches/safari-536.28-branch/Source/WebCore/notifications/Notification.h (134479 => 134480)
--- branches/safari-536.28-branch/Source/WebCore/notifications/Notification.h 2012-11-13 21:50:12 UTC (rev 134479)
+++ branches/safari-536.28-branch/Source/WebCore/notifications/Notification.h 2012-11-13 21:53:27 UTC (rev 134480)
@@ -138,7 +138,7 @@
void finalize();
#if ENABLE(NOTIFICATIONS)
- static const String& permissionLevel(ScriptExecutionContext*);
+ static const String& permission(ScriptExecutionContext*);
static const String& permissionString(NotificationClient::Permission);
static void requestPermission(ScriptExecutionContext*, PassRefPtr<NotificationPermissionCallback>);
#endif
Modified: branches/safari-536.28-branch/Source/WebCore/notifications/Notification.idl (134479 => 134480)
--- branches/safari-536.28-branch/Source/WebCore/notifications/Notification.idl 2012-11-13 21:50:12 UTC (rev 134479)
+++ branches/safari-536.28-branch/Source/WebCore/notifications/Notification.idl 2012-11-13 21:53:27 UTC (rev 134480)
@@ -52,7 +52,7 @@
#if defined(ENABLE_NOTIFICATIONS) && ENABLE_NOTIFICATIONS
- [CallWith=ScriptExecutionContext] static DOMString permissionLevel();
+ static readonly attribute [CallWith=ScriptExecutionContext] DOMString permission;
[Custom] static void requestPermission(in NotificationPermissionCallback callback);
#endif
