Bug 60163 – Web Inspector: fix incremental html highlight.

• Status: RESOLVED
• Resolution: FIXED
• Component: Web Inspector (Deprecated)

[Pavel Podivilov]

Web Inspector: fix incremental html highlight.

SourceHTMLTokenizer is declared to be stateless, however it uses _internalJavaScriptTokenizer and _internalCSSTokenizer fields as a part of its state.
This makes incremental highlighting impossible, since SourceHTMLTokenizer state can not be fully restored from stringified state used by highlighter.

[Pavel Podivilov]

Created attachment 92224 [details]
Patch.

[Andrey Adaikin]

View in context: https://bugs.webkit.org/attachment.cgi?id=92224&action=review

> Source/WebCore/inspector/front-end/SourceHTMLTokenizer.js:149
> +        return WebInspector.SourceTokenizer.Registry.getInstance().getTokenizer("text/javascript");

wrong MIME type

> Source/WebCore/inspector/front-end/SourceHTMLTokenizer.re2js:148
> +        return WebInspector.SourceTokenizer.Registry.getInstance().getTokenizer("text/javascript");

same

[Andrey Adaikin]

I did not work with this code very closely, so you'll probably want to wait for somebody else's review :)

[Pavel Podivilov]

Created attachment 92228 [details]
Patch.

[Adam Barth]

Comment on attachment 92228 [details]
Patch.

This patch causes many tests failures:


  inspector/console/command-line-api-inspect.html = TEXT
  inspector/debugger/debugger-breakpoints-not-activated-on-reload.html = TEXT
  inspector/debugger/debugger-cyclic-ref.html = TEXT
  inspector/debugger/debugger-eval-on-call-frame.html = TEXT

Regressions: Unexpected tests timed out : (14)
  http/tests/appcache/remove-cache.html = TIMEOUT
  http/tests/inspector/inspect-iframe-from-different-domain.html = TIMEOUT
  http/tests/inspector/network/download.html = TIMEOUT
  inspector/console/command-line-api.html = TIMEOUT
  inspector/console/console-api-on-call-frame.html = TIMEOUT
  inspector/console/console-assert.html = TIMEOUT
  inspector/console/console-clear.html = TIMEOUT
  inspector/console/console-command-clear.html = TIMEOUT
  inspector/console/console-dir-global.html = TIMEOUT
  inspector/debugger/debugger-eval-while-paused.html = TIMEOUT
  inspector/debugger/debugger-expand-scope.html = TIMEOUT
  inspector/debugger/debugger-no-nested-pause.html = TIMEOUT
  inspector/debugger/debugger-pause-in-eval-script.html = TIMEOUT
  inspector/debugger/debugger-pause-on-breakpoint.html = TIMEOUT

[Pavel Podivilov]

Created attachment 92565 [details]
Patch.

Also fix the bug with tokenizer.initialCondition being modified after tokenizer.condition = tokenizer.initialCondition.

[Yury Semikhatsky]

Comment on attachment 92565 [details]
Patch.

View in context: https://bugs.webkit.org/attachment.cgi?id=92565&action=review

> Source/WebCore/inspector/front-end/SourceCSSTokenizer.js:125
> +    get initialCondition()

As initialCondition now returns new object on each call it would make sense to rename it to createInitialCondition.

[Pavel Podivilov]

Created attachment 92566 [details]
Patch.

get initialCondition -> createInitialCondition

[Pavel Podivilov]

Committed r86430: <http://trac.webkit.org/changeset/86430>