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

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

Issue 561813003: Prepare blink to unify definitions of load completion (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Add document.close() to scroll-left-while-loading.html Created 6 years, 2 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
« no previous file with comments | « Source/core/fetch/Resource.h ('k') | Source/core/fetch/ResourceFetcher.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 setLoading(false); 258 setLoading(false);
259 checkNotify(); 259 checkNotify();
260 } 260 }
261 261
262 void Resource::finishOnePart() 262 void Resource::finishOnePart()
263 { 263 {
264 setLoading(false); 264 setLoading(false);
265 checkNotify(); 265 checkNotify();
266 } 266 }
267 267
268 void Resource::finish(double finishTime) 268 void Resource::finish()
269 { 269 {
270 ASSERT(!m_resourceToRevalidate); 270 ASSERT(!m_resourceToRevalidate);
271 ASSERT(!errorOccurred()); 271 ASSERT(!errorOccurred());
272 m_loadFinishTime = finishTime;
273 finishOnePart(); 272 finishOnePart();
274 if (!errorOccurred()) 273 if (!errorOccurred())
275 m_status = Cached; 274 m_status = Cached;
276 } 275 }
277 276
278 bool Resource::passesAccessControlCheck(SecurityOrigin* securityOrigin) 277 bool Resource::passesAccessControlCheck(SecurityOrigin* securityOrigin)
279 { 278 {
280 String ignoredErrorDescription; 279 String ignoredErrorDescription;
281 return passesAccessControlCheck(securityOrigin, ignoredErrorDescription); 280 return passesAccessControlCheck(securityOrigin, ignoredErrorDescription);
282 } 281 }
(...skipping 724 matching lines...) Expand 10 before | Expand all | Expand 10 after
1007 return "ImportResource"; 1006 return "ImportResource";
1008 case Resource::Media: 1007 case Resource::Media:
1009 return "Media"; 1008 return "Media";
1010 } 1009 }
1011 ASSERT_NOT_REACHED(); 1010 ASSERT_NOT_REACHED();
1012 return "Unknown"; 1011 return "Unknown";
1013 } 1012 }
1014 #endif // !LOG_DISABLED 1013 #endif // !LOG_DISABLED
1015 1014
1016 } 1015 }
OLDNEW
« no previous file with comments | « Source/core/fetch/Resource.h ('k') | Source/core/fetch/ResourceFetcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698