[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[tkent at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit ecd8c57b778885e5647f191d036303fb5200dcf8
Author: tkent at chromium.org <tkent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 31 00:19:17 2010 +0000

    2010-08-30  Kent Tamura  <tkent at chromium.org>
    
            Reviewed by Adam Barth.
    
            Fix fast/notifications/notifications-display-close-events.html failure
            https://bugs.webkit.org/show_bug.cgi?id=44585
    
            * platform/chromium/drt_expectations.txt:
    2010-08-30  Kent Tamura  <tkent at chromium.org>
    
            Reviewed by Adam Barth.
    
            Fix fast/notifications/notifications-display-close-events.html failure
            https://bugs.webkit.org/show_bug.cgi?id=44585
    
            Apply http://crrev.com/48893. We should dispatch display events
            asynchronously.
    
            * DumpRenderTree/chromium/NotificationPresenter.cpp:
            (deferredDisplayDispatch):
            (NotificationPresenter::show):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66430 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 86a504b..41fc770 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-30  Kent Tamura  <tkent at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Fix fast/notifications/notifications-display-close-events.html failure
+        https://bugs.webkit.org/show_bug.cgi?id=44585
+
+        * platform/chromium/drt_expectations.txt:
+
 2010-08-30  Tony Chang  <tony at chromium.org>
 
         Unreviewed, rebaseline plugins/mouse-event.html on chromium win/linux
diff --git a/LayoutTests/platform/chromium/drt_expectations.txt b/LayoutTests/platform/chromium/drt_expectations.txt
index c29bd43..87126b8 100644
--- a/LayoutTests/platform/chromium/drt_expectations.txt
+++ b/LayoutTests/platform/chromium/drt_expectations.txt
@@ -287,7 +287,6 @@ BUG_DRT WIN MAC LINUX : fast/dynamic/window-resize-scrollbars-test.html = IMAGE+
 BUG_DRT WIN : fast/events/show-modal-dialog-onblur-onfocus.html = TEXT
 BUG_DRT WIN : fast/harness/show-modal-dialog.html = TEXT
 BUG_DRT WIN : fast/lists/001.html = CRASH
-BUG_DRT WIN MAC LINUX : fast/notifications/notifications-display-close-events.html = TIMEOUT
 BUG_DRT WIN : fast/text/stripNullFromText.html = IMAGE+TEXT
 BUG_DRT WIN MAC LINUX : http/tests/incremental/slow-utf8-text.pl = MISSING
 BUG_DRT WIN : plugins/embed-attributes-setting.html = TEXT
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 68abcdb..b0e9907 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-30  Kent Tamura  <tkent at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Fix fast/notifications/notifications-display-close-events.html failure
+        https://bugs.webkit.org/show_bug.cgi?id=44585
+
+        Apply http://crrev.com/48893. We should dispatch display events
+        asynchronously.
+
+        * DumpRenderTree/chromium/NotificationPresenter.cpp:
+        (deferredDisplayDispatch):
+        (NotificationPresenter::show):
+
 2010-08-30  Robert Hogan  <robert at webkit.org>
 
         Reviewed by Simon Hausmann.
diff --git a/WebKitTools/DumpRenderTree/chromium/NotificationPresenter.cpp b/WebKitTools/DumpRenderTree/chromium/NotificationPresenter.cpp
index 95353a7..070df33 100644
--- a/WebKitTools/DumpRenderTree/chromium/NotificationPresenter.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/NotificationPresenter.cpp
@@ -31,18 +31,24 @@
 #include "config.h"
 #include "NotificationPresenter.h"
 
-#include <wtf/text/CString.h>
-#include <wtf/text/WTFString.h>
-
+#include "base/task.h" // FIXME: Remove this
 #include "googleurl/src/gurl.h"
 #include "public/WebNotification.h"
 #include "public/WebNotificationPermissionCallback.h"
 #include "public/WebSecurityOrigin.h"
 #include "public/WebString.h"
 #include "public/WebURL.h"
+#include "webkit/support/webkit_support.h"
+#include <wtf/text/CString.h>
+#include <wtf/text/WTFString.h>
 
 using namespace WebKit;
 
+static void deferredDisplayDispatch(WebNotification notification)
+{
+    notification.dispatchDisplayEvent();
+}
+
 void NotificationPresenter::grantPermission(const WebString& origin)
 {
     // Make sure it's in the form of an origin.
@@ -79,7 +85,7 @@ bool NotificationPresenter::show(const WebNotification& notification)
     }
 
     WebNotification eventTarget(notification);
-    eventTarget.dispatchDisplayEvent();
+    webkit_support::PostTaskFromHere(NewRunnableFunction(&deferredDisplayDispatch, eventTarget));
     return true;
 }
 

-- 
WebKit Debian packaging