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

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 860d107a2a89bd896f6a9792451ff1759a1180f2
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 17 07:12:23 2010 +0000

    2010-02-16  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Timothy Hatcher.
    
            Web Inspector: drosera/demo.js not syntax highlighted correctly.
    
            https://bugs.webkit.org/show_bug.cgi?id=35008
    
            * inspector/front-end/SourceTokenizer.js:
            (WebInspector.SourceTokenizer.Registry):
            (WebInspector.SourceTokenizer.Registry.prototype.getTokenizer):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54872 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 692bbaa..97249bd 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,18 @@
 
         Reviewed by Timothy Hatcher.
 
+        Web Inspector: drosera/demo.js not syntax highlighted correctly.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35008
+
+        * inspector/front-end/SourceTokenizer.js:
+        (WebInspector.SourceTokenizer.Registry):
+        (WebInspector.SourceTokenizer.Registry.prototype.getTokenizer):
+
+2010-02-16  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
         Web Inspector: prefer smooth scrolling to instant highlight.
 
         https://bugs.webkit.org/show_bug.cgi?id=34978
diff --git a/WebCore/inspector/front-end/SourceTokenizer.js b/WebCore/inspector/front-end/SourceTokenizer.js
index 1192383..d498028 100644
--- a/WebCore/inspector/front-end/SourceTokenizer.js
+++ b/WebCore/inspector/front-end/SourceTokenizer.js
@@ -74,10 +74,11 @@ WebInspector.SourceTokenizer.prototype = {
 WebInspector.SourceTokenizer.Registry = function() {
     this._tokenizers = {};
     this._tokenizerConstructors = {
-        "text/css": WebInspector.SourceCSSTokenizer,
-        "text/html": WebInspector.SourceHTMLTokenizer,
-        "text/javascript": WebInspector.SourceJavaScriptTokenizer,
-        "application/x-javascript": WebInspector.SourceJavaScriptTokenizer
+        "text/css": "SourceCSSTokenizer",
+        "text/html": "SourceHTMLTokenizer",
+        "text/javascript": "SourceJavaScriptTokenizer",
+        "application/javascript": "SourceJavaScriptTokenizer",
+        "application/x-javascript": "SourceJavaScriptTokenizer"
     };
 }
 
@@ -93,9 +94,10 @@ WebInspector.SourceTokenizer.Registry.prototype = {
     {
         if (!this._tokenizerConstructors[mimeType])
             return null;
-        var tokenizer = this._tokenizers[mimeType];
+        var tokenizerClass = this._tokenizerConstructors[mimeType];
+        var tokenizer = this._tokenizers[tokenizerClass];
         if (!tokenizer) {
-            tokenizer = new this._tokenizerConstructors[mimeType]();
+            tokenizer = new WebInspector[tokenizerClass]();
             this._tokenizers[mimeType] = tokenizer;
         }
         return tokenizer;

-- 
WebKit Debian packaging