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

Side by Side Diff: sky/engine/core/html/parser/HTMLTreeBuilder.cpp

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 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
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, 2014 Apple Inc. All rights reserved. 3 * Copyright (C) 2011, 2014 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 10 matching lines...) Expand all
21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */ 25 */
26 26
27 #include "sky/engine/config.h" 27 #include "sky/engine/config.h"
28 #include "sky/engine/core/html/parser/HTMLTreeBuilder.h" 28 #include "sky/engine/core/html/parser/HTMLTreeBuilder.h"
29 29
30 #include "gen/sky/core/HTMLNames.h" 30 #include "gen/sky/core/HTMLNames.h"
31 #include "sky/engine/bindings/core/v8/ExceptionStatePlaceholder.h" 31 #include "sky/engine/bindings2/exception_state_placeholder.h"
32 #include "sky/engine/core/dom/DocumentFragment.h" 32 #include "sky/engine/core/dom/DocumentFragment.h"
33 #include "sky/engine/core/html/HTMLTemplateElement.h" 33 #include "sky/engine/core/html/HTMLTemplateElement.h"
34 #include "sky/engine/core/html/parser/AtomicHTMLToken.h" 34 #include "sky/engine/core/html/parser/AtomicHTMLToken.h"
35 #include "sky/engine/core/html/parser/HTMLDocumentParser.h" 35 #include "sky/engine/core/html/parser/HTMLDocumentParser.h"
36 #include "sky/engine/core/html/parser/HTMLParserIdioms.h" 36 #include "sky/engine/core/html/parser/HTMLParserIdioms.h"
37 #include "sky/engine/core/html/parser/HTMLToken.h" 37 #include "sky/engine/core/html/parser/HTMLToken.h"
38 #include "sky/engine/core/html/parser/HTMLTokenizer.h" 38 #include "sky/engine/core/html/parser/HTMLTokenizer.h"
39 39
40 namespace blink { 40 namespace blink {
41 41
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 void HTMLTreeBuilder::finished() 210 void HTMLTreeBuilder::finished()
211 { 211 {
212 if (isParsingFragment()) 212 if (isParsingFragment())
213 return; 213 return;
214 ASSERT(m_isAttached); 214 ASSERT(m_isAttached);
215 // Warning, this may detach the parser. Do not do anything else after this. 215 // Warning, this may detach the parser. Do not do anything else after this.
216 m_tree.finishedParsing(); 216 m_tree.finishedParsing();
217 } 217 }
218 218
219 } // namespace blink 219 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/html/parser/HTMLScriptRunner.cpp ('k') | sky/engine/core/inspector/ConsoleMessage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698