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

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

Issue 625583002: Properly suspend HTMLDocumentParser (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed wrong method called 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
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 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 540
541 InspectorCounters::incrementCounter(InspectorCounters::DocumentCounter); 541 InspectorCounters::incrementCounter(InspectorCounters::DocumentCounter);
542 542
543 m_lifecycle.advanceTo(DocumentLifecycle::Inactive); 543 m_lifecycle.advanceTo(DocumentLifecycle::Inactive);
544 544
545 // Since CSSFontSelector requires Document::m_fetcher and StyleEngine owns 545 // Since CSSFontSelector requires Document::m_fetcher and StyleEngine owns
546 // CSSFontSelector, need to initialize m_styleEngine after initializing 546 // CSSFontSelector, need to initialize m_styleEngine after initializing
547 // m_fetcher. 547 // m_fetcher.
548 m_styleEngine = StyleEngine::create(*this); 548 m_styleEngine = StyleEngine::create(*this);
549 549
550 // The parent's parser should be suspended together with all the other objec ts,
551 // else this new Document would have a new ExecutionContext which suspended state
552 // would not match the one from the parent, and could start loading resource s
553 // ignoring the defersLoading flag.
554 ASSERT(!parentDocument() || !parentDocument()->activeDOMObjectsAreSuspended( ));
555
550 #ifndef NDEBUG 556 #ifndef NDEBUG
551 liveDocumentSet().add(this); 557 liveDocumentSet().add(this);
552 #endif 558 #endif
553 } 559 }
554 560
555 Document::~Document() 561 Document::~Document()
556 { 562 {
557 ASSERT(!renderView()); 563 ASSERT(!renderView());
558 ASSERT(!parentTreeScope()); 564 ASSERT(!parentTreeScope());
559 #if !ENABLE(OILPAN) 565 #if !ENABLE(OILPAN)
(...skipping 5291 matching lines...) Expand 10 before | Expand all | Expand 10 after
5851 using namespace blink; 5857 using namespace blink;
5852 void showLiveDocumentInstances() 5858 void showLiveDocumentInstances()
5853 { 5859 {
5854 WeakDocumentSet& set = liveDocumentSet(); 5860 WeakDocumentSet& set = liveDocumentSet();
5855 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 5861 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
5856 for (WeakDocumentSet::const_iterator it = set.begin(); it != set.end(); ++it ) { 5862 for (WeakDocumentSet::const_iterator it = set.begin(); it != set.end(); ++it ) {
5857 fprintf(stderr, "- Document %p URL: %s\n", *it, (*it)->url().string().ut f8().data()); 5863 fprintf(stderr, "- Document %p URL: %s\n", *it, (*it)->url().string().ut f8().data());
5858 } 5864 }
5859 } 5865 }
5860 #endif 5866 #endif
OLDNEW
« no previous file with comments | « no previous file | Source/core/dom/ExecutionContext.cpp » ('j') | Source/core/dom/ExecutionContext.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698