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

Side by Side Diff: third_party/WebKit/Source/core/xml/parser/XMLDocumentParser.cpp

Issue 2724673002: [WIP] Introduce ScriptResourceData
Patch Set: Fix Created 3 years, 7 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) 2000 Peter Kelly (pmk@post.com) 2 * Copyright (C) 2000 Peter Kelly (pmk@post.com)
3 * Copyright (C) 2005, 2006, 2008, 2014 Apple Inc. All rights reserved. 3 * Copyright (C) 2005, 2006, 2008, 2014 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. 8 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved.
9 * (http://www.torchmobile.com/) 9 * (http://www.torchmobile.com/)
10 * 10 *
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after
429 end(); 429 end();
430 } 430 }
431 431
432 void XMLDocumentParser::InsertErrorMessageBlock() { 432 void XMLDocumentParser::InsertErrorMessageBlock() {
433 xml_errors_.InsertErrorMessageBlock(); 433 xml_errors_.InsertErrorMessageBlock();
434 } 434 }
435 435
436 void XMLDocumentParser::NotifyFinished(Resource* unused_resource) { 436 void XMLDocumentParser::NotifyFinished(Resource* unused_resource) {
437 DCHECK_EQ(unused_resource, pending_script_); 437 DCHECK_EQ(unused_resource, pending_script_);
438 438
439 ScriptSourceCode source_code(pending_script_.Get()); 439 ScriptSourceCode source_code(pending_script_->ResourceData());
440 bool error_occurred = pending_script_->ErrorOccurred(); 440 bool error_occurred = pending_script_->ErrorOccurred();
441 bool was_canceled = pending_script_->WasCanceled(); 441 bool was_canceled = pending_script_->WasCanceled();
442 double script_parser_blocking_time = 442 double script_parser_blocking_time =
443 parser_blocking_pending_script_load_start_time_; 443 parser_blocking_pending_script_load_start_time_;
444 parser_blocking_pending_script_load_start_time_ = 0.0; 444 parser_blocking_pending_script_load_start_time_ = 0.0;
445 445
446 pending_script_->RemoveClient(this); 446 pending_script_->RemoveClient(this);
447 pending_script_ = nullptr; 447 pending_script_ = nullptr;
448 448
449 Element* e = script_element_; 449 Element* e = script_element_;
(...skipping 1277 matching lines...) Expand 10 before | Expand all | Expand 10 after
1727 RefPtr<XMLParserContext> parser = 1727 RefPtr<XMLParserContext> parser =
1728 XMLParserContext::CreateStringParser(&sax, &state); 1728 XMLParserContext::CreateStringParser(&sax, &state);
1729 String parse_string = "<?xml version=\"1.0\"?><attrs " + string + " />"; 1729 String parse_string = "<?xml version=\"1.0\"?><attrs " + string + " />";
1730 ParseChunk(parser->Context(), parse_string); 1730 ParseChunk(parser->Context(), parse_string);
1731 FinishParsing(parser->Context()); 1731 FinishParsing(parser->Context());
1732 attrs_ok = state.got_attributes; 1732 attrs_ok = state.got_attributes;
1733 return state.attributes; 1733 return state.attributes;
1734 } 1734 }
1735 1735
1736 } // namespace blink 1736 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698