| OLD | NEW |
| 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 1105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1116 case Resource::LinkPrefetch: | 1116 case Resource::LinkPrefetch: |
| 1117 return "Link prefetch resource"; | 1117 return "Link prefetch resource"; |
| 1118 case Resource::LinkSubresource: | 1118 case Resource::LinkSubresource: |
| 1119 return "Link subresource"; | 1119 return "Link subresource"; |
| 1120 case Resource::TextTrack: | 1120 case Resource::TextTrack: |
| 1121 return "Text track"; | 1121 return "Text track"; |
| 1122 case Resource::ImportResource: | 1122 case Resource::ImportResource: |
| 1123 return "Imported resource"; | 1123 return "Imported resource"; |
| 1124 case Resource::Media: | 1124 case Resource::Media: |
| 1125 return "Media"; | 1125 return "Media"; |
| 1126 case Resource::Manifest: |
| 1127 return "Manifest"; |
| 1126 } | 1128 } |
| 1127 ASSERT_NOT_REACHED(); | 1129 ASSERT_NOT_REACHED(); |
| 1128 return initatorTypeNameToString(initiatorInfo.name); | 1130 return initatorTypeNameToString(initiatorInfo.name); |
| 1129 } | 1131 } |
| 1130 | 1132 |
| 1131 bool Resource::shouldBlockLoadEvent() const | 1133 bool Resource::shouldBlockLoadEvent() const |
| 1132 { | 1134 { |
| 1133 return !m_avoidBlockingOnLoad && isNonBlockingResourceType(); | 1135 return !m_avoidBlockingOnLoad && isNonBlockingResourceType(); |
| 1134 } | 1136 } |
| 1135 | 1137 |
| (...skipping 29 matching lines...) Expand all Loading... |
| 1165 case Resource::LinkPrefetch: | 1167 case Resource::LinkPrefetch: |
| 1166 return "LinkPrefetch"; | 1168 return "LinkPrefetch"; |
| 1167 case Resource::LinkSubresource: | 1169 case Resource::LinkSubresource: |
| 1168 return "LinkSubresource"; | 1170 return "LinkSubresource"; |
| 1169 case Resource::TextTrack: | 1171 case Resource::TextTrack: |
| 1170 return "TextTrack"; | 1172 return "TextTrack"; |
| 1171 case Resource::ImportResource: | 1173 case Resource::ImportResource: |
| 1172 return "ImportResource"; | 1174 return "ImportResource"; |
| 1173 case Resource::Media: | 1175 case Resource::Media: |
| 1174 return "Media"; | 1176 return "Media"; |
| 1177 case Resource::Manifest: |
| 1178 return "Manifest"; |
| 1175 } | 1179 } |
| 1176 ASSERT_NOT_REACHED(); | 1180 ASSERT_NOT_REACHED(); |
| 1177 return "Unknown"; | 1181 return "Unknown"; |
| 1178 } | 1182 } |
| 1179 #endif // !LOG_DISABLED | 1183 #endif // !LOG_DISABLED |
| 1180 | 1184 |
| 1181 } // namespace blink | 1185 } // namespace blink |
| OLD | NEW |