[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

Thu Feb 4 21:25:17 UTC 2010

The following commit has been merged in the webkit-1.1 branch:
commit ad3e74036b8c2633036c1380debb708a5a5e111d
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 22 22:18:59 2010 +0000

    Rubber-stamped by Adam Roben.
    
    Commit files that were supposed to be part of r53696, but weren't
    landed.
    
    * English.lproj/localizedStrings.js:
    * manual-tests/debugger-caught-uncaught-exceptions.html: Added.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53719 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5c034dc..36b8115 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-22  Brian Weinstein  <bweinstein at apple.com>
+
+        Rubber-stamped by Adam Roben.
+        
+        Commit files that were supposed to be part of r53696, but weren't
+        landed.
+
+        * English.lproj/localizedStrings.js:
+        * manual-tests/debugger-caught-uncaught-exceptions.html: Added.
+
 2010-01-22  Peter Kasting  <pkasting at google.com>
 
         Reviewed by David Hyatt.
diff --git a/WebCore/English.lproj/localizedStrings.js b/WebCore/English.lproj/localizedStrings.js
index 9374bcd..feef7a4 100644
Binary files a/WebCore/English.lproj/localizedStrings.js and b/WebCore/English.lproj/localizedStrings.js differ
diff --git a/WebCore/manual-tests/debugger-caught-uncaught-exceptions.html b/WebCore/manual-tests/debugger-caught-uncaught-exceptions.html
new file mode 100644
index 0000000..d812ca6
--- /dev/null
+++ b/WebCore/manual-tests/debugger-caught-uncaught-exceptions.html
@@ -0,0 +1,35 @@
+<html>
+    <head>
+        <script>
+            function generateUncaughtException() {
+                var b = 5;
+                // Pause on uncaught exceptions and pause on all exceptions should pause here,
+                // because even though the exception is being caught by our caller in this case,
+                // it is not being caught in the same function.
+                b.foo.bar;
+            }
+        
+            function generateCaughtAndUncaughtExceptions() {
+                var a = 5;
+                try {
+                    // This will pause on Pause on all exceptions, but not Pause on uncaught exceptions.
+                    a.foo.bar;
+                } catch (e) { }
+            
+                try {
+                    generateUncaughtException();
+                } catch (e) { }
+            
+                // This will pause on both Pause on all exceptions and Pause on uncaught exceptions.
+                a.foo.bar;
+            }
+        </script>
+    </head>
+    <body>
+        <p>This page tests <a href="https://bugs.webkit.org/show_bug.cgi?id=28622">Caught exceptions still pause the debugger</a>
+        <p>To test this bug, open the inspector, open the scripts panel, and click the button to pause on all exceptions, press
+            the button, and see which exceptions are paused on. Then press the pause on exceptions button again to only
+            pause on uncaught exceptions, and see which exceptions are paused on.</p>
+        <input type="button" value="Generate caught and uncaught exceptions" onclick="generateCaughtAndUncaughtExceptions();" />
+    </body>
+</html>

-- 
WebKit Debian packaging

