Skip to content

GitLab

T
tangled
Commit 81e1b64b authored by Adam Langley's avatar Adam Langley Committed by Chromium LUCI CQ
Browse files
Options

Revert "qr_code_generator: add version 2-L" 

This reverts commit 0b693d80.

This triggers for small URLs but Sharing puts a proportionally much larger dino image over the top of it, degrading it too much in many cases. Reverting to merge to M89 then will revert-revert and add hack to set a minimum size for Sharing.

BUG=1168455

Original change's description:
> qr_code_generator: add version 2-L
>
> This change adds support for version two QR codes, with “low” error
> correction. This configuration matches how other platforms generate eSIM
> QR codes. Additionally, since version two QR codes are smaller, their
> blocks can be displayed with more pixels each, so a lower level of error
> correction is reasonable.
>
> Change-Id: I7f42239835f3d5c6c981b9c73680247858cc0f28
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2623842
> Commit-Queue: Adam Langley <agl@chromium.org>
> Auto-Submit: Adam Langley <agl@chromium.org>
> Reviewed-by: Martin Kreichgauer <martinkr@google.com>
> Cr-Commit-Position: refs/heads/master@{#843693}

Change-Id: Icdbb28bfc660cca5006a5fe7bf33cb4663dd2e44
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2643228Reviewed-by: default avatarMartin Kreichgauer <martinkr@google.com>
Commit-Queue: Adam Langley <agl@chromium.org>
Commit-Queue: Martin Kreichgauer <martinkr@google.com>
Auto-Submit: Adam Langley <agl@chromium.org>
Cr-Commit-Position: refs/heads/master@{#846313}
parent 34d0a4a1
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 76 deletions
chrome/browser/ui/webauthn/authenticator_dialog_browsertest.cc
View file @ 81e1b64b
......@@ -81,14 +81,6 @@ class AuthenticatorDialogTest : public DialogBrowserTest {
model->SetCurrentStep(
AuthenticatorRequestDialogModel::Step::kCableV2Activate);
} else if (name == "cable_v2_pair") {
// The caBLEv2 QR contents, set in this call, need to be realistic before
// trying to display the QR code otherwise the resulting QR code might
// have the wrong size, which causes a CHECK.
model->set_cable_transport_info(/*cable_extension_provided=*/false,
/*has_paired_phones=*/false,
"fido://"
"ogBYIQOk49lUTVYj9sGKWVu1Q5jHVySShDgZOqnM"
"XBP9Lh32EgFQefSUJIdftH_Eg_oxWPbBWw");
model->SetCurrentStep(
AuthenticatorRequestDialogModel::Step::kCableV2QRCode);
} else if (name == "set_pin") {
......
components/qr_code_generator/qr_code_generator.cc
View file @ 81e1b64b
......@@ -20,13 +20,7 @@ static constexpr int kMaxVersionWithSmallLengths = 9;
// A structure containing QR version-specific constants and data.
// All versions currently use error correction at level M.
struct QRVersionInfo {
enum class ECC {
kLow = 0,
kMedium = 1,
};
constexpr QRVersionInfo(const int version,
const ECC ecc,
const uint32_t encoded_version,
const int size,
const size_t group1_bytes,
......@@ -37,7 +31,6 @@ struct QRVersionInfo {
const size_t group2_block_data_bytes,
const std::array<int, 3> alignment_locations)
: version(version),
ecc(ecc),
encoded_version(encoded_version),
size(size),
group1_bytes(group1_bytes),
......@@ -66,9 +59,6 @@ struct QRVersionInfo {
// The version of the QR code.
const int version;
// The error correction level.
const ECC ecc;
// An 18-bit value that contains the version, BCH (18,6)-encoded. Only valid
// for versions seven and above. See table D.1 for values.
const uint32_t encoded_version;
......@@ -151,33 +141,10 @@ namespace {
constexpr QRVersionInfo version_infos[] = {
// See table 9 in the spec for the source of these numbers.
// 2-L
// 44 bytes in a single block.
{
2, // version
QRVersionInfo::ECC::kLow,
0, // encoded version (not included in this version)
25, // size (num tiles in each axis)
// Block group 1:
44, // Total bytes in group
1, // Number of blocks
34, // Data bytes per block
// Block group 2:
0,
0,
0,
// Alignment locations
{6, 18, 0},
},
// 5-M
// 134 bytes, as 2 blocks of 67.
{
5, // version
QRVersionInfo::ECC::kMedium,
5, // version
0, // encoded version (not included in this version)
37, // size (num tiles in each axis)
......@@ -198,8 +165,7 @@ constexpr QRVersionInfo version_infos[] = {
// 7-M
// 196 bytes, as 4 blocks of 49.
{
7, // version
QRVersionInfo::ECC::kMedium,
7, // version
0b000111110010010100, // encoded version
45, // size (num tiles in each axis)
......@@ -220,8 +186,7 @@ constexpr QRVersionInfo version_infos[] = {
// 9-M
// 292 bytes, as 3 blocks of 58 plus 2 blocks of 59.
{
9, // version
QRVersionInfo::ECC::kMedium,
9, // version
0b001001101010011001, // encoded version
53, // size (num tiles in each axis)
......@@ -242,8 +207,7 @@ constexpr QRVersionInfo version_infos[] = {
// 12-M
// 466 bytes, as 6 blocks of 58 and 2 blocks of 59.
{
12, // version
QRVersionInfo::ECC::kMedium,
12, // version
0b001100011101100010, // encoded version
65, // size (num tiles in each axis)
......@@ -307,24 +271,11 @@ static uint8_t (*const kMaskFunctions[kMaxMask + 1])(int x, int y) = {
};
// kFormatInformation is taken from table C.1 on page 80 and specifies the
// format value for each masking function. The first eight values assume ECC
// level 'L' and the rest assume ECC level 'M'.
static const uint16_t kFormatInformation[2 * (kMaxMask + 1)] = {
0x77c4, 0x72f3, 0x7daa, 0x789d, 0x662f, 0x6318, 0x6c41, 0x6976,
// format value for each masking function, assuming ECC level 'M'.
static const uint16_t kFormatInformation[kMaxMask + 1] = {
0x5412, 0x5125, 0x5e7c, 0x5b4b, 0x45f9, 0x40ce, 0x4f97, 0x4aa0,
};
// FormatInformationForECC returns an array of eight format values (one for each
// mask) for the given ECC level.
const uint16_t* FormatInformationForECC(QRVersionInfo::ECC ecc) {
switch (ecc) {
case QRVersionInfo::ECC::kLow:
return kFormatInformation;
case QRVersionInfo::ECC::kMedium:
return &kFormatInformation[8];
}
}
// kAlphanumValue maps from the beginning of the ASCII codespace to the value
// of a character in QR's alphanumeric mode, or 255 if the ASCII byte isn't
// represented. This is taken from table five of ISO 18004 (2015 edition).
......@@ -634,14 +585,15 @@ base::Optional<QRCodeGenerator::GeneratedCode> QRCodeGenerator::Generate(
// If |mask| was not specified, then evaluate each masking function to find
// the one with the lowest penalty score.
for (uint8_t mask_num = 0; !mask && mask_num <= kMaxMask; mask_num++) {
// FormatInformationForECC returns an array of encoded formatting words for
// the QR code that this code generates. See tables 10 and 12. For example:
// kFormatInformation is the encoded formatting word for the QR code that
// this code generates. See tables 10 and 12. For example:
// 00 011
// --|---
// error correction M | Mask pattern 3
//
// It's translated into a 15-bit value using the table on page 80.
PutFormatBits(FormatInformationForECC(version_info_->ecc)[mask_num]);
// It's translated into a 15-bit value using the table on page 80, which is
// stored in |kFormatInformation|.
PutFormatBits(kFormatInformation[mask_num]);
PutBits(interleaved_data, sizeof(interleaved_data),
kMaskFunctions[mask_num]);
......@@ -654,7 +606,7 @@ base::Optional<QRCodeGenerator::GeneratedCode> QRCodeGenerator::Generate(
}
// Repaint with the best mask function.
PutFormatBits(FormatInformationForECC(version_info_->ecc)[best_mask]);
PutFormatBits(kFormatInformation[best_mask]);
PutBits(interleaved_data, sizeof(interleaved_data),
kMaskFunctions[best_mask]);
......@@ -937,11 +889,6 @@ void QRCodeGenerator::AddErrorCorrection(base::span<uint8_t> out,
// gen = [toByte(x) for x in coeffs]
// print 'uint8_t kGenerator[' + str(len(gen)) + '] = {' + str(gen) + '}'
// Used for 2-L: 10 error correction codewords per block.
static const uint8_t kGenerator10[] = {
193, 157, 113, 95, 94, 199, 111, 159, 194, 216, 1,
};
// Used for 7-M: 18 error correction codewords per block.
static const uint8_t kGenerator18[] = {
146, 217, 67, 32, 75, 173, 82, 73, 220, 240,
......@@ -962,9 +909,6 @@ void QRCodeGenerator::AddErrorCorrection(base::span<uint8_t> out,
const uint8_t* generator = nullptr;
switch (block_ec_bytes) {
case 10:
generator = kGenerator10;
break;
case 18:
generator = kGenerator18;
break;
......
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