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

Side by Side Diff: third_party/WebKit/WebCore/dom/XMLTokenizerLibxml2.cpp

Issue 21165: Revert the merge. Mac build is mysteriously broken. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 10 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2000 Peter Kelly (pmk@post.com) 2 * Copyright (C) 2000 Peter Kelly (pmk@post.com)
3 * Copyright (C) 2005, 2006, 2008 Apple Inc. All rights reserved. 3 * Copyright (C) 2005, 2006, 2008 Apple Inc. All rights reserved.
4 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) 4 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
5 * Copyright (C) 2007 Samuel Weinig (sam@webkit.org) 5 * Copyright (C) 2007 Samuel Weinig (sam@webkit.org)
6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
7 * Copyright (C) 2008 Holger Hans Peter Freyther 7 * Copyright (C) 2008 Holger Hans Peter Freyther
8 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 8 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 688 matching lines...) Expand 10 before | Expand all | Expand 10 after
699 const xmlChar** libxmlNamespaces, int nb_attri butes, int nb_defaulted, const xmlChar** libxmlAttributes) 699 const xmlChar** libxmlNamespaces, int nb_attri butes, int nb_defaulted, const xmlChar** libxmlAttributes)
700 { 700 {
701 if (m_parserStopped) 701 if (m_parserStopped)
702 return; 702 return;
703 703
704 if (m_parserPaused) { 704 if (m_parserPaused) {
705 m_pendingCallbacks->appendStartElementNSCallback(xmlLocalName, xmlPrefix , xmlURI, nb_namespaces, libxmlNamespaces, 705 m_pendingCallbacks->appendStartElementNSCallback(xmlLocalName, xmlPrefix , xmlURI, nb_namespaces, libxmlNamespaces,
706 nb_attributes, nb_defau lted, libxmlAttributes); 706 nb_attributes, nb_defau lted, libxmlAttributes);
707 return; 707 return;
708 } 708 }
709 709
710 bool isFirstElement = !m_sawFirstElement;
711 m_sawFirstElement = true; 710 m_sawFirstElement = true;
712 711
713 exitText(); 712 exitText();
714 713
715 String localName = toString(xmlLocalName); 714 String localName = toString(xmlLocalName);
716 String uri = toString(xmlURI); 715 String uri = toString(xmlURI);
717 String prefix = toString(xmlPrefix); 716 String prefix = toString(xmlPrefix);
718 717
719 if (m_parsingFragment && uri.isNull()) { 718 if (m_parsingFragment && uri.isNull()) {
720 if (!prefix.isNull()) 719 if (!prefix.isNull())
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
757 m_scriptStartLine = lineNumber(); 756 m_scriptStartLine = lineNumber();
758 757
759 if (!m_currentNode->addChild(newElement.get())) { 758 if (!m_currentNode->addChild(newElement.get())) {
760 stopParsing(); 759 stopParsing();
761 return; 760 return;
762 } 761 }
763 762
764 setCurrentNode(newElement.get()); 763 setCurrentNode(newElement.get());
765 if (m_view && !newElement->attached()) 764 if (m_view && !newElement->attached())
766 newElement->attach(); 765 newElement->attach();
767
768 if (isFirstElement && m_doc->frame())
769 m_doc->frame()->loader()->dispatchDocumentElementAvailable();
770 } 766 }
771 767
772 void XMLTokenizer::endElementNs() 768 void XMLTokenizer::endElementNs()
773 { 769 {
774 if (m_parserStopped) 770 if (m_parserStopped)
775 return; 771 return;
776 772
777 if (m_parserPaused) { 773 if (m_parserPaused) {
778 m_pendingCallbacks->appendEndElementNSCallback(); 774 m_pendingCallbacks->appendEndElementNSCallback();
779 return; 775 return;
(...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
1356 if (parser->myDoc) 1352 if (parser->myDoc)
1357 xmlFreeDoc(parser->myDoc); 1353 xmlFreeDoc(parser->myDoc);
1358 xmlFreeParserCtxt(parser); 1354 xmlFreeParserCtxt(parser);
1359 attrsOK = state.gotAttributes; 1355 attrsOK = state.gotAttributes;
1360 return state.attributes; 1356 return state.attributes;
1361 } 1357 }
1362 1358
1363 } 1359 }
1364 1360
1365 1361
OLDNEW
« no previous file with comments | « third_party/WebKit/WebCore/dom/Position.cpp ('k') | third_party/WebKit/WebCore/dom/XMLTokenizerQt.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698