[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[timothy at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 12c14ad6eb1774e669a081ba44c004bcf238f8d7
Author: timothy at apple.com <timothy at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 18 19:36:27 2010 +0000

    Add "with" to the list of keywords to syntax highlight.
    
    http://webkit.org/b/35123
    
    Reviewed by Pavel Feldman.
    
    * inspector/front-end/SourceJavaScriptTokenizer.js:
    (WebInspector.SourceJavaScriptTokenizer): Add "width" to _keywords.
    * inspector/front-end/SourceJavaScriptTokenizer.re2js:
    (WebInspector.SourceJavaScriptTokenizer): Ditto.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54979 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 82cbb5c..cc32f48 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-02-18  Timothy Hatcher  <timothy at apple.com>
+
+        Add "with" to the list of keywords to syntax highlight.
+
+        http://webkit.org/b/35123
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/front-end/SourceJavaScriptTokenizer.js:
+        (WebInspector.SourceJavaScriptTokenizer): Add "width" to _keywords.
+        * inspector/front-end/SourceJavaScriptTokenizer.re2js:
+        (WebInspector.SourceJavaScriptTokenizer): Ditto.
+
 2010-02-17  Peter Kasting  <pkasting at google.com>
 
         Reviewed by Adam Barth.
diff --git a/WebCore/inspector/front-end/SourceJavaScriptTokenizer.js b/WebCore/inspector/front-end/SourceJavaScriptTokenizer.js
index 816023f..75abeee 100644
--- a/WebCore/inspector/front-end/SourceJavaScriptTokenizer.js
+++ b/WebCore/inspector/front-end/SourceJavaScriptTokenizer.js
@@ -49,7 +49,7 @@ WebInspector.SourceJavaScriptTokenizer = function()
         "null", "true", "false", "break", "case", "catch", "const", "default", "finally", "for",
         "instanceof", "new", "var", "continue", "function", "return", "void", "delete", "if",
         "this", "do", "while", "else", "in", "switch", "throw", "try", "typeof", "debugger",
-        "class", "enum", "export", "extends", "import", "super", "get", "set"
+        "class", "enum", "export", "extends", "import", "super", "get", "set", "with"
     ].keySet();
 
     this._lexConditions = {
diff --git a/WebCore/inspector/front-end/SourceJavaScriptTokenizer.re2js b/WebCore/inspector/front-end/SourceJavaScriptTokenizer.re2js
index 8630ccb..053c82f 100644
--- a/WebCore/inspector/front-end/SourceJavaScriptTokenizer.re2js
+++ b/WebCore/inspector/front-end/SourceJavaScriptTokenizer.re2js
@@ -48,7 +48,7 @@ WebInspector.SourceJavaScriptTokenizer = function()
         "null", "true", "false", "break", "case", "catch", "const", "default", "finally", "for",
         "instanceof", "new", "var", "continue", "function", "return", "void", "delete", "if",
         "this", "do", "while", "else", "in", "switch", "throw", "try", "typeof", "debugger",
-        "class", "enum", "export", "extends", "import", "super", "get", "set"
+        "class", "enum", "export", "extends", "import", "super", "get", "set", "with"
     ].keySet();
 
     this._lexConditions = {

-- 
WebKit Debian packaging