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

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

Issue 33523002: Have Frame::script() return a reference (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase on master Created 7 years, 2 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
« no previous file with comments | « Source/core/xml/XMLTreeViewer.cpp ('k') | Source/modules/websockets/WebSocket.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 355
356 // JavaScript can detach the parser. Make sure this is not released 356 // JavaScript can detach the parser. Make sure this is not released
357 // before the end of this method. 357 // before the end of this method.
358 RefPtr<XMLDocumentParser> protect(this); 358 RefPtr<XMLDocumentParser> protect(this);
359 359
360 doWrite(source.toString()); 360 doWrite(source.toString());
361 361
362 if (isStopped()) 362 if (isStopped())
363 return; 363 return;
364 364
365 if (document()->frame() && document()->frame()->script()->canExecuteScripts( NotAboutToExecuteScript)) 365 if (document()->frame() && document()->frame()->script().canExecuteScripts(N otAboutToExecuteScript))
366 ImageLoader::dispatchPendingBeforeLoadEvents(); 366 ImageLoader::dispatchPendingBeforeLoadEvents();
367 } 367 }
368 368
369 void XMLDocumentParser::handleError(XMLErrors::ErrorType type, const char* forma ttedMessage, TextPosition position) 369 void XMLDocumentParser::handleError(XMLErrors::ErrorType type, const char* forma ttedMessage, TextPosition position)
370 { 370 {
371 m_xmlErrors.handleError(type, formattedMessage, position); 371 m_xmlErrors.handleError(type, formattedMessage, position);
372 if (type != XMLErrors::warning) 372 if (type != XMLErrors::warning)
373 m_sawError = true; 373 m_sawError = true;
374 if (type == XMLErrors::fatal) 374 if (type == XMLErrors::fatal)
375 stopParsing(); 375 stopParsing();
(...skipping 1259 matching lines...) Expand 10 before | Expand all | Expand 10 after
1635 sax.initialized = XML_SAX2_MAGIC; 1635 sax.initialized = XML_SAX2_MAGIC;
1636 RefPtr<XMLParserContext> parser = XMLParserContext::createStringParser(&sax, &state); 1636 RefPtr<XMLParserContext> parser = XMLParserContext::createStringParser(&sax, &state);
1637 String parseString = "<?xml version=\"1.0\"?><attrs " + string + " />"; 1637 String parseString = "<?xml version=\"1.0\"?><attrs " + string + " />";
1638 parseChunk(parser->context(), parseString); 1638 parseChunk(parser->context(), parseString);
1639 finishParsing(parser->context()); 1639 finishParsing(parser->context());
1640 attrsOK = state.gotAttributes; 1640 attrsOK = state.gotAttributes;
1641 return state.attributes; 1641 return state.attributes;
1642 } 1642 }
1643 1643
1644 } // namespace WebCore 1644 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/xml/XMLTreeViewer.cpp ('k') | Source/modules/websockets/WebSocket.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698