Merge https://chromium.googlesource.com/chromium/blink/+/835fb468fd211054a920fb7612a6dc5043662495
Created attachment 217402 [details] Patch
Created attachment 217404 [details] Tweaked the change log a little
Comment on attachment 217404 [details] Tweaked the change log a little View in context: https://bugs.webkit.org/attachment.cgi?id=217404&action=review > Source/WebCore/html/parser/HTMLTreeBuilder.cpp:1644 > +#if ENABLE(TEMPLATE_ELEMENT) > + if (isParsingFragment()) > +#else > + ASSERT(isParsingFragment()); > +#endif > + item = HTMLStackItem::create(m_fragmentContext.contextElement(), HTMLStackItem::ItemForContextElement); This is somewhat ugly. It is nicer to do something like this: #if ENABLE(TEMPLATE_ELEMENT) bool shouldCreateItem = isParsingFragment(); #else ASSERT(isParsingFragment()); bool shouldCreateItem = true; #endif if (shouldCreateItem) ...
(In reply to comment #3) > > This is somewhat ugly. It is nicer to do something like this: > > #if ENABLE(TEMPLATE_ELEMENT) > bool shouldCreateItem = isParsingFragment(); > #else > ASSERT(isParsingFragment()); > bool shouldCreateItem = true; > #endif > if (shouldCreateItem) ... Makes sense. Done that.
Created attachment 217519 [details] Patch for landing
Comment on attachment 217519 [details] Patch for landing Clearing flags on attachment: 217519 Committed r159610: <http://trac.webkit.org/changeset/159610>
All reviewed patches have been landed. Closing bug.