From dcc8cf2e65d1aa555cce12431a16547e66b469ee Mon Sep 17 00:00:00 2001 From: Steve Block Date: Tue, 27 Apr 2010 16:31:00 +0100 Subject: Merge webkit.org at r58033 : Initial merge by git Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1 --- WebCore/inspector/front-end/SourceTokenizer.js | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'WebCore/inspector/front-end/SourceTokenizer.js') diff --git a/WebCore/inspector/front-end/SourceTokenizer.js b/WebCore/inspector/front-end/SourceTokenizer.js index d498028..d30744c 100644 --- a/WebCore/inspector/front-end/SourceTokenizer.js +++ b/WebCore/inspector/front-end/SourceTokenizer.js @@ -40,28 +40,27 @@ WebInspector.SourceTokenizer.prototype = { set condition(condition) { - this._lexCondition = condition.lexCondition; - this._parseCondition = condition.parseCondition; + this._condition = condition; }, get condition() { - return { lexCondition: this._lexCondition, parseCondition: this._parseCondition }; + return this._condition; }, - hasCondition: function(condition) + get subTokenizer() { - return this._lexCondition === condition.lexCondition && this._parseCondition === condition.parseCondition; + return this._condition.subTokenizer; }, getLexCondition: function() { - return this._lexCondition; + return this.condition.lexCondition; }, setLexCondition: function(lexCondition) { - this._lexCondition = lexCondition; + this.condition.lexCondition = lexCondition; }, _charAt: function(cursor) @@ -76,9 +75,7 @@ WebInspector.SourceTokenizer.Registry = function() { this._tokenizerConstructors = { "text/css": "SourceCSSTokenizer", "text/html": "SourceHTMLTokenizer", - "text/javascript": "SourceJavaScriptTokenizer", - "application/javascript": "SourceJavaScriptTokenizer", - "application/x-javascript": "SourceJavaScriptTokenizer" + "text/javascript": "SourceJavaScriptTokenizer" }; } -- cgit v1.1