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

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

Issue 2249913003: Remove blink::Resource::Type::LinkPrefetch and replace it by a flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 1053 matching lines...) Expand 10 before | Expand all | Expand 10 after
1064 case Resource::Script: 1064 case Resource::Script:
1065 return "Script"; 1065 return "Script";
1066 case Resource::Font: 1066 case Resource::Font:
1067 return "Font"; 1067 return "Font";
1068 case Resource::Raw: 1068 case Resource::Raw:
1069 return initatorTypeNameToString(initiatorInfo.name); 1069 return initatorTypeNameToString(initiatorInfo.name);
1070 case Resource::SVGDocument: 1070 case Resource::SVGDocument:
1071 return "SVG document"; 1071 return "SVG document";
1072 case Resource::XSLStyleSheet: 1072 case Resource::XSLStyleSheet:
1073 return "XSL stylesheet"; 1073 return "XSL stylesheet";
1074 case Resource::LinkPrefetch:
1075 return "Link prefetch resource";
1076 case Resource::LinkPreload: 1074 case Resource::LinkPreload:
1077 return "Link preload resource"; 1075 return "Link preload resource";
1078 case Resource::TextTrack: 1076 case Resource::TextTrack:
1079 return "Text track"; 1077 return "Text track";
1080 case Resource::ImportResource: 1078 case Resource::ImportResource:
1081 return "Imported resource"; 1079 return "Imported resource";
1082 case Resource::Media: 1080 case Resource::Media:
1083 return "Media"; 1081 return "Media";
1084 case Resource::Manifest: 1082 case Resource::Manifest:
1085 return "Manifest"; 1083 return "Manifest";
1086 } 1084 }
1087 ASSERT_NOT_REACHED(); 1085 ASSERT_NOT_REACHED();
1088 return initatorTypeNameToString(initiatorInfo.name); 1086 return initatorTypeNameToString(initiatorInfo.name);
1089 } 1087 }
1090 1088
1091 bool Resource::shouldBlockLoadEvent() const 1089 bool Resource::shouldBlockLoadEvent() const
1092 { 1090 {
1093 return !m_linkPreload && isLoadEventBlockingResourceType(); 1091 return !m_linkPreload && isLoadEventBlockingResourceType();
1094 } 1092 }
1095 1093
1096 bool Resource::isLoadEventBlockingResourceType() const 1094 bool Resource::isLoadEventBlockingResourceType() const
1097 { 1095 {
1096 if (isPrefetch())
1097 return false;
1098
1098 switch (m_type) { 1099 switch (m_type) {
1099 case Resource::MainResource: 1100 case Resource::MainResource:
1100 case Resource::Image: 1101 case Resource::Image:
1101 case Resource::CSSStyleSheet: 1102 case Resource::CSSStyleSheet:
1102 case Resource::Script: 1103 case Resource::Script:
1103 case Resource::Font: 1104 case Resource::Font:
1104 case Resource::SVGDocument: 1105 case Resource::SVGDocument:
1105 case Resource::XSLStyleSheet: 1106 case Resource::XSLStyleSheet:
1106 case Resource::ImportResource: 1107 case Resource::ImportResource:
1107 return true; 1108 return true;
1108 case Resource::Raw: 1109 case Resource::Raw:
1109 case Resource::LinkPrefetch:
1110 case Resource::LinkPreload: 1110 case Resource::LinkPreload:
1111 case Resource::TextTrack: 1111 case Resource::TextTrack:
1112 case Resource::Media: 1112 case Resource::Media:
1113 case Resource::Manifest: 1113 case Resource::Manifest:
1114 return false; 1114 return false;
1115 } 1115 }
1116 ASSERT_NOT_REACHED(); 1116 ASSERT_NOT_REACHED();
1117 return false; 1117 return false;
1118 } 1118 }
1119 1119
1120 } // namespace blink 1120 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/fetch/Resource.h ('k') | third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698