1618488 - Add .get() to mViewSource in calls to P::transition in the tokenizer

Status: RESOLVED FIXED

(Core :: DOM: HTML Parser, task, P2)

Description

[Henri Sivonen (:hsivonen)]

See https://phabricator.services.mozilla.com/D64253

Comment 1

[Henri Sivonen (:hsivonen)]

Attachment: Bug 1618488 - Add .get() to mViewSource in calls to P::transition in the tokenizer.

Comment 2

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/748266807263
Add .get() to mViewSource in calls to P::transition in the tokenizer. r=erahm

Comment 3

[Henri Sivonen (:hsivonen)]

https://github.com/validator/htmlparser/commit/88532d88fc7d597052cc8466edcf415ac3b46a88

Comment 4

[Alexandru Michis [:malexandru]]

https://hg.mozilla.org/mozilla-central/rev/748266807263

Comment 5

[Eric Rahm [:erahm]]

Henri, looks like we need to do the same for calls to P::completedNamedCharacterReference:

 0:15.21 In file included from Unified_cpp_parser_html1.cpp:83:
 0:15.21 /var/dev/erahm/mozilla-unified/parser/html/nsHtml5Tokenizer.cpp:1899:47: error: no viable conversion from 'mozilla::UniquePtr<nsHtml5Highlighter>' to 'nsHtml5Highlighter *'
 0:15.21           P::completedNamedCharacterReference(mViewSource);
 0:15.21                                               ^~~~~~~~~~~
 0:15.21 /var/dev/erahm/mozilla-unified/parser/html/nsHtml5Tokenizer.cpp:438:11: note: in instantiation of function template specialization 'nsHtml5Tokenizer::stateLoop<nsHtml5ViewSourcePolicy>' requested here
 0:15.21     pos = stateLoop<nsHtml5ViewSourcePolicy>(state, c, pos, buffer->getBuffer(),
 0:15.21           ^
 0:15.21 /var/dev/erahm/mozilla-unified/parser/html/nsHtml5TokenizerLoopPolicies.h:33:27: note: passing argument to parameter 'aHighlighter' here
 0:15.21       nsHtml5Highlighter* aHighlighter) {
 0:15.21                           ^
 0:15.21 In file included from Unified_cpp_parser_html1.cpp:83:
 0:15.21 /var/dev/erahm/mozilla-unified/parser/html/nsHtml5Tokenizer.cpp:1899:47: error: no viable conversion from 'mozilla::UniquePtr<nsHtml5Highlighter>' to 'nsHtml5Highlighter *'
 0:15.21           P::completedNamedCharacterReference(mViewSource);
 0:15.21                                               ^~~~~~~~~~~
 0:15.21 /var/dev/erahm/mozilla-unified/parser/html/nsHtml5Tokenizer.cpp:443:11: note: in instantiation of function template specialization 'nsHtml5Tokenizer::stateLoop<nsHtml5SilentPolicy>' requested here
 0:15.21     pos = stateLoop<nsHtml5SilentPolicy>(state, c, pos, buffer->getBuffer(),
 0:15.21           ^
 0:15.21 /var/dev/erahm/mozilla-unified/parser/html/nsHtml5TokenizerLoopPolicies.h:19:27: note: passing argument to parameter 'aHighlighter' here
 0:15.21       nsHtml5Highlighter* aHighlighter) {}
 0:15.21                           ^
 0:15.21 2 errors generated.

Comment 6

[Eric Rahm [:erahm]]

We landed an additional change in bug 1619230.