git://git.webkit.org / WebKit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 69fdfe2)
2010-05-19 Dirk Pranke <dpranke@chromium.org>
authordpranke@chromium.org <dpranke@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 19 May 2010 22:36:11 +0000 (22:36 +0000)
committerdpranke@chromium.org <dpranke@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 19 May 2010 22:36:11 +0000 (22:36 +0000)
        Try again to roll out r58765

        * fast/notifications/notifications-replace-expected.txt: Removed.
        * fast/notifications/notifications-replace.html: Removed.
        * fast/notifications/notifications-rtl-expected.txt: Removed.
        * fast/notifications/notifications-rtl.html: Removed.
2010-05-19  Dirk Pranke  <dpranke@chromium.org>

        Try again to roll out r58675.

        * notifications/Notification.h:
        * notifications/Notification.idl:
2010-05-19  Dirk Pranke  <dpranke@chromium.org>

        Try again to roll out r58765.

        * public/WebNotification.h:
        * src/WebNotification.cpp:

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

LayoutTests/ChangeLog patch | blob | history
LayoutTests/fast/notifications/notifications-replace-expected.txt [deleted file] patch | blob | history
LayoutTests/fast/notifications/notifications-replace.html [deleted file] patch | blob | history
LayoutTests/fast/notifications/notifications-rtl-expected.txt [deleted file] patch | blob | history
LayoutTests/fast/notifications/notifications-rtl.html [deleted file] patch | blob | history
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 4d697b63c71c21ab27b25c56d6116d2b92d9b954..59b5b048908e13ea8ad292ee29851b585bd003d1 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-05-19  Dirk Pranke  <dpranke@chromium.org>
+
+        Try again to roll out r58765
+
+        * fast/notifications/notifications-replace-expected.txt: Removed.
+        * fast/notifications/notifications-replace.html: Removed.
+        * fast/notifications/notifications-rtl-expected.txt: Removed.
+        * fast/notifications/notifications-rtl.html: Removed.
+
 2010-05-19  Enrica Casucci  <enrica@apple.com>
 
         Reviewed by Dave Hyatt.
diff --git a/LayoutTests/fast/notifications/notifications-replace-expected.txt b/LayoutTests/fast/notifications/notifications-replace-expected.txt
deleted file mode 100644 (file)
index a4f7fc4..0000000
--- a/LayoutTests/fast/notifications/notifications-replace-expected.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-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
deleted file mode 100644 (file)
index 1200cc6..0000000
--- a/LayoutTests/fast/notifications/notifications-replace.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!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
deleted file mode 100644 (file)
index f2b01fc..0000000
--- a/LayoutTests/fast/notifications/notifications-rtl-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644 (file)
index b7c048b..0000000
--- a/LayoutTests/fast/notifications/notifications-rtl.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!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 f9d8989148a8a0587472b823e0f2f5e79dc21ea9..4b80ea87f7872765e77e81680bfd3cb77355bd5e 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-19  Dirk Pranke  <dpranke@chromium.org>
+
+        Try again to roll out r58675.
+
+        * notifications/Notification.h:
+        * notifications/Notification.idl:
+
 2010-05-19  Enrica Casucci  <enrica@apple.com>
 
         Reviewed by Dave Hyatt.
diff --git a/WebCore/notifications/Notification.h b/WebCore/notifications/Notification.h
index 47de2a284c663f506c9eed896d4ff47ea0a5b62f..98cbfdf9d665c5be4d1f63c1ff7d0f611ba65930 100644 (file)
--- a/WebCore/notifications/Notification.h
+++ b/WebCore/notifications/Notification.h
@@ -68,11 +68,6 @@ 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);
@@ -98,9 +93,6 @@ 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 5ca84a5ddef6d764acb16fabcaf0a3c97a99b1bf..7f018b7f6a7778136463d74ffee5c876d8573517 100644 (file)
--- a/WebCore/notifications/Notification.idl
+++ b/WebCore/notifications/Notification.idl
@@ -42,9 +42,6 @@ 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 e137ed2c22b029dadb84614dbc4b3f62b8aa8491..c889a95c8a92258e704b0d28ab4915415875e44e 100644 (file)
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-19  Dirk Pranke  <dpranke@chromium.org>
+
+        Try again to roll out r58765.
+
+        * public/WebNotification.h:
+        * src/WebNotification.cpp:
+
 2010-05-19  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r59782.
diff --git a/WebKit/chromium/public/WebNotification.h b/WebKit/chromium/public/WebNotification.h
index ab747e3504c6219745cc67251dab27cd42059266..9d64e2a4b39d2a1e088ba947c43fb26c429c2cb6 100644 (file)
--- a/WebKit/chromium/public/WebNotification.h
+++ b/WebKit/chromium/public/WebNotification.h
@@ -75,9 +75,6 @@ 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 5ae1557c25346588c62454b27d2ab7605fc328c7..5200d179fed4a630d9f7634fc51b8d0ae806afd0 100644 (file)
--- a/WebKit/chromium/src/WebNotification.cpp
+++ b/WebKit/chromium/src/WebNotification.cpp
@@ -94,16 +94,6 @@ 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.