summaryrefslogtreecommitdiff
path: root/chromium/chrome/browser/resources/media
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-12 14:27:29 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-13 09:35:20 +0000
commitc30a6232df03e1efbd9f3b226777b07e087a1122 (patch)
treee992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/chrome/browser/resources/media
parent7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff)
downloadqtwebengine-chromium-85-based.tar.gz
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/chrome/browser/resources/media')
-rw-r--r--chromium/chrome/browser/resources/media/media_data_table.js2
-rw-r--r--chromium/chrome/browser/resources/media/media_feeds.html15
-rw-r--r--chromium/chrome/browser/resources/media/media_feeds.js68
-rw-r--r--chromium/chrome/browser/resources/media/media_history.js2
-rw-r--r--chromium/chrome/browser/resources/media/webrtc_logs_resources.grd6
5 files changed, 68 insertions, 25 deletions
diff --git a/chromium/chrome/browser/resources/media/media_data_table.js b/chromium/chrome/browser/resources/media/media_data_table.js
index 758ace61120..96e21e7f814 100644
--- a/chromium/chrome/browser/resources/media/media_data_table.js
+++ b/chromium/chrome/browser/resources/media/media_data_table.js
@@ -44,7 +44,7 @@ cr.define('cr.ui', function() {
render() {
// Find the body of the table and clear it.
const body = this.table_.querySelectorAll('tbody')[0];
- body.innerHTML = '';
+ body.innerHTML = trustedTypes.emptyHTML;
// Get the sort key from the columns to determine which data should be in
// which column.
diff --git a/chromium/chrome/browser/resources/media/media_feeds.html b/chromium/chrome/browser/resources/media/media_feeds.html
index 74429bf95b2..e6919df0c4b 100644
--- a/chromium/chrome/browser/resources/media/media_feeds.html
+++ b/chromium/chrome/browser/resources/media/media_feeds.html
@@ -80,6 +80,10 @@
content: '▼';
position: absolute;
}
+
+ div#fetch-logs-content {
+ color: red;
+ }
</style>
</head>
<body>
@@ -147,8 +151,11 @@
<th sort-key="resetReason">
Reset Reason
</th>
- <th data-key="associatedOrigins">
- Associated Origins
+ <th data-key="cookieNameFilter">
+ Cookie Name Filter
+ </th>
+ <th data-key="safeSearchResult">
+ Safe Search Result
</th>
<th data-key="logos">
Logos
@@ -233,6 +240,10 @@
<tbody>
</tbody>
</table>
+ <div id="fetch-logs">
+ <h3>Fetch logs:</h3>
+ <div id="fetch-logs-content"></div>
+ </div>
</div>
</body>
</html>
diff --git a/chromium/chrome/browser/resources/media/media_feeds.js b/chromium/chrome/browser/resources/media/media_feeds.js
index 8ec4bee66af..09dd402294b 100644
--- a/chromium/chrome/browser/resources/media/media_feeds.js
+++ b/chromium/chrome/browser/resources/media/media_feeds.js
@@ -21,9 +21,16 @@ function whenConfigTableIsPopulatedForTest() {
return mediaFeedsConfigTableIsPopulatedResolver.promise;
}
-const mediaFeedsConfigTableIsUpdatedResolver = new PromiseResolver();
-function whenConfigTableIsUpdatedForTest() {
- return mediaFeedsConfigTableIsUpdatedResolver.promise;
+const mediaFeedsConfigTableSafeSearchPrefIsUpdatedResolver =
+ new PromiseResolver();
+function whenConfigTableSafeSearchPrefIsUpdatedForTest() {
+ return mediaFeedsConfigTableSafeSearchPrefIsUpdatedResolver.promise;
+}
+
+const mediaFeedsConfigTableBackgroundFetchingPrefIsUpdatedResolver =
+ new PromiseResolver();
+function whenConfigTableBackgroundFetchingPrefIsUpdatedForTest() {
+ return mediaFeedsConfigTableBackgroundFetchingPrefIsUpdatedResolver.promise;
}
(function() {
@@ -53,6 +60,10 @@ class MediaFeedsTableDelegate {
a.addEventListener('click', () => {
showFeedContents(dataRow);
+
+ // Clear old logs and hide the area from display.
+ $('fetch-logs').style.display = 'none';
+ $('fetch-logs-content').textContent = '';
});
td.appendChild(document.createElement('br'));
@@ -66,6 +77,9 @@ class MediaFeedsTableDelegate {
store.fetchMediaFeed(dataRow.id).then(response => {
updateFeedsTable();
showFeedContents(dataRow);
+
+ $('fetch-logs').style.display = 'block';
+ $('fetch-logs-content').textContent = response.logs;
});
});
}
@@ -155,7 +169,20 @@ class MediaFeedsTableDelegate {
td.textContent = 'Movie';
break;
}
- } else if (key == 'isFamilyFriendly' || key == 'clicked') {
+ } else if (key == 'isFamilyFriendly') {
+ // Format a IsFamilyFriendly.
+ switch (parseInt(data, 10)) {
+ case mediaFeeds.mojom.IsFamilyFriendly.kUnknown:
+ td.textContent = 'Unknown';
+ break;
+ case mediaFeeds.mojom.IsFamilyFriendly.kYes:
+ td.textContent = 'Yes';
+ break;
+ case mediaFeeds.mojom.IsFamilyFriendly.kNo:
+ td.textContent = 'No';
+ break;
+ }
+ } else if (key == 'clicked') {
// Format a boolean.
td.textContent = data ? 'Yes' : 'No';
} else if (key == 'actionStatus') {
@@ -291,16 +318,6 @@ class MediaFeedsTableDelegate {
td.textContent = 'Cache';
break;
}
- } else if (key === 'associatedOrigins') {
- // Format the array of origins.
- const origins = [];
-
- data.forEach((origin) => {
- const {scheme, host, port} = origin;
- origins.push(new URL(`${scheme}://${host}:${port}`).origin);
- });
-
- td.textContent = origins.join(', ');
} else if (key === 'userIdentifier') {
if (data) {
td.textContent = 'Name=' + data.name;
@@ -338,7 +355,7 @@ class MediaFeedsTableDelegate {
sortKey === 'fetchFailedCount' || sortKey === 'lastFetchItemCount' ||
sortKey === 'lastFetchPlayNextCount' ||
sortKey === 'lastFetchContentTypes' || sortKey === 'safeSearchResult' ||
- sortKey === 'type') {
+ sortKey === 'type' || sortKey === 'cookieNameFilter') {
return val1 > val2 ? 1 : -1;
} else if (
sortKey === 'lastDiscoveryTime' || sortKey === 'lastFetchTime' ||
@@ -541,7 +558,7 @@ function createConfigRowWithToggle(name, value, clickAction) {
* @param {!mediaFeeds.mojom.DebugInformation} info The debug info
*/
function renderConfigTable(info) {
- configTableBody.innerHTML = '';
+ configTableBody.innerHTML = trustedTypes.emptyHTML;
configTableBody.appendChild(createConfigRow(
'Safe Search Enabled (value)',
@@ -552,9 +569,26 @@ function renderConfigTable(info) {
() => {
store.setSafeSearchEnabledPref(!info.safeSearchPrefValue).then(() => {
updateConfigTable().then(
- () => mediaFeedsConfigTableIsUpdatedResolver.resolve());
+ () => mediaFeedsConfigTableSafeSearchPrefIsUpdatedResolver
+ .resolve());
});
}));
+
+ configTableBody.appendChild(createConfigRow(
+ 'Background Fetching Enabled (value)',
+ formatFeatureFlag(info.backgroundFetchingFeatureEnabled)));
+
+ configTableBody.appendChild(createConfigRowWithToggle(
+ 'Background Fetching Enabled (pref)',
+ formatFeatureFlag(info.backgroundFetchingPrefValue), () => {
+ store.setBackgroundFetchingPref(!info.backgroundFetchingPrefValue)
+ .then(() => {
+ updateConfigTable().then(
+ () =>
+ mediaFeedsConfigTableBackgroundFetchingPrefIsUpdatedResolver
+ .resolve());
+ });
+ }));
}
/**
diff --git a/chromium/chrome/browser/resources/media/media_history.js b/chromium/chrome/browser/resources/media/media_history.js
index 30c66de2df0..a0c2ad69f57 100644
--- a/chromium/chrome/browser/resources/media/media_history.js
+++ b/chromium/chrome/browser/resources/media/media_history.js
@@ -160,7 +160,7 @@ function decodeString16(arr) {
* History store.
*/
function renderStatsTable(stats) {
- statsTableBody.innerHTML = '';
+ statsTableBody.innerHTML = trustedTypes.emptyHTML;
Object.keys(stats.tableRowCounts).forEach((key) => {
statsTableBody.appendChild(createStatsRow(key, stats.tableRowCounts[key]));
diff --git a/chromium/chrome/browser/resources/media/webrtc_logs_resources.grd b/chromium/chrome/browser/resources/media/webrtc_logs_resources.grd
index d4620a3d4ad..030e50ffc1b 100644
--- a/chromium/chrome/browser/resources/media/webrtc_logs_resources.grd
+++ b/chromium/chrome/browser/resources/media/webrtc_logs_resources.grd
@@ -14,12 +14,10 @@
file="webrtc_logs.html"
flattenhtml="true"
allowexternalscript="true"
- type="BINDATA"
- compress="gzip" />
+ type="BINDATA" />
<include name="IDR_WEBRTC_LOGS_JS"
file="webrtc_logs.js"
- type="BINDATA"
- compress="gzip" />
+ type="BINDATA" />
</includes>
</release>
</grit>
View Lorry Controller Status