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

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

Issue 114123005: Show media and VTT text tracks in the devtools. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix unintended deviation from previous behavior. Created 6 years, 12 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) 2006 Samuel Weinig (sam.weinig@gmail.com) 4 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
5 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 6
7 This library is free software; you can redistribute it and/or 7 This library is free software; you can redistribute it and/or
8 modify it under the terms of the GNU Library General Public 8 modify it under the terms of the GNU Library General Public
9 License as published by the Free Software Foundation; either 9 License as published by the Free Software Foundation; either
10 version 2 of the License, or (at your option) any later version. 10 version 2 of the License, or (at your option) any later version.
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 CSSStyleSheet, 62 CSSStyleSheet,
63 Script, 63 Script,
64 Font, 64 Font,
65 Raw, 65 Raw,
66 SVGDocument, 66 SVGDocument,
67 XSLStyleSheet, 67 XSLStyleSheet,
68 LinkPrefetch, 68 LinkPrefetch,
69 LinkSubresource, 69 LinkSubresource,
70 TextTrack, 70 TextTrack,
71 Shader, 71 Shader,
72 ImportResource 72 ImportResource,
73 Media // Audio or video file requested by a HTML5 media element
73 }; 74 };
74 75
75 enum Status { 76 enum Status {
76 Unknown, // let cache decide what to do with it 77 Unknown, // let cache decide what to do with it
77 Pending, // only partially loaded 78 Pending, // only partially loaded
78 Cached, // regular case 79 Cached, // regular case
79 LoadError, 80 LoadError,
80 DecodeError 81 DecodeError
81 }; 82 };
82 83
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 virtual bool stillNeedsLoad() const { return false; } 148 virtual bool stillNeedsLoad() const { return false; }
148 149
149 ResourceLoader* loader() const { return m_loader.get(); } 150 ResourceLoader* loader() const { return m_loader.get(); }
150 151
151 virtual bool isImage() const { return false; } 152 virtual bool isImage() const { return false; }
152 bool ignoreForRequestCount() const 153 bool ignoreForRequestCount() const
153 { 154 {
154 return type() == MainResource 155 return type() == MainResource
155 || type() == LinkPrefetch 156 || type() == LinkPrefetch
156 || type() == LinkSubresource 157 || type() == LinkSubresource
157 || type() == Raw; 158 || type() == Media
159 || type() == Raw
160 || type() == TextTrack;
158 } 161 }
159 162
160 void updateForAccess(); 163 void updateForAccess();
161 unsigned accessCount() const { return m_accessCount; } 164 unsigned accessCount() const { return m_accessCount; }
162 165
163 // Computes the status of an object after loading. 166 // Computes the status of an object after loading.
164 // Updates the expire date on the cache entry file 167 // Updates the expire date on the cache entry file
165 void finish(double finishTime = 0.0); 168 void finish(double finishTime = 0.0);
166 169
167 // FIXME: Remove the stringless variant once all the callsites' error messag es are updated. 170 // FIXME: Remove the stringless variant once all the callsites' error messag es are updated.
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 const char* ResourceTypeName(Resource::Type); 392 const char* ResourceTypeName(Resource::Type);
390 #endif 393 #endif
391 394
392 #define DEFINE_RESOURCE_TYPE_CASTS(typeName) \ 395 #define DEFINE_RESOURCE_TYPE_CASTS(typeName) \
393 DEFINE_TYPE_CASTS(typeName##Resource, Resource, resource, resource->type() = = Resource::typeName, resource.type() == Resource::typeName); \ 396 DEFINE_TYPE_CASTS(typeName##Resource, Resource, resource, resource->type() = = Resource::typeName, resource.type() == Resource::typeName); \
394 inline typeName##Resource* to##typeName##Resource(const ResourcePtr<Resource >& ptr) { return to##typeName##Resource(ptr.get()); } 397 inline typeName##Resource* to##typeName##Resource(const ResourcePtr<Resource >& ptr) { return to##typeName##Resource(ptr.get()); }
395 398
396 } 399 }
397 400
398 #endif 401 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698