From 692e5dbf12901edacf14812a6fae25462920af42 Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Tue, 27 Apr 2010 16:23:55 +0100
Subject: Merge webkit.org at r55033 : Initial merge by git

Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
---
 WebCore/inspector/front-end/SourceHTMLTokenizer.re2js | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'WebCore/inspector/front-end/SourceHTMLTokenizer.re2js')

diff --git a/WebCore/inspector/front-end/SourceHTMLTokenizer.re2js b/WebCore/inspector/front-end/SourceHTMLTokenizer.re2js
index 89c535a..cfa8834 100644
--- a/WebCore/inspector/front-end/SourceHTMLTokenizer.re2js
+++ b/WebCore/inspector/front-end/SourceHTMLTokenizer.re2js
@@ -174,6 +174,12 @@ WebInspector.SourceHTMLTokenizer.prototype = {
 
                 <INITIAL> ScriptStart => TAG
                 {
+                    if (this._parseCondition & this._parseConditions.SCRIPT) {
+                        // Do not tokenize script tag contents, keep lexer state although processing "<".
+                        this.setLexCondition(this._lexConditions.INITIAL);
+                        this.tokenType = null;
+                        return cursor;
+                    }
                     this.tokenType = "html-tag";
                     this._parseCondition = this._parseConditions.SCRIPT;
                     this._setExpectingAttribute();
-- 
cgit v1.1