Skip to content

GitLab

T
tangled
Commit 4449adaa authored by Charlie Hu's avatar Charlie Hu Committed by Commit Bot
Browse files
Options

Rename document policy 'unoptimized-lossless-images-strict' to 'lossless-images-strict-max-bpp' 

Bug: 1113375
Change-Id: I195fafec5b957750b295cf8fa0a954532599c196
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2333497Reviewed-by: default avatarRobert Sesek <rsesek@chromium.org>
Reviewed-by: default avatarPhilip Jägenstedt <foolip@chromium.org>
Reviewed-by: default avatarIan Clelland <iclelland@chromium.org>
Commit-Queue: Charlie Hu <chenleihu@google.com>
Cr-Commit-Position: refs/heads/master@{#799097}
parent aa6970c7
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
third_party/blink/public/mojom/feature_policy/document_policy_feature.mojom
View file @ 4449adaa
...@@ -15,7 +15,7 @@ enum DocumentPolicyFeature { ...@@ -15,7 +15,7 @@ enum DocumentPolicyFeature {
// Controls whether the browser should allow navigations that cause the page to scroll. // Controls whether the browser should allow navigations that cause the page to scroll.
kForceLoadAtTop = 3, kForceLoadAtTop = 3,
kUnoptimizedLosslessImagesStrict = 4, kLosslessImagesStrictMaxBpp = 4,
kUnoptimizedLossyImages = 5, kUnoptimizedLossyImages = 5,
// Takes a parameter, |scale_ratio|, and restricts source image sizes to be // Takes a parameter, |scale_ratio|, and restricts source image sizes to be
// no more than |scale_ratio| x larger than the image's containing block. // no more than |scale_ratio| x larger than the image's containing block.
......
third_party/blink/renderer/core/feature_policy/document_policy_features.json5
View file @ 4449adaa
...@@ -61,8 +61,8 @@ ...@@ -61,8 +61,8 @@
default_value: "false", default_value: "false",
}, },
{ {
name: "UnoptimizedLosslessImagesStrict", name: "LosslessImagesStrictMaxBpp",
document_policy_name: "unoptimized-lossless-images-strict", document_policy_name: "lossless-images-strict-max-bpp",
value_type: "DecDouble", value_type: "DecDouble",
default_value: "max", default_value: "max",
depends_on: ["UnoptimizedImagePolicies"], depends_on: ["UnoptimizedImagePolicies"],
......
third_party/blink/renderer/core/loader/resource/image_resource_content.cc
View file @ 4449adaa
...@@ -495,7 +495,7 @@ bool ImageResourceContent::IsAcceptableCompressionRatio( ...@@ -495,7 +495,7 @@ bool ImageResourceContent::IsAcceptableCompressionRatio(
PolicyValue(compression_ratio_10k), ReportOptions::kReportOnFailure, PolicyValue(compression_ratio_10k), ReportOptions::kReportOnFailure,
g_empty_string, image_url); g_empty_string, image_url);
bool enabled_by_1k_policy = context.IsFeatureEnabled( bool enabled_by_1k_policy = context.IsFeatureEnabled(
mojom::blink::DocumentPolicyFeature::kUnoptimizedLosslessImagesStrict, mojom::blink::DocumentPolicyFeature::kLosslessImagesStrictMaxBpp,
PolicyValue(compression_ratio_1k), ReportOptions::kReportOnFailure, PolicyValue(compression_ratio_1k), ReportOptions::kReportOnFailure,
g_empty_string, image_url); g_empty_string, image_url);
return enabled_by_10k_policy && enabled_by_1k_policy; return enabled_by_10k_policy && enabled_by_1k_policy;
......
third_party/blink/web_tests/http/tests/images/document-policy-lossless-images-strict-max-bpp-expected.txt 0 → 100644
View file @ 4449adaa
CONSOLE ERROR: Document policy violation: lossless-images-strict-max-bpp is not allowed in this document.
CONSOLE ERROR: Document policy violation: lossless-images-strict-max-bpp is not allowed in this document.
third_party/blink/web_tests/http/tests/images/document-policy-unoptimized-lossless-images-strict.php → third_party/blink/web_tests/http/tests/images/document-policy-lossless-images-strict-max-bpp.php
View file @ 4449adaa
<?php <?php
header("Document-Policy: unoptimized-lossless-images-strict=1.0"); header("Document-Policy: lossless-images-strict-max-bpp=1.0");
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
<style> <style>
......
third_party/blink/web_tests/http/tests/images/document-policy-unoptimized-lossless-images-strict-expected.txt deleted 100644 → 0
View file @ aa6970c7
CONSOLE ERROR: Document policy violation: unoptimized-lossless-images-strict is not allowed in this document.
CONSOLE ERROR: Document policy violation: unoptimized-lossless-images-strict is not allowed in this document.
tools/metrics/histograms/enums.xml
View file @ 4449adaa
...@@ -16884,7 +16884,7 @@ Called by update_document_policy_enum.py.--> ...@@ -16884,7 +16884,7 @@ Called by update_document_policy_enum.py.-->
<int value="1" label="FontDisplay"/> <int value="1" label="FontDisplay"/>
<int value="2" label="UnoptimizedLosslessImages"/> <int value="2" label="UnoptimizedLosslessImages"/>
<int value="3" label="ForceLoadAtTop"/> <int value="3" label="ForceLoadAtTop"/>
<int value="4" label="UnoptimizedLosslessImagesStrict"/> <int value="4" label="LosslessImagesStrictMaxBpp"/>
<int value="5" label="UnoptimizedLossyImages"/> <int value="5" label="UnoptimizedLossyImages"/>
<int value="6" label="OversizedImages"/> <int value="6" label="OversizedImages"/>
<int value="7" label="UnsizedMedia"/> <int value="7" label="UnsizedMedia"/>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment