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

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

Issue 1937813002: Cancel asynchronously in allClientsAndObserversRemoved() except for Raw type (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 684 matching lines...) Expand 10 before | Expand all | Expand 10 after
695 memoryCache()->prune(this); 695 memoryCache()->prune(this);
696 } 696 }
697 } 697 }
698 // This object may be dead here. 698 // This object may be dead here.
699 } 699 }
700 700
701 void Resource::allClientsAndObserversRemoved() 701 void Resource::allClientsAndObserversRemoved()
702 { 702 {
703 if (!m_loader) 703 if (!m_loader)
704 return; 704 return;
705 if (m_type == MainResource || m_type == Raw || !memoryCache()->contains(this )) 705 if (m_type == Raw)
Nate Chapin 2016/05/02 21:17:06 I assume this case is really still needed? Ideally
hiroshige 2016/05/03 03:36:48 I expect we can always cancel asynchronously. Howe
706 cancelTimerFired(&m_cancelTimer); 706 cancelTimerFired(&m_cancelTimer);
707 else if (!m_cancelTimer.isActive()) 707 else if (!m_cancelTimer.isActive())
708 m_cancelTimer.startOneShot(0, BLINK_FROM_HERE); 708 m_cancelTimer.startOneShot(0, BLINK_FROM_HERE);
709 709
710 unlock(); 710 unlock();
711 } 711 }
712 712
713 void Resource::cancelTimerFired(Timer<Resource>* timer) 713 void Resource::cancelTimerFired(Timer<Resource>* timer)
714 { 714 {
715 ASSERT_UNUSED(timer, timer == &m_cancelTimer); 715 ASSERT_UNUSED(timer, timer == &m_cancelTimer);
(...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after
1074 case Resource::Media: 1074 case Resource::Media:
1075 return "Media"; 1075 return "Media";
1076 case Resource::Manifest: 1076 case Resource::Manifest:
1077 return "Manifest"; 1077 return "Manifest";
1078 } 1078 }
1079 ASSERT_NOT_REACHED(); 1079 ASSERT_NOT_REACHED();
1080 return "Unknown"; 1080 return "Unknown";
1081 } 1081 }
1082 1082
1083 } // namespace blink 1083 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698