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

[inferno at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 20a903257d2018861e3d90c4fe80fc76a368f524
Author: inferno at chromium.org <inferno at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 4 14:45:59 2010 +0000

    2010-08-04  Abhishek Arya  <inferno at chromium.org>
    
            Unreviewed. Put missing equivalent js bindings check.
    
            Forgot putting js bindings check in http://trac.webkit.org/changeset/64647. This fixes the qt crash.
    
            * bindings/js/JSDesktopNotificationsCustom.cpp:
            (WebCore::JSNotificationCenter::requestPermission):
    2010-08-04  Abhishek Arya  <inferno at chromium.org>
    
            Unreviewed.
    
            Add qt specific layout test results for my commit http://trac.webkit.org/changeset/64647.
            Fix timeout in my layout test since it was generating too many events in qt.
    
            * fast/notifications/notifications-document-close-crash.html:
            * platform/qt/fast/notifications: Added.
            * platform/qt/fast/notifications/notifications-document-close-crash-expected.txt: Added.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64651 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index edd9078..18e9706 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-04  Abhishek Arya  <inferno at chromium.org>
+
+        Unreviewed.
+
+        Add qt specific layout test results for my commit http://trac.webkit.org/changeset/64647.
+        Fix timeout in my layout test since it was generating too many events in qt.
+
+        * fast/notifications/notifications-document-close-crash.html:
+        * platform/qt/fast/notifications: Added.
+        * platform/qt/fast/notifications/notifications-document-close-crash-expected.txt: Added.
+
 2010-08-04  Pavel Feldman  <pfeldman at chromium.org>
 
         Not reviewed. Chromium expectations update.
diff --git a/LayoutTests/fast/notifications/notifications-document-close-crash.html b/LayoutTests/fast/notifications/notifications-document-close-crash.html
index 433ae0a..5bcf09a 100644
--- a/LayoutTests/fast/notifications/notifications-document-close-crash.html
+++ b/LayoutTests/fast/notifications/notifications-document-close-crash.html
@@ -17,7 +17,7 @@
             var target = window.open("about:blank");
             var notification = target.webkitNotifications;
             target.location.reload();
-            var timer = setInterval("crash()", 10);
+            var timer = setInterval("crash()", 60);
             setTimeout("finish()", 100);
 
             function crash()
diff --git a/LayoutTests/platform/qt/fast/notifications/notifications-document-close-crash-expected.txt b/LayoutTests/platform/qt/fast/notifications/notifications-document-close-crash-expected.txt
new file mode 100644
index 0000000..9844ef4
--- /dev/null
+++ b/LayoutTests/platform/qt/fast/notifications/notifications-document-close-crash-expected.txt
@@ -0,0 +1,2 @@
+CONSOLE MESSAGE: line 36: INVALID_STATE_ERR: DOM Exception 11: An attempt was made to use an object that is not, or is no longer, usable.
+PASS
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 161f3de..22bcf07 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-04  Abhishek Arya  <inferno at chromium.org>
+
+        Unreviewed. Put missing equivalent js bindings check.
+
+        Forgot putting js bindings check in http://trac.webkit.org/changeset/64647. This fixes the qt crash.
+
+        * bindings/js/JSDesktopNotificationsCustom.cpp:
+        (WebCore::JSNotificationCenter::requestPermission):
+
 2010-08-04  Yury Semikhatsky  <yurys at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebCore/bindings/js/JSDesktopNotificationsCustom.cpp b/WebCore/bindings/js/JSDesktopNotificationsCustom.cpp
index 6c4dfb4..38334b9 100644
--- a/WebCore/bindings/js/JSDesktopNotificationsCustom.cpp
+++ b/WebCore/bindings/js/JSDesktopNotificationsCustom.cpp
@@ -47,8 +47,15 @@ namespace WebCore {
 
 JSValue JSNotificationCenter::requestPermission(ExecState* exec)
 {
-    // Permission request is only valid from page context.
     ScriptExecutionContext* context = impl()->context();
+
+    // Make sure that script execution context is valid.
+    if (!context) {
+        setDOMException(exec, INVALID_STATE_ERR);
+        return jsUndefined();
+    }
+
+    // Permission request is only valid from page context.
     if (context->isWorkerContext())
         return throwSyntaxError(exec);
 

-- 
WebKit Debian packaging