Changeset 56444 in webkit


Ignore:
Timestamp:
Mar 24, 2010 9:56:38 AM (14 years ago)
Author:
apavlov@chromium.org
Message:

2010-03-24 Alexander Pavlov <​apavlov@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: Error when highlighting JavaScript with an invalid mime type
​https://bugs.webkit.org/show_bug.cgi?id=36530

  • inspector/front-end/SourceTokenizer.js: (WebInspector.SourceTokenizer.Registry):
  • inspector/front-end/SourceView.js: (WebInspector.SourceView.prototype._contentLoaded): (WebInspector.SourceView.prototype._canonicalMimeType):
  • inspector/front-end/TextEditorHighlighter.js: (WebInspector.TextEditorHighlighter):
Location:
trunk/WebCore
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r56443 r56444  
     12010-03-24  Alexander Pavlov  <apavlov@chromium.org>
     2
     3        Reviewed by Pavel Feldman.
     4
     5        Web Inspector: Error when highlighting JavaScript with an invalid mime type
     6        https://bugs.webkit.org/show_bug.cgi?id=36530
     7
     8        * inspector/front-end/SourceTokenizer.js:
     9        (WebInspector.SourceTokenizer.Registry):
     10        * inspector/front-end/SourceView.js:
     11        (WebInspector.SourceView.prototype._contentLoaded):
     12        (WebInspector.SourceView.prototype._canonicalMimeType):
     13        * inspector/front-end/TextEditorHighlighter.js:
     14        (WebInspector.TextEditorHighlighter):
     15
    1162010-03-24  Pavel Feldman  <pfeldman@chromium.org>
    217

  • trunk/WebCore/inspector/front-end/SourceTokenizer.js

    r55248 r56444  
    7676        "text/css": "SourceCSSTokenizer",
    7777        "text/html": "SourceHTMLTokenizer",
    78         "text/javascript": "SourceJavaScriptTokenizer",
    79         "application/javascript": "SourceJavaScriptTokenizer",
    80         "application/x-javascript": "SourceJavaScriptTokenizer"
     78        "text/javascript": "SourceJavaScriptTokenizer"
    8179    };
    8280}

  • trunk/WebCore/inspector/front-end/SourceView.js

    r55241 r56444  
    3838}
    3939
     40// This is a map from resource.type to mime types
     41// found in WebInspector.SourceTokenizer.Registry.
     42WebInspector.SourceView.DefaultMIMETypeForResourceType = {
     43    0: "text/html",
     44    1: "text/css",
     45    4: "text/javascript"
     46}
     47
    4048WebInspector.SourceView.prototype = {
    4149    show: function(parentElement)
    … …  
    7785    _contentLoaded: function(content)
    7886    {
    79         this.sourceFrame.setContent(this.resource.mimeType, content, this.resource.url);
     87        var mimeType = this._canonicalMimeType(this.resource);
     88        this.sourceFrame.setContent(mimeType, content, this.resource.url);
    8089        this._sourceFrameSetupFinished();
     90    },
     91
     92    _canonicalMimeType: function(resource)
     93    {
     94        return WebInspector.SourceView.DefaultMIMETypeForResourceType[resource.type] || resource.mimeType;
    8195    },
    8296

  • trunk/WebCore/inspector/front-end/TextEditorHighlighter.js

    r55352 r56444  
    3434    this._textModel = textModel;
    3535    this._tokenizer = WebInspector.SourceTokenizer.Registry.getInstance().getTokenizer("text/html");
     36    this._tokenizerCondition = this._tokenizer.initialCondition;
    3637    this._damageCallback = damageCallback;
    3738    this._lastHighlightedLine = 0;
Note: See TracChangeset for help on using the changeset viewer.