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

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

Issue 916273002: Make DocumentLoader::timing return a reference (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase against ToT Created 5 years, 10 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 2600 matching lines...) Expand 10 before | Expand all | Expand 10 after
2611 window->dispatchEvent(PageTransitionEvent::create(EventTypeNames ::pagehide, false), this); 2611 window->dispatchEvent(PageTransitionEvent::create(EventTypeNames ::pagehide, false), this);
2612 if (!m_frame) 2612 if (!m_frame)
2613 return; 2613 return;
2614 2614
2615 // The DocumentLoader (and thus its DocumentLoadTiming) might get de stroyed 2615 // The DocumentLoader (and thus its DocumentLoadTiming) might get de stroyed
2616 // while dispatching the event, so protect it to prevent writing the end 2616 // while dispatching the event, so protect it to prevent writing the end
2617 // time into freed memory. 2617 // time into freed memory.
2618 RefPtr<DocumentLoader> documentLoader = m_frame->loader().provision alDocumentLoader(); 2618 RefPtr<DocumentLoader> documentLoader = m_frame->loader().provision alDocumentLoader();
2619 m_loadEventProgress = UnloadEventInProgress; 2619 m_loadEventProgress = UnloadEventInProgress;
2620 RefPtrWillBeRawPtr<Event> unloadEvent(Event::create(EventTypeNames:: unload)); 2620 RefPtrWillBeRawPtr<Event> unloadEvent(Event::create(EventTypeNames:: unload));
2621 if (documentLoader && !documentLoader->timing()->unloadEventStart() && !documentLoader->timing()->unloadEventEnd()) { 2621 if (documentLoader && !documentLoader->timing().unloadEventStart() & & !documentLoader->timing().unloadEventEnd()) {
2622 DocumentLoadTiming* timing = documentLoader->timing(); 2622 DocumentLoadTiming& timing = documentLoader->timing();
2623 ASSERT(timing->navigationStart()); 2623 ASSERT(timing.navigationStart());
2624 timing->markUnloadEventStart(); 2624 timing.markUnloadEventStart();
2625 m_frame->localDOMWindow()->dispatchEvent(unloadEvent, this); 2625 m_frame->localDOMWindow()->dispatchEvent(unloadEvent, this);
2626 timing->markUnloadEventEnd(); 2626 timing.markUnloadEventEnd();
2627 } else { 2627 } else {
2628 m_frame->localDOMWindow()->dispatchEvent(unloadEvent, m_frame->d ocument()); 2628 m_frame->localDOMWindow()->dispatchEvent(unloadEvent, m_frame->d ocument());
2629 } 2629 }
2630 } 2630 }
2631 m_loadEventProgress = UnloadEventHandled; 2631 m_loadEventProgress = UnloadEventHandled;
2632 } 2632 }
2633 2633
2634 if (!m_frame) 2634 if (!m_frame)
2635 return; 2635 return;
2636 2636
(...skipping 3132 matching lines...) Expand 10 before | Expand all | Expand 10 after
5769 #ifndef NDEBUG 5769 #ifndef NDEBUG
5770 using namespace blink; 5770 using namespace blink;
5771 void showLiveDocumentInstances() 5771 void showLiveDocumentInstances()
5772 { 5772 {
5773 WeakDocumentSet& set = liveDocumentSet(); 5773 WeakDocumentSet& set = liveDocumentSet();
5774 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 5774 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
5775 for (Document* document : set) 5775 for (Document* document : set)
5776 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data()); 5776 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data());
5777 } 5777 }
5778 #endif 5778 #endif
OLDNEW
« no previous file with comments | « Source/core/animation/AnimationTimeline.cpp ('k') | Source/core/dom/ScriptedAnimationController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698