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

Side by Side Diff: third_party/WebKit/WebCore/html/HTMLParser.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) 1997 Martin Jones (mjones@kde.org) 2 Copyright (C) 1997 Martin Jones (mjones@kde.org)
3 (C) 1997 Torben Weis (weis@kde.org) 3 (C) 1997 Torben Weis (weis@kde.org)
4 (C) 1999,2001 Lars Knoll (knoll@kde.org) 4 (C) 1999,2001 Lars Knoll (knoll@kde.org)
5 (C) 2000,2001 Dirk Mueller (mueller@kde.org) 5 (C) 2000,2001 Dirk Mueller (mueller@kde.org)
6 Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. 6 Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
7 7
8 This library is free software; you can redistribute it and/or 8 This library is free software; you can redistribute it and/or
9 modify it under the terms of the GNU Library General Public 9 modify it under the terms of the GNU Library General Public
10 License as published by the Free Software Foundation; either 10 License as published by the Free Software Foundation; either
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 didRefCurrent = true; 346 didRefCurrent = true;
347 } 347 }
348 if (parentAttached && !n->attached() && !m_isParsingFragment) 348 if (parentAttached && !n->attached() && !m_isParsingFragment)
349 n->attach(); 349 n->attach();
350 } else { 350 } else {
351 if (parentAttached && !n->attached() && !m_isParsingFragment) 351 if (parentAttached && !n->attached() && !m_isParsingFragment)
352 n->attach(); 352 n->attach();
353 n->finishParsingChildren(); 353 n->finishParsingChildren();
354 } 354 }
355 355
356 if (localName == htmlTag && document->frame())
357 document->frame()->loader()->dispatchDocumentElementAvailable();
358
359 return true; 356 return true;
360 } 357 }
361 358
362 bool HTMLParser::handleError(Node* n, bool flat, const AtomicString& localName, int tagPriority) 359 bool HTMLParser::handleError(Node* n, bool flat, const AtomicString& localName, int tagPriority)
363 { 360 {
364 // Error handling code. This is just ad hoc handling of specific parent/chi ld combinations. 361 // Error handling code. This is just ad hoc handling of specific parent/chi ld combinations.
365 HTMLElement* e; 362 HTMLElement* e;
366 bool handled = false; 363 bool handled = false;
367 364
368 // 1. Check out the element's tag name to decide how to deal with errors. 365 // 1. Check out the element's tag name to decide how to deal with errors.
(...skipping 1230 matching lines...) Expand 10 before | Expand all | Expand 10 after
1599 message.replace("%tag2", tag2); 1596 message.replace("%tag2", tag2);
1600 1597
1601 frame->domWindow()->console()->addMessage(HTMLMessageSource, 1598 frame->domWindow()->console()->addMessage(HTMLMessageSource,
1602 isWarning(errorCode) ? WarningMessageLevel : ErrorMessageLevel, 1599 isWarning(errorCode) ? WarningMessageLevel : ErrorMessageLevel,
1603 message, lineNumber, document->url().string()); 1600 message, lineNumber, document->url().string());
1604 } 1601 }
1605 1602
1606 } 1603 }
1607 1604
1608 1605
OLDNEW
« no previous file with comments | « third_party/WebKit/WebCore/html/HTMLInputElement.cpp ('k') | third_party/WebKit/WebCore/html/HTMLTokenizer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698