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

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

Issue 9566019: Merge 108311 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Patch Set: Created 8 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/html5lib/resources/webkit02.dat ('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 * Copyright (C) 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2011 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after
579 void HTMLTreeBuilder::processIsindexStartTagForInBody(AtomicHTMLToken& token) 579 void HTMLTreeBuilder::processIsindexStartTagForInBody(AtomicHTMLToken& token)
580 { 580 {
581 ASSERT(token.type() == HTMLTokenTypes::StartTag); 581 ASSERT(token.type() == HTMLTokenTypes::StartTag);
582 ASSERT(token.name() == isindexTag); 582 ASSERT(token.name() == isindexTag);
583 parseError(token); 583 parseError(token);
584 if (m_tree.form()) 584 if (m_tree.form())
585 return; 585 return;
586 notImplemented(); // Acknowledge self-closing flag 586 notImplemented(); // Acknowledge self-closing flag
587 processFakeStartTag(formTag); 587 processFakeStartTag(formTag);
588 RefPtr<Attribute> actionAttribute = token.getAttributeItem(actionAttr); 588 RefPtr<Attribute> actionAttribute = token.getAttributeItem(actionAttr);
589 if (actionAttribute) { 589 if (actionAttribute)
590 ASSERT(m_tree.currentElement()->hasTagName(formTag)); 590 m_tree.form()->setAttribute(actionAttr, actionAttribute->value());
591 m_tree.currentElement()->setAttribute(actionAttr, actionAttribute->value ());
592 }
593 processFakeStartTag(hrTag); 591 processFakeStartTag(hrTag);
594 processFakeStartTag(labelTag); 592 processFakeStartTag(labelTag);
595 RefPtr<Attribute> promptAttribute = token.getAttributeItem(promptAttr); 593 RefPtr<Attribute> promptAttribute = token.getAttributeItem(promptAttr);
596 if (promptAttribute) 594 if (promptAttribute)
597 processFakeCharacters(promptAttribute->value()); 595 processFakeCharacters(promptAttribute->value());
598 else 596 else
599 processFakeCharacters(searchableIndexIntroduction()); 597 processFakeCharacters(searchableIndexIntroduction());
600 processFakeStartTag(inputTag, attributesForIsindexInput(token)); 598 processFakeStartTag(inputTag, attributesForIsindexInput(token));
601 notImplemented(); // This second set of characters may be needed by non-engl ish locales. 599 notImplemented(); // This second set of characters may be needed by non-engl ish locales.
602 processFakeEndTag(labelTag); 600 processFakeEndTag(labelTag);
(...skipping 2229 matching lines...) Expand 10 before | Expand all | Expand 10 after
2832 } 2830 }
2833 2831
2834 bool HTMLTreeBuilder::pluginsEnabled(Frame* frame) 2832 bool HTMLTreeBuilder::pluginsEnabled(Frame* frame)
2835 { 2833 {
2836 if (!frame) 2834 if (!frame)
2837 return false; 2835 return false;
2838 return frame->loader()->subframeLoader()->allowPlugins(NotAboutToInstantiate Plugin); 2836 return frame->loader()->subframeLoader()->allowPlugins(NotAboutToInstantiate Plugin);
2839 } 2837 }
2840 2838
2841 } 2839 }
OLDNEW
« no previous file with comments | « LayoutTests/html5lib/resources/webkit02.dat ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698