chromium/src
0
Fork 0
Code Activity

[PDF] Remove nested IFTTT

Browse Source 
The internal codebase allows nested IFTTT, but Gerrit does not. Remove
the nested IFTTT by combining them.

NO_IFTTT=This CL updates the relevant IFTTT.

Change-Id: I2efe712a2d88c663d842ce197de7cadd060e60e9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6064738
Code-Coverage: findit-for-me@appspot.gserviceaccount.com <findit-for-me@appspot.gserviceaccount.com>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Andy Phan <andyphan@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1390626}
This commit is contained in:
Andy Phan
2024-12-02 22:29:36 +00:00
committed by Chromium LUCI CQ
parent f6618a7c5e
commit b5e467c45a
2 changed files with 12 additions and 16 deletions
chrome/browser/resources/pdf/elements
ink_size_selector.ts
pdf
pdf_ink_metrics_handler.cc

22
chrome/browser/resources/pdf/elements/ink_size_selector.ts

@ -17,16 +17,24 @@ export interface SizeOption {
size: number;
}
// LINT.IfChange(PenAndEraserSizes)
export const ERASER_SIZES: SizeOption[] = [
// LINT.IfChange(EraserSizes)
{icon: 'eraser-size-1', label: 'ink2BrushSizeExtraThin', size: 1},
{icon: 'eraser-size-2', label: 'ink2BrushSizeThin', size: 2},
{icon: 'eraser-size-3', label: 'ink2BrushSizeMedium', size: 3},
{icon: 'eraser-size-4', label: 'ink2BrushSizeThick', size: 6},
{icon: 'eraser-size-5', label: 'ink2BrushSizeExtraThick', size: 8},
// LINT.ThenChange(//pdf/pdf_ink_metrics_handler.cc:EraserSizes)
];
export const PEN_SIZES: SizeOption[] = [
{icon: 'pen-size-1', label: 'ink2BrushSizeExtraThin', size: 1},
{icon: 'pen-size-2', label: 'ink2BrushSizeThin', size: 2},
{icon: 'pen-size-3', label: 'ink2BrushSizeMedium', size: 3},
{icon: 'pen-size-4', label: 'ink2BrushSizeThick', size: 6},
{icon: 'pen-size-5', label: 'ink2BrushSizeExtraThick', size: 8},
];
// LINT.ThenChange(//pdf/pdf_ink_metrics_handler.cc:PenAndEraserSizes)
export const HIGHLIGHTER_SIZES: SizeOption[] = [
// LINT.IfChange(HighlighterSizes)
{icon: 'highlighter-size-1', label: 'ink2BrushSizeExtraThin', size: 4},
@ -37,16 +45,6 @@ export const HIGHLIGHTER_SIZES: SizeOption[] = [
// LINT.ThenChange(//pdf/pdf_ink_metrics_handler.cc:HighlighterSizes)
];
export const PEN_SIZES: SizeOption[] = [
// LINT.IfChange(PenSizes)
{icon: 'pen-size-1', label: 'ink2BrushSizeExtraThin', size: 1},
{icon: 'pen-size-2', label: 'ink2BrushSizeThin', size: 2},
{icon: 'pen-size-3', label: 'ink2BrushSizeMedium', size: 3},
{icon: 'pen-size-4', label: 'ink2BrushSizeThick', size: 6},
{icon: 'pen-size-5', label: 'ink2BrushSizeExtraThick', size: 8},
// LINT.ThenChange(//pdf/pdf_ink_metrics_handler.cc:PenSizes)
];
const InkSizeSelectorElementBase = I18nMixinLit(CrLitElement);
export class InkSizeSelectorElement extends InkSizeSelectorElementBase {

6
pdf/pdf_ink_metrics_handler.cc

@ -13,8 +13,7 @@ namespace chrome_pdf {
namespace {
// LINT.IfChange(PenSizes)
// LINT.IfChange(EraserSizes)
// LINT.IfChange(PenAndEraserSizes)
// Pens and erasers share the same sizes.
constexpr auto kPenAndEraserSizes =
base::MakeFixedFlatMap<float, StrokeMetricBrushSize>({
@ -24,8 +23,7 @@ constexpr auto kPenAndEraserSizes =
{6.0f, StrokeMetricBrushSize::kThick},
{8.0f, StrokeMetricBrushSize::kExtraThick},
});
// LINT.ThenChange(//chrome/browser/resources/pdf/elements/ink_size_selector.ts:EraserSizes)
// LINT.ThenChange(//chrome/browser/resources/pdf/elements/ink_size_selector.ts:PenSizes)
// LINT.ThenChange(//chrome/browser/resources/pdf/elements/ink_size_selector.ts:PenAndEraserSizes)
// LINT.IfChange(HighlighterSizes)
constexpr auto kHighlighterSizes =