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

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

Issue 806183005: Remove FrameLoader's checkLoadComplete and checkLoadCompleteForThisFrame (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 11 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 5122 matching lines...) Expand 10 before | Expand all | Expand 10 after
5133 { 5133 {
5134 if (!page() || page()->pointerLockController().lockPending()) 5134 if (!page() || page()->pointerLockController().lockPending())
5135 return 0; 5135 return 0;
5136 if (Element* element = page()->pointerLockController().element()) { 5136 if (Element* element = page()->pointerLockController().element()) {
5137 if (element->document() == this) 5137 if (element->document() == this)
5138 return element; 5138 return element;
5139 } 5139 }
5140 return 0; 5140 return 0;
5141 } 5141 }
5142 5142
5143 void Document::suppressLoadEvent()
5144 {
5145 if (!loadEventFinished())
5146 m_loadEventProgress = LoadEventCompleted;
5147 }
5148
5143 void Document::decrementLoadEventDelayCount() 5149 void Document::decrementLoadEventDelayCount()
5144 { 5150 {
5145 ASSERT(m_loadEventDelayCount); 5151 ASSERT(m_loadEventDelayCount);
5146 --m_loadEventDelayCount; 5152 --m_loadEventDelayCount;
5147 5153
5148 if (!m_loadEventDelayCount) 5154 if (!m_loadEventDelayCount)
5149 checkLoadEventSoon(); 5155 checkLoadEventSoon();
5150 } 5156 }
5151 5157
5152 void Document::checkLoadEventSoon() 5158 void Document::checkLoadEventSoon()
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
5312 LayoutRect visibleContentRect = view()->visualViewportRect(); 5318 LayoutRect visibleContentRect = view()->visualViewportRect();
5313 rect.move(-FloatSize(visibleContentRect.x().toFloat(), visibleContentRect.y( ).toFloat())); 5319 rect.move(-FloatSize(visibleContentRect.x().toFloat(), visibleContentRect.y( ).toFloat()));
5314 adjustFloatRectForAbsoluteZoom(rect, renderer); 5320 adjustFloatRectForAbsoluteZoom(rect, renderer);
5315 } 5321 }
5316 5322
5317 bool Document::hasActiveParser() 5323 bool Document::hasActiveParser()
5318 { 5324 {
5319 return m_activeParserCount || (m_parser && m_parser->processingData()); 5325 return m_activeParserCount || (m_parser && m_parser->processingData());
5320 } 5326 }
5321 5327
5322 void Document::decrementActiveParserCount()
5323 {
5324 --m_activeParserCount;
5325 if (!frame())
5326 return;
5327 frame()->loader().checkLoadComplete();
5328 }
5329
5330 void Document::setContextFeatures(ContextFeatures& features) 5328 void Document::setContextFeatures(ContextFeatures& features)
5331 { 5329 {
5332 m_contextFeatures = PassRefPtrWillBeRawPtr<ContextFeatures>(features); 5330 m_contextFeatures = PassRefPtrWillBeRawPtr<ContextFeatures>(features);
5333 } 5331 }
5334 5332
5335 static RenderObject* nearestCommonHoverAncestor(RenderObject* obj1, RenderObject * obj2) 5333 static RenderObject* nearestCommonHoverAncestor(RenderObject* obj1, RenderObject * obj2)
5336 { 5334 {
5337 if (!obj1 || !obj2) 5335 if (!obj1 || !obj2)
5338 return 0; 5336 return 0;
5339 5337
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after
5873 #ifndef NDEBUG 5871 #ifndef NDEBUG
5874 using namespace blink; 5872 using namespace blink;
5875 void showLiveDocumentInstances() 5873 void showLiveDocumentInstances()
5876 { 5874 {
5877 WeakDocumentSet& set = liveDocumentSet(); 5875 WeakDocumentSet& set = liveDocumentSet();
5878 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 5876 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
5879 for (Document* document : set) 5877 for (Document* document : set)
5880 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data()); 5878 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data());
5881 } 5879 }
5882 #endif 5880 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698