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

Side by Side Diff: third_party/WebKit/Source/core/fetch/Resource.cpp

Issue 1967063002: Cancel asynchronously in allClientsAndObserversRemoved() for Raw type (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@temp1923003002_2
Patch Set: Fix tests. Created 4 years, 7 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) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) 3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) 4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) 5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
6 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 6 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
7 7
8 This library is free software; you can redistribute it and/or 8 This library is free software; you can redistribute it and/or
9 modify it under the terms of the GNU Library General Public 9 modify it under the terms of the GNU Library General Public
10 License as published by the Free Software Foundation; either 10 License as published by the Free Software Foundation; either
(...skipping 742 matching lines...) Expand 10 before | Expand all | Expand 10 after
753 memoryCache()->prune(this); 753 memoryCache()->prune(this);
754 } 754 }
755 } 755 }
756 // This object may be dead here. 756 // This object may be dead here.
757 } 757 }
758 758
759 void Resource::allClientsAndObserversRemoved() 759 void Resource::allClientsAndObserversRemoved()
760 { 760 {
761 if (!m_loader) 761 if (!m_loader)
762 return; 762 return;
763 if (m_type == Raw) 763 if (!m_cancelTimer.isActive())
764 cancelTimerFired(&m_cancelTimer);
765 else if (!m_cancelTimer.isActive())
766 m_cancelTimer.startOneShot(0, BLINK_FROM_HERE); 764 m_cancelTimer.startOneShot(0, BLINK_FROM_HERE);
767 765
768 unlock(); 766 unlock();
769 } 767 }
770 768
771 void Resource::cancelTimerFired(Timer<Resource>* timer) 769 void Resource::cancelTimerFired(Timer<Resource>* timer)
772 { 770 {
773 ASSERT_UNUSED(timer, timer == &m_cancelTimer); 771 ASSERT_UNUSED(timer, timer == &m_cancelTimer);
774 if (!hasClientsOrObservers() && m_loader) 772 if (!hasClientsOrObservers() && m_loader)
775 m_loader->cancel(); 773 m_loader->cancel();
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
1130 case Resource::Media: 1128 case Resource::Media:
1131 return "Media"; 1129 return "Media";
1132 case Resource::Manifest: 1130 case Resource::Manifest:
1133 return "Manifest"; 1131 return "Manifest";
1134 } 1132 }
1135 ASSERT_NOT_REACHED(); 1133 ASSERT_NOT_REACHED();
1136 return "Unknown"; 1134 return "Unknown";
1137 } 1135 }
1138 1136
1139 } // namespace blink 1137 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698