Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Side by Side Diff: Source/WebCore/html/parser/HTMLTreeBuilder.cpp

Issue 6711031: Merge 80672 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/648/
Patch Set: Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « LayoutTests/fast/parser/self-closing-foreign-content-expected.txt ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google, Inc. All Rights Reserved. 2 * Copyright (C) 2010 Google, Inc. All Rights Reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 976 matching lines...) Expand 10 before | Expand all | Expand 10 after
987 } 987 }
988 } 988 }
989 m_tree.insertHTMLElement(token); 989 m_tree.insertHTMLElement(token);
990 return; 990 return;
991 } 991 }
992 if (token.name() == MathMLNames::mathTag.localName()) { 992 if (token.name() == MathMLNames::mathTag.localName()) {
993 m_tree.reconstructTheActiveFormattingElements(); 993 m_tree.reconstructTheActiveFormattingElements();
994 adjustMathMLAttributes(token); 994 adjustMathMLAttributes(token);
995 adjustForeignAttributes(token); 995 adjustForeignAttributes(token);
996 m_tree.insertForeignElement(token, MathMLNames::mathmlNamespaceURI); 996 m_tree.insertForeignElement(token, MathMLNames::mathmlNamespaceURI);
997 if (m_insertionMode != InForeignContentMode) 997 if (m_insertionMode != InForeignContentMode && !token.selfClosing())
998 setInsertionMode(InForeignContentMode); 998 setInsertionMode(InForeignContentMode);
999 return; 999 return;
1000 } 1000 }
1001 if (token.name() == SVGNames::svgTag.localName()) { 1001 if (token.name() == SVGNames::svgTag.localName()) {
1002 m_tree.reconstructTheActiveFormattingElements(); 1002 m_tree.reconstructTheActiveFormattingElements();
1003 adjustSVGAttributes(token); 1003 adjustSVGAttributes(token);
1004 adjustForeignAttributes(token); 1004 adjustForeignAttributes(token);
1005 m_tree.insertForeignElement(token, SVGNames::svgNamespaceURI); 1005 m_tree.insertForeignElement(token, SVGNames::svgNamespaceURI);
1006 if (m_insertionMode != InForeignContentMode) 1006 if (m_insertionMode != InForeignContentMode && !token.selfClosing())
1007 setInsertionMode(InForeignContentMode); 1007 setInsertionMode(InForeignContentMode);
1008 return; 1008 return;
1009 } 1009 }
1010 if (isCaptionColOrColgroupTag(token.name()) 1010 if (isCaptionColOrColgroupTag(token.name())
1011 || token.name() == frameTag 1011 || token.name() == frameTag
1012 || token.name() == headTag 1012 || token.name() == headTag
1013 || isTableBodyContextTag(token.name()) 1013 || isTableBodyContextTag(token.name())
1014 || isTableCellContextTag(token.name()) 1014 || isTableCellContextTag(token.name())
1015 || token.name() == trTag) { 1015 || token.name() == trTag) {
1016 parseError(token); 1016 parseError(token);
(...skipping 1798 matching lines...) Expand 10 before | Expand all | Expand 10 after
2815 } 2815 }
2816 2816
2817 bool HTMLTreeBuilder::pluginsEnabled(Frame* frame) 2817 bool HTMLTreeBuilder::pluginsEnabled(Frame* frame)
2818 { 2818 {
2819 if (!frame) 2819 if (!frame)
2820 return false; 2820 return false;
2821 return frame->loader()->subframeLoader()->allowPlugins(NotAboutToInstantiate Plugin); 2821 return frame->loader()->subframeLoader()->allowPlugins(NotAboutToInstantiate Plugin);
2822 } 2822 }
2823 2823
2824 } 2824 }
OLDNEW
« no previous file with comments | « LayoutTests/fast/parser/self-closing-foreign-content-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698