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

Side by Side Diff: third_party/WebKit/WebCore/html/HTMLTokenizer.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) 1998 Waldo Bastian (bastian@kde.org) 4 (C) 1998 Waldo Bastian (bastian@kde.org)
5 (C) 1999 Lars Knoll (knoll@kde.org) 5 (C) 1999 Lars Knoll (knoll@kde.org)
6 (C) 1999 Antti Koivisto (koivisto@kde.org) 6 (C) 1999 Antti Koivisto (koivisto@kde.org)
7 (C) 2001 Dirk Mueller (mueller@kde.org) 7 (C) 2001 Dirk Mueller (mueller@kde.org)
8 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reser ved. 8 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reser ved.
9 Copyright (C) 2005, 2006 Alexey Proskuryakov (ap@nypop.com) 9 Copyright (C) 2005, 2006 Alexey Proskuryakov (ap@nypop.com)
10 10
(...skipping 1962 matching lines...) Expand 10 before | Expand all | Expand 10 after
1973 cs->removeClient(this); 1973 cs->removeClient(this);
1974 1974
1975 RefPtr<Node> n = m_scriptNode.release(); 1975 RefPtr<Node> n = m_scriptNode.release();
1976 1976
1977 #ifdef INSTRUMENT_LAYOUT_SCHEDULING 1977 #ifdef INSTRUMENT_LAYOUT_SCHEDULING
1978 if (!m_doc->ownerElement()) 1978 if (!m_doc->ownerElement())
1979 printf("external script beginning execution at %d\n", m_doc->elapsed Time()); 1979 printf("external script beginning execution at %d\n", m_doc->elapsed Time());
1980 #endif 1980 #endif
1981 1981
1982 if (errorOccurred) 1982 if (errorOccurred)
1983 n->dispatchEventForType(eventNames().errorEvent, true, false); 1983 EventTargetNodeCast(n.get())->dispatchEventForType(eventNames().erro rEvent, true, false);
1984 else { 1984 else {
1985 if (static_cast<HTMLScriptElement*>(n.get())->shouldExecuteAsJavaScr ipt()) 1985 if (static_cast<HTMLScriptElement*>(n.get())->shouldExecuteAsJavaScr ipt())
1986 m_state = scriptExecution(sourceCode, m_state); 1986 m_state = scriptExecution(sourceCode, m_state);
1987 n->dispatchEventForType(eventNames().loadEvent, false, false); 1987 EventTargetNodeCast(n.get())->dispatchEventForType(eventNames().load Event, false, false);
1988 } 1988 }
1989 1989
1990 // The state of m_pendingScripts.isEmpty() can change inside the scriptE xecution() 1990 // The state of m_pendingScripts.isEmpty() can change inside the scriptE xecution()
1991 // call above, so test afterwards. 1991 // call above, so test afterwards.
1992 finished = m_pendingScripts.isEmpty(); 1992 finished = m_pendingScripts.isEmpty();
1993 if (finished) { 1993 if (finished) {
1994 ASSERT(!m_hasScriptsWaitingForStylesheets); 1994 ASSERT(!m_hasScriptsWaitingForStylesheets);
1995 m_state.setLoadingExtScript(false); 1995 m_state.setLoadingExtScript(false);
1996 #ifdef INSTRUMENT_LAYOUT_SCHEDULING 1996 #ifdef INSTRUMENT_LAYOUT_SCHEDULING
1997 if (!m_doc->ownerElement()) 1997 if (!m_doc->ownerElement())
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
2036 2036
2037 UChar decodeNamedEntity(const char* name) 2037 UChar decodeNamedEntity(const char* name)
2038 { 2038 {
2039 const Entity* e = findEntity(name, strlen(name)); 2039 const Entity* e = findEntity(name, strlen(name));
2040 return e ? e->code : 0; 2040 return e ? e->code : 0;
2041 } 2041 }
2042 2042
2043 } 2043 }
2044 2044
2045 2045
OLDNEW
« no previous file with comments | « third_party/WebKit/WebCore/html/HTMLParser.cpp ('k') | third_party/WebKit/WebCore/loader/EmptyClients.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698