summaryrefslogtreecommitdiffstats
path: root/WebCore/inspector/front-end/SourceHTMLTokenizer.js
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-04-27 16:23:55 +0100
committerSteve Block <steveblock@google.com>2010-04-27 17:07:03 +0100
commit692e5dbf12901edacf14812a6fae25462920af42 (patch)
treed62802373a429e0a9dc093b6046c166b2c514285 /WebCore/inspector/front-end/SourceHTMLTokenizer.js
parente24bea4efef1c414137d36a9778aa4e142e10c7d (diff)
downloadexternal_webkit-692e5dbf12901edacf14812a6fae25462920af42.zip
external_webkit-692e5dbf12901edacf14812a6fae25462920af42.tar.gz
external_webkit-692e5dbf12901edacf14812a6fae25462920af42.tar.bz2
Merge webkit.org at r55033 : Initial merge by git
Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
Diffstat (limited to 'WebCore/inspector/front-end/SourceHTMLTokenizer.js')
-rw-r--r--WebCore/inspector/front-end/SourceHTMLTokenizer.js8
1 files changed, 7 insertions, 1 deletions
diff --git a/WebCore/inspector/front-end/SourceHTMLTokenizer.js b/WebCore/inspector/front-end/SourceHTMLTokenizer.js
index 8856ff5..3c9bd8c 100644
--- a/WebCore/inspector/front-end/SourceHTMLTokenizer.js
+++ b/WebCore/inspector/front-end/SourceHTMLTokenizer.js
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Tue Feb 2 00:44:38 2010 */
+/* Generated by re2c 0.13.5 on Mon Feb 15 19:30:21 2010 */
/*
* Copyright (C) 2009 Google Inc. All rights reserved.
*
@@ -413,6 +413,12 @@ case 66:
++cursor;
this.setLexCondition(this._lexConditions.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();