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

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 5014 matching lines...) Expand 10 before | Expand all | Expand 10 after
5025 { 5025 {
5026 if (!page() || page()->pointerLockController().lockPending()) 5026 if (!page() || page()->pointerLockController().lockPending())
5027 return 0; 5027 return 0;
5028 if (Element* element = page()->pointerLockController().element()) { 5028 if (Element* element = page()->pointerLockController().element()) {
5029 if (element->document() == this) 5029 if (element->document() == this)
5030 return element; 5030 return element;
5031 } 5031 }
5032 return 0; 5032 return 0;
5033 } 5033 }
5034 5034
5035 void Document::suppressLoadEvent()
5036 {
5037 if (!loadEventFinished())
5038 m_loadEventProgress = LoadEventCompleted;
5039 }
5040
5035 void Document::decrementLoadEventDelayCount() 5041 void Document::decrementLoadEventDelayCount()
5036 { 5042 {
5037 ASSERT(m_loadEventDelayCount); 5043 ASSERT(m_loadEventDelayCount);
5038 --m_loadEventDelayCount; 5044 --m_loadEventDelayCount;
5039 5045
5040 if (!m_loadEventDelayCount) 5046 if (!m_loadEventDelayCount)
5041 checkLoadEventSoon(); 5047 checkLoadEventSoon();
5042 } 5048 }
5043 5049
5044 void Document::checkLoadEventSoon() 5050 void Document::checkLoadEventSoon()
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
5204 LayoutRect visibleContentRect = view()->visualViewportRect(); 5210 LayoutRect visibleContentRect = view()->visualViewportRect();
5205 rect.move(-FloatSize(visibleContentRect.x().toFloat(), visibleContentRect.y( ).toFloat())); 5211 rect.move(-FloatSize(visibleContentRect.x().toFloat(), visibleContentRect.y( ).toFloat()));
5206 adjustFloatRectForAbsoluteZoom(rect, renderer); 5212 adjustFloatRectForAbsoluteZoom(rect, renderer);
5207 } 5213 }
5208 5214
5209 bool Document::hasActiveParser() 5215 bool Document::hasActiveParser()
5210 { 5216 {
5211 return m_activeParserCount || (m_parser && m_parser->processingData()); 5217 return m_activeParserCount || (m_parser && m_parser->processingData());
5212 } 5218 }
5213 5219
5214 void Document::decrementActiveParserCount()
5215 {
5216 --m_activeParserCount;
5217 if (!frame())
5218 return;
5219 frame()->loader().checkLoadComplete();
5220 }
5221
5222 void Document::setContextFeatures(ContextFeatures& features) 5220 void Document::setContextFeatures(ContextFeatures& features)
5223 { 5221 {
5224 m_contextFeatures = PassRefPtrWillBeRawPtr<ContextFeatures>(features); 5222 m_contextFeatures = PassRefPtrWillBeRawPtr<ContextFeatures>(features);
5225 } 5223 }
5226 5224
5227 static RenderObject* nearestCommonHoverAncestor(RenderObject* obj1, RenderObject * obj2) 5225 static RenderObject* nearestCommonHoverAncestor(RenderObject* obj1, RenderObject * obj2)
5228 { 5226 {
5229 if (!obj1 || !obj2) 5227 if (!obj1 || !obj2)
5230 return 0; 5228 return 0;
5231 5229
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after
5765 #ifndef NDEBUG 5763 #ifndef NDEBUG
5766 using namespace blink; 5764 using namespace blink;
5767 void showLiveDocumentInstances() 5765 void showLiveDocumentInstances()
5768 { 5766 {
5769 WeakDocumentSet& set = liveDocumentSet(); 5767 WeakDocumentSet& set = liveDocumentSet();
5770 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 5768 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
5771 for (Document* document : set) 5769 for (Document* document : set)
5772 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data()); 5770 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data());
5773 } 5771 }
5774 #endif 5772 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698