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

Side by Side Diff: Source/core/loader/TextTrackLoader.cpp

Issue 114123005: Show media and VTT text tracks in the devtools. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Addressed feedback. Created 6 years, 8 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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 112
113 if (!crossOriginMode.isNull()) { 113 if (!crossOriginMode.isNull()) {
114 cueRequest.setCrossOriginAccessControl(m_document.securityOrigin(), cros sOriginMode); 114 cueRequest.setCrossOriginAccessControl(m_document.securityOrigin(), cros sOriginMode);
115 } else if (!m_document.securityOrigin()->canRequest(url)) { 115 } else if (!m_document.securityOrigin()->canRequest(url)) {
116 // Text track elements without 'crossorigin' set on the parent are "No C ORS"; report error if not same-origin. 116 // Text track elements without 'crossorigin' set on the parent are "No C ORS"; report error if not same-origin.
117 corsPolicyPreventedLoad(m_document.securityOrigin(), url); 117 corsPolicyPreventedLoad(m_document.securityOrigin(), url);
118 return false; 118 return false;
119 } 119 }
120 120
121 ResourceFetcher* fetcher = m_document.fetcher(); 121 ResourceFetcher* fetcher = m_document.fetcher();
122 setResource(fetcher->fetchRawResource(cueRequest)); 122 setResource(fetcher->fetchTextTrack(cueRequest));
123 return resource(); 123 return resource();
124 } 124 }
125 125
126 void TextTrackLoader::newCuesParsed() 126 void TextTrackLoader::newCuesParsed()
127 { 127 {
128 if (m_cueLoadTimer.isActive()) 128 if (m_cueLoadTimer.isActive())
129 return; 129 return;
130 130
131 m_newCuesAvailable = true; 131 m_newCuesAvailable = true;
132 m_cueLoadTimer.startOneShot(0, FROM_HERE); 132 m_cueLoadTimer.startOneShot(0, FROM_HERE);
(...skipping 24 matching lines...) Expand all
157 } 157 }
158 158
159 void TextTrackLoader::getNewRegions(Vector<RefPtr<VTTRegion> >& outputRegions) 159 void TextTrackLoader::getNewRegions(Vector<RefPtr<VTTRegion> >& outputRegions)
160 { 160 {
161 ASSERT(m_cueParser); 161 ASSERT(m_cueParser);
162 if (m_cueParser) 162 if (m_cueParser)
163 m_cueParser->getNewRegions(outputRegions); 163 m_cueParser->getNewRegions(outputRegions);
164 } 164 }
165 165
166 } 166 }
OLDNEW
« no previous file with comments | « Source/core/loader/DocumentThreadableLoader.cpp ('k') | Source/devtools/front_end/NetworkManager.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698