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

Side by Side Diff: Source/core/dom/Document.cpp

Issue 561813003: Prepare blink to unify definitions of load completion (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
(...skipping 2477 matching lines...) Expand 10 before | Expand all | Expand 10 after
2488 } 2488 }
2489 2489
2490 m_frame->loader().checkCompleted(); 2490 m_frame->loader().checkCompleted();
2491 } 2491 }
2492 2492
2493 void Document::implicitClose() 2493 void Document::implicitClose()
2494 { 2494 {
2495 ASSERT(!inStyleRecalc()); 2495 ASSERT(!inStyleRecalc());
2496 if (processingLoadEvent() || !m_parser) 2496 if (processingLoadEvent() || !m_parser)
2497 return; 2497 return;
2498 if (frame() && frame()->navigationScheduler().locationChangePending()) 2498 if (frame() && frame()->navigationScheduler().locationChangePending()) {
2499 suppressLoadEvent();
dcheng 2014/10/20 18:35:14 If I'm reading this correctly, this means we won't
dcheng 2014/10/20 18:35:14 If I'm reading this correctly, this means we won't
2499 return; 2500 return;
2501 }
2500 2502
2501 // The call to dispatchWindowLoadEvent can detach the LocalDOMWindow and cau se it (and its 2503 // The call to dispatchWindowLoadEvent can detach the LocalDOMWindow and cau se it (and its
2502 // attached Document) to be destroyed. 2504 // attached Document) to be destroyed.
2503 RefPtrWillBeRawPtr<LocalDOMWindow> protectedWindow(this->domWindow()); 2505 RefPtrWillBeRawPtr<LocalDOMWindow> protectedWindow(this->domWindow());
2504 2506
2505 m_loadEventProgress = LoadEventInProgress; 2507 m_loadEventProgress = LoadEventInProgress;
2506 2508
2507 ScriptableDocumentParser* parser = scriptableDocumentParser(); 2509 ScriptableDocumentParser* parser = scriptableDocumentParser();
2508 m_wellFormed = parser && parser->wellFormed(); 2510 m_wellFormed = parser && parser->wellFormed();
2509 2511
(...skipping 1935 matching lines...) Expand 10 before | Expand all | Expand 10 after
4445 4447
4446 void Document::applyXSLTransform(ProcessingInstruction* pi) 4448 void Document::applyXSLTransform(ProcessingInstruction* pi)
4447 { 4449 {
4448 ASSERT(!pi->isLoading()); 4450 ASSERT(!pi->isLoading());
4449 UseCounter::count(*this, UseCounter::XSLProcessingInstruction); 4451 UseCounter::count(*this, UseCounter::XSLProcessingInstruction);
4450 RefPtrWillBeRawPtr<XSLTProcessor> processor = XSLTProcessor::create(*this); 4452 RefPtrWillBeRawPtr<XSLTProcessor> processor = XSLTProcessor::create(*this);
4451 processor->setXSLStyleSheet(toXSLStyleSheet(pi->sheet())); 4453 processor->setXSLStyleSheet(toXSLStyleSheet(pi->sheet()));
4452 String resultMIMEType; 4454 String resultMIMEType;
4453 String newSource; 4455 String newSource;
4454 String resultEncoding; 4456 String resultEncoding;
4455 if (!processor->transformToString(this, resultMIMEType, newSource, resultEnc oding)) 4457 setParsing(true);
dcheng 2014/10/20 18:35:14 It would be kind of nice to use some sort of scope
4458 if (!processor->transformToString(this, resultMIMEType, newSource, resultEnc oding)) {
4459 setParsing(false);
4456 return; 4460 return;
4461 }
4457 // FIXME: If the transform failed we should probably report an error (like M ozilla does). 4462 // FIXME: If the transform failed we should probably report an error (like M ozilla does).
4458 LocalFrame* ownerFrame = frame(); 4463 LocalFrame* ownerFrame = frame();
4459 processor->createDocumentFromSource(newSource, resultEncoding, resultMIMETyp e, this, ownerFrame); 4464 processor->createDocumentFromSource(newSource, resultEncoding, resultMIMETyp e, this, ownerFrame);
4460 InspectorInstrumentation::frameDocumentUpdated(ownerFrame); 4465 InspectorInstrumentation::frameDocumentUpdated(ownerFrame);
4466 setParsing(false);
4461 } 4467 }
4462 4468
4463 void Document::setTransformSource(PassOwnPtr<TransformSource> source) 4469 void Document::setTransformSource(PassOwnPtr<TransformSource> source)
4464 { 4470 {
4465 m_transformSource = source; 4471 m_transformSource = source;
4466 } 4472 }
4467 4473
4468 void Document::setDesignMode(InheritedBool value) 4474 void Document::setDesignMode(InheritedBool value)
4469 { 4475 {
4470 m_designMode = value; 4476 m_designMode = value;
(...skipping 1383 matching lines...) Expand 10 before | Expand all | Expand 10 after
5854 using namespace blink; 5860 using namespace blink;
5855 void showLiveDocumentInstances() 5861 void showLiveDocumentInstances()
5856 { 5862 {
5857 WeakDocumentSet& set = liveDocumentSet(); 5863 WeakDocumentSet& set = liveDocumentSet();
5858 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 5864 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
5859 for (WeakDocumentSet::const_iterator it = set.begin(); it != set.end(); ++it ) { 5865 for (WeakDocumentSet::const_iterator it = set.begin(); it != set.end(); ++it ) {
5860 fprintf(stderr, "- Document %p URL: %s\n", *it, (*it)->url().string().ut f8().data()); 5866 fprintf(stderr, "- Document %p URL: %s\n", *it, (*it)->url().string().ut f8().data());
5861 } 5867 }
5862 } 5868 }
5863 #endif 5869 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698