git://git.webkit.org / WebKit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 892cfe0)
2010-05-19 Sheriff Bot <webkit.review.bot@gmail.com>
authordpranke@chromium.org <dpranke@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 19 May 2010 21:30:53 +0000 (21:30 +0000)
committerdpranke@chromium.org <dpranke@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 19 May 2010 21:30:53 +0000 (21:30 +0000)
        Unreviewed, rolling out r59782.
        http://trac.webkit.org/changeset/59782
        https://bugs.webkit.org/show_bug.cgi?id=39379

        broke DRT build (Requested by dpranke on #webkit).

        * fast/notifications/notifications-replace-expected.txt: Added.
        * fast/notifications/notifications-replace.html: Added.
        * fast/notifications/notifications-rtl-expected.txt: Added.
        * fast/notifications/notifications-rtl.html: Added.
2010-05-19  Sheriff Bot  <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r59782.
        http://trac.webkit.org/changeset/59782
        https://bugs.webkit.org/show_bug.cgi?id=39379

        broke DRT build (Requested by dpranke on #webkit).

        * notifications/Notification.h:
        (WebCore::Notification::dir):
        (WebCore::Notification::setDir):
        (WebCore::Notification::replaceId):
        (WebCore::Notification::setReplaceId):
        * notifications/Notification.idl:
2010-05-19  Sheriff Bot  <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r59782.
        http://trac.webkit.org/changeset/59782
        https://bugs.webkit.org/show_bug.cgi?id=39379

        broke DRT build (Requested by dpranke on #webkit).

        * public/WebNotification.h:
        * src/WebNotification.cpp:
        (WebKit::WebNotification::dir):
        (WebKit::WebNotification::replaceId):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@59785 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog patch | blob | history
LayoutTests/fast/notifications/notifications-replace-expected.txt [new file with mode: 0644] patch | blob
LayoutTests/fast/notifications/notifications-replace.html [new file with mode: 0644] patch | blob
LayoutTests/fast/notifications/notifications-rtl-expected.txt [new file with mode: 0644] patch | blob
LayoutTests/fast/notifications/notifications-rtl.html [new file with mode: 0644] patch | blob
WebCore/ChangeLog patch | blob | history
WebCore/notifications/Notification.h patch | blob | history
WebCore/notifications/Notification.idl patch | blob | history
WebKit/chromium/ChangeLog patch | blob | history
WebKit/chromium/public/WebNotification.h patch | blob | history
WebKit/chromium/src/WebNotification.cpp patch | blob | history

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ea8a4ed240672b24d02be09a62399520aa10ef06..15b892e3ff82a91f9efd78349059e99e56882454 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-05-19  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r59782.
+        http://trac.webkit.org/changeset/59782
+        https://bugs.webkit.org/show_bug.cgi?id=39379
+
+        broke DRT build (Requested by dpranke on #webkit).
+
+        * fast/notifications/notifications-replace-expected.txt: Added.
+        * fast/notifications/notifications-replace.html: Added.
+        * fast/notifications/notifications-rtl-expected.txt: Added.
+        * fast/notifications/notifications-rtl.html: Added.
+
 2010-05-18  Dirk Pranke  <dpranke@chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/LayoutTests/fast/notifications/notifications-replace-expected.txt b/LayoutTests/fast/notifications/notifications-replace-expected.txt
new file mode 100644 (file)
index 0000000..a4f7fc4
--- /dev/null
+++ b/LayoutTests/fast/notifications/notifications-replace-expected.txt
@@ -0,0 +1,7 @@
+DESKTOP NOTIFICATION: icon file:///email.png, title New E-mail, text Meet me tonight at 8!
+DESKTOP NOTIFICATION: icon file:///alarm.png, title Alarm, text It's time to wake up!
+REPLACING NOTIFICATION New E-mail
+DESKTOP NOTIFICATION: icon file:///email.png, title New reply, text Correction, 8:15
+Showing notifications with replace ID...
+
+
diff --git a/LayoutTests/fast/notifications/notifications-replace.html b/LayoutTests/fast/notifications/notifications-replace.html
new file mode 100644 (file)
index 0000000..1200cc6
--- /dev/null
+++ b/LayoutTests/fast/notifications/notifications-replace.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <script type="text/javascript">
+        function log(message)
+        {
+            document.getElementById("result").innerHTML += message + "<br>";
+        }
+        
+        function runTests()
+        {
+            if (window.layoutTestController) {
+                layoutTestController.grantDesktopNotificationPermission("file://");
+                layoutTestController.dumpAsText();
+            }
+
+            if (!window.webkitNotifications) {
+                log("FAIL: No webkitNotifications interface!");
+            }
+            
+            var M = window.webkitNotifications.createNotification("/email.png", "New E-mail", "Meet me tonight at 8!");
+            M.replaceId = "NewMail";
+            M.show();
+            var other = window.webkitNotifications.createNotification("/alarm.png", "Alarm", "It's time to wake up!");
+            other.show();
+            var N = window.webkitNotifications.createNotification("/email.png", "New reply", "Correction, 8:15");
+            N.replaceId = "NewMail";
+            N.show();          
+        }
+    </script>
+</head>
+<body>
+<p>Showing notifications with replace ID...</p>
+<div id="result"></div>
+<script type="text/javascript">
+runTests();
+</script>
+</body>
+</html>
diff --git a/LayoutTests/fast/notifications/notifications-rtl-expected.txt b/LayoutTests/fast/notifications/notifications-rtl-expected.txt
new file mode 100644 (file)
index 0000000..f2b01fc
--- /dev/null
+++ b/LayoutTests/fast/notifications/notifications-rtl-expected.txt
@@ -0,0 +1,4 @@
+DESKTOP NOTIFICATION:(RTL) icon , title New E-mail, text Meet me tonight at 8!
+Showing a notification with direction "rtl"...
+
+
diff --git a/LayoutTests/fast/notifications/notifications-rtl.html b/LayoutTests/fast/notifications/notifications-rtl.html
new file mode 100644 (file)
index 0000000..b7c048b
--- /dev/null
+++ b/LayoutTests/fast/notifications/notifications-rtl.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <script type="text/javascript">
+        function log(message)
+        {
+            document.getElementById("result").innerHTML += message + "<br>";
+        }
+        
+        function runTests()
+        {
+            if (window.layoutTestController) {
+                layoutTestController.grantDesktopNotificationPermission("file://");
+                layoutTestController.dumpAsText();
+            }
+
+            if (!window.webkitNotifications) {
+                log("FAIL: No webkitNotifications interface!");
+            }
+            
+            var M = window.webkitNotifications.createNotification("", "New E-mail", "Meet me tonight at 8!");
+            M.dir = "rtl";
+            M.show();
+        }
+    </script>
+</head>
+<body>
+<p>Showing a notification with direction "rtl"...</p>
+    
+<div id="result"></div>
+   
+<script type="text/javascript">
+runTests();
+</script>
+
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index dc4b6514a875ed4dff3c660d3c496bcff597c795..958a5fa6bf8f1521a1d3a86c59e90606b8c8521a 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-05-19  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r59782.
+        http://trac.webkit.org/changeset/59782
+        https://bugs.webkit.org/show_bug.cgi?id=39379
+
+        broke DRT build (Requested by dpranke on #webkit).
+
+        * notifications/Notification.h:
+        (WebCore::Notification::dir):
+        (WebCore::Notification::setDir):
+        (WebCore::Notification::replaceId):
+        (WebCore::Notification::setReplaceId):
+        * notifications/Notification.idl:
+
 2010-05-18  David Hyatt  <hyatt@apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/WebCore/notifications/Notification.h b/WebCore/notifications/Notification.h
index 98cbfdf9d665c5be4d1f63c1ff7d0f611ba65930..47de2a284c663f506c9eed896d4ff47ea0a5b62f 100644 (file)
--- a/WebCore/notifications/Notification.h
+++ b/WebCore/notifications/Notification.h
@@ -68,6 +68,11 @@ namespace WebCore {
         KURL iconURL() { return m_contents.icon(); }
         NotificationContents& contents() { return m_contents; }
 
+        String dir() const { return m_direction; }
+        void setDir(const String& dir) { m_direction = dir; }
+        String replaceId() const { return m_replaceId; }
+        void setReplaceId(const String& replaceId) { m_replaceId = replaceId; }
+
         DEFINE_ATTRIBUTE_EVENT_LISTENER(display);
         DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
         DEFINE_ATTRIBUTE_EVENT_LISTENER(close);
@@ -93,6 +98,9 @@ namespace WebCore {
         KURL m_notificationURL;
         NotificationContents m_contents;
 
+        String m_direction;
+        String m_replaceId;
+      
         bool m_isShowing;
 
         NotificationPresenter* m_presenter;
diff --git a/WebCore/notifications/Notification.idl b/WebCore/notifications/Notification.idl
index 7f018b7f6a7778136463d74ffee5c876d8573517..5ca84a5ddef6d764acb16fabcaf0a3c97a99b1bf 100644 (file)
--- a/WebCore/notifications/Notification.idl
+++ b/WebCore/notifications/Notification.idl
@@ -42,6 +42,9 @@ module threads {
         attribute EventListener onerror;
         attribute EventListener onclose;
 
+        attribute DOMString dir;
+        attribute DOMString replaceId;
+
         // EventTarget interface
         void addEventListener(in DOMString type, 
                               in EventListener listener, 
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index bb0a4eb68e2c24a8a42bb14fa0f9312116665054..e137ed2c22b029dadb84614dbc4b3f62b8aa8491 100644 (file)
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2010-05-19  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r59782.
+        http://trac.webkit.org/changeset/59782
+        https://bugs.webkit.org/show_bug.cgi?id=39379
+
+        broke DRT build (Requested by dpranke on #webkit).
+
+        * public/WebNotification.h:
+        * src/WebNotification.cpp:
+        (WebKit::WebNotification::dir):
+        (WebKit::WebNotification::replaceId):
+
 2010-05-18  Dirk Pranke  <dpranke@chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebKit/chromium/public/WebNotification.h b/WebKit/chromium/public/WebNotification.h
index 9d64e2a4b39d2a1e088ba947c43fb26c429c2cb6..ab747e3504c6219745cc67251dab27cd42059266 100644 (file)
--- a/WebKit/chromium/public/WebNotification.h
+++ b/WebKit/chromium/public/WebNotification.h
@@ -75,6 +75,9 @@ public:
     WEBKIT_API WebString title() const;
     WEBKIT_API WebString body() const;
 
+    WEBKIT_API WebString dir() const;
+    WEBKIT_API WebString replaceId() const;
+
     // Called to indicate the notification has been displayed.
     WEBKIT_API void dispatchDisplayEvent();
 
diff --git a/WebKit/chromium/src/WebNotification.cpp b/WebKit/chromium/src/WebNotification.cpp
index 5200d179fed4a630d9f7634fc51b8d0ae806afd0..5ae1557c25346588c62454b27d2ab7605fc328c7 100644 (file)
--- a/WebKit/chromium/src/WebNotification.cpp
+++ b/WebKit/chromium/src/WebNotification.cpp
@@ -94,6 +94,16 @@ WebString WebNotification::body() const
     return m_private->contents().body();
 }
 
+WebString WebNotification::dir() const
+{
+    return m_private->dir();
+}
+
+WebString WebNotification::replaceId() const
+{
+    return m_private->replaceId();
+}
+
 void WebNotification::dispatchDisplayEvent()
 {
     RefPtr<Event> event = Event::create("display", false, true);
Mirror of the WebKit open source project on svn.webkit.org.