Skip to content

GitLab

T
tangled
Commit 601571f8 authored by dpapad's avatar dpapad Committed by Commit Bot
Browse files
Options

Cleanup: Rename cr_png_behavior.js to png.js 

The latter is a better name for the contents of that file, as it
is no longer a Polymer behavior. Also re-running clang-format.

Bug: None
Change-Id: I1e638271b5d973c426d392ee3fc9dbd7e0114bea
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2107055
Commit-Queue: dpapad <dpapad@chromium.org>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#751160}
parent f2c6fed5
Show whitespace changes
Inline Side-by-side
Showing with 147 additions and 150 deletions
chrome/browser/resources/settings/chromeos/os_people_page/BUILD.gn
View file @ 601571f8
......@@ -138,7 +138,7 @@ js_library("os_people_page") {
"//chrome/browser/resources/settings/people_page:signout_dialog",
"//chrome/browser/resources/settings/people_page:sync_browser_proxy",
"//ui/webui/resources/cr_components/chromeos/quick_unlock:lock_screen_constants",
"//ui/webui/resources/cr_elements/chromeos/cr_picture:cr_png_behavior",
"//ui/webui/resources/cr_elements/chromeos/cr_picture:png",
"//ui/webui/resources/js:assert",
"//ui/webui/resources/js:i18n_behavior",
"//ui/webui/resources/js:icon",
......
chrome/browser/resources/settings/chromeos/os_people_page/os_people_page.html
View file @ 601571f8
<link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/cr_elements/chromeos/cr_picture/cr_png_behavior.html">
<link rel="import" href="chrome://resources/cr_elements/chromeos/cr_picture/png.html">
<link rel="import" href="chrome://resources/cr_elements/cr_icon_button/cr_icon_button.html">
<link rel="import" href="chrome://resources/cr_elements/cr_link_row/cr_link_row.html">
<link rel="import" href="chrome://resources/cr_elements/icons.html">
......
chrome/browser/resources/settings/chromeos/personalization_page/BUILD.gn
View file @ 601571f8
......@@ -21,7 +21,7 @@ js_library("change_picture") {
"//ui/webui/resources/cr_elements/chromeos/cr_picture:cr_picture_list",
"//ui/webui/resources/cr_elements/chromeos/cr_picture:cr_picture_pane",
"//ui/webui/resources/cr_elements/chromeos/cr_picture:cr_picture_types",
"//ui/webui/resources/cr_elements/chromeos/cr_picture:cr_png_behavior",
"//ui/webui/resources/cr_elements/chromeos/cr_picture:png",
"//ui/webui/resources/js:i18n_behavior",
"//ui/webui/resources/js:load_time_data",
"//ui/webui/resources/js:util",
......
chrome/browser/resources/settings/chromeos/personalization_page/change_picture.html
View file @ 601571f8
......@@ -3,7 +3,7 @@
<link rel="import" href="chrome://resources/cr_elements/chromeos/cr_picture/cr_picture_list.html">
<link rel="import" href="chrome://resources/cr_elements/chromeos/cr_picture/cr_picture_pane.html">
<link rel="import" href="chrome://resources/cr_elements/chromeos/cr_picture/cr_picture_types.html">
<link rel="import" href="chrome://resources/cr_elements/chromeos/cr_picture/cr_png_behavior.html">
<link rel="import" href="chrome://resources/cr_elements/chromeos/cr_picture/png.html">
<link rel="import" href="chrome://resources/html/i18n_behavior.html">
<link rel="import" href="chrome://resources/html/util.html">
<link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
......
chrome/browser/resources/settings/people_page/BUILD.gn
View file @ 601571f8
......@@ -69,7 +69,7 @@ js_library("people_page") {
"..:router",
"../settings_page:settings_animated_pages",
"//ui/webui/resources/cr_components/chromeos/quick_unlock:lock_screen_constants",
"//ui/webui/resources/cr_elements/chromeos/cr_picture:cr_png_behavior",
"//ui/webui/resources/cr_elements/chromeos/cr_picture:png",
"//ui/webui/resources/cr_elements/cr_toast:cr_toast",
"//ui/webui/resources/js:assert",
"//ui/webui/resources/js:i18n_behavior",
......
chrome/browser/resources/settings/people_page/people_page.html
View file @ 601571f8
......@@ -30,7 +30,7 @@
<if expr="chromeos">
<link rel="import" href="account_manager_browser_proxy.html">
<link rel="import" href="chrome://resources/cr_elements/chromeos/cr_picture/cr_png_behavior.html">
<link rel="import" href="chrome://resources/cr_elements/chromeos/cr_picture/png.html">
</if>
<if expr="not chromeos">
<link rel="import" href="import_data_dialog.html">
......
ui/webui/resources/cr_elements/chromeos/cr_picture/BUILD.gn
View file @ 601571f8
......@@ -10,18 +10,18 @@ js_type_check("closure_compile") {
":cr_picture_list",
":cr_picture_pane",
":cr_picture_types",
":cr_png_behavior",
":png",
]
}
js_library("cr_camera") {
deps = [ ":cr_png_behavior" ]
deps = [ ":png" ]
}
js_library("cr_picture_list") {
deps = [
":cr_picture_types",
":cr_png_behavior",
":png",
"//third_party/polymer/v1_0/components-chromium/iron-selector:iron-selector-extracted",
"//ui/webui/resources/js:assert",
]
......@@ -31,13 +31,13 @@ js_library("cr_picture_pane") {
deps = [
":cr_camera",
":cr_picture_types",
":cr_png_behavior",
":png",
]
}
js_library("cr_picture_types") {
}
js_library("cr_png_behavior") {
js_library("png") {
deps = [ "//ui/webui/resources/js:cr" ]
}
ui/webui/resources/cr_elements/chromeos/cr_picture/cr_camera.html
View file @ 601571f8
......@@ -4,7 +4,7 @@
<link rel="import" href="../../cr_icon_button/cr_icon_button.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-keys/iron-a11y-keys.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spinner-lite.html">
<link rel="import" href="cr_png_behavior.html">
<link rel="import" href="png.html">
<link rel="import" href="icons.html">
<dom-module id="cr-camera">
......
ui/webui/resources/cr_elements/chromeos/cr_picture/cr_picture_list.html
View file @ 601571f8
......@@ -6,7 +6,7 @@
<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-selector/iron-selector.html">
<link rel="import" href="cr_picture_types.html">
<link rel="import" href="cr_png_behavior.html">
<link rel="import" href="png.html">
<dom-module id="cr-picture-list">
<template>
......
ui/webui/resources/cr_elements/chromeos/cr_picture/cr_picture_pane.html
View file @ 601571f8
......@@ -4,7 +4,7 @@
<link rel="import" href="../../cr_icon_button/cr_icon_button.html">
<link rel="import" href="cr_camera.html">
<link rel="import" href="cr_picture_types.html">
<link rel="import" href="cr_png_behavior.html">
<link rel="import" href="png.html">
<dom-module id="cr-picture-pane">
<template>
......
ui/webui/resources/cr_elements/chromeos/cr_picture/cr_png_behavior.html → ui/webui/resources/cr_elements/chromeos/cr_picture/png.html
View file @ 601571f8
<link rel="import" href="../../../html/cr.html">
<script src="cr_png_behavior.js"></script>
<script src="png.js"></script>
ui/webui/resources/cr_elements/chromeos/cr_picture/cr_png_behavior.js → ui/webui/resources/cr_elements/chromeos/cr_picture/png.js
View file @ 601571f8
......@@ -3,56 +3,56 @@
// found in the LICENSE file.
cr.define('cr.png', function() {
/**
/**
* @fileoverview
* 'CrPngBehavior' is a behavior to convert image sequences into APNG (animated
* PNG) images.
* 'CrPngBehavior' is a behavior to convert image sequences into APNG
* (animated PNG) images.
*/
/**
/**
* PNG frame delay fraction numerator.
* @const
*/
const PNG_FRAME_DELAY_NUMERATOR = 1;
const PNG_FRAME_DELAY_NUMERATOR = 1;
/**
/**
* PNG frame delay fraction denominator.
* @const
*/
const PNG_FRAME_DELAY_DENOMINATOR = 20;
const PNG_FRAME_DELAY_DENOMINATOR = 20;
/**
/**
* PNG signature.
* @const
*/
const PNG_SIGNATURE = [0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A];
const PNG_SIGNATURE = [0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A];
/**
/**
* PNG bit depth (8 = 32bpp).
* @const
*/
const PNG_BIT_DEPTH = 8;
const PNG_BIT_DEPTH = 8;
/**
/**
* PNG compression method (0 = deflate/inflate compression with a sliding
* window PNG compression).
* @const
*/
const PNG_COMPRESSION_METHOD = 0;
const PNG_COMPRESSION_METHOD = 0;
/**
/**
* PNG filter method (0 = adaptive filtering with five basic filter types).
* @const
*/
const PNG_FILTER_METHOD = 0;
const PNG_FILTER_METHOD = 0;
/**
/**
* PNG interlace method (0 = no interlace).
* @const
*/
const PNG_INTERLACE_METHOD = 0;
const PNG_INTERLACE_METHOD = 0;
/**
/**
* CRC table for PNG encode.
*
* Generated using:
......@@ -70,7 +70,7 @@ const PNG_INTERLACE_METHOD = 0;
*
* @const
*/
const PNG_CRC_TABLE = [
const PNG_CRC_TABLE = [
0x0, 0x77073096, 0xEE0E612C, 0x990951BA, 0x76DC419, 0x706AF48F,
0xE963A535, 0x9E6495A3, 0xEDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
0x9B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, 0x1DB71064, 0x6AB020F2,
......@@ -114,9 +114,9 @@ const PNG_CRC_TABLE = [
0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693,
0x54DE5729, 0x23D967BF, 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
];
];
/**
/**
* PNG object state.
* @typedef {{
* frames: number,
......@@ -127,7 +127,7 @@ const PNG_CRC_TABLE = [
* chunks: !Array<Uint8Array>
* }}
*/
let CrPngState;
let CrPngState;
/**
* Returns a data URL for an animated PNG image that is created
......@@ -463,8 +463,7 @@ let CrPngState;
writeUInt32(IDAT, length, 0);
writeFourCC(IDAT, 'IDAT', 4);
writeBytes(IDAT, chunk, 8);
writeUInt32(
IDAT, getCRC(IDAT, 4, 8 + length), 8 + length);
writeUInt32(IDAT, getCRC(IDAT, 4, 8 + length), 8 + length);
png.chunks.push(IDAT);
} else {
/**
......@@ -478,8 +477,7 @@ let CrPngState;
writeFourCC(fdAT, 'fdAT', 4);
writeUInt32(fdAT, png.sequences, 8);
writeBytes(fdAT, chunk, 12);
writeUInt32(
fdAT, getCRC(fdAT, 4, 12 + length), 12 + length);
writeUInt32(fdAT, getCRC(fdAT, 4, 12 + length), 12 + length);
png.sequences += 1;
png.chunks.push(fdAT);
}
......@@ -494,8 +492,7 @@ let CrPngState;
writeUInt32(PLTE, length, 0);
writeFourCC(PLTE, 'PLTE', 4);
writeBytes(PLTE, chunk, 8);
writeUInt32(
PLTE, getCRC(PLTE, 4, 8 + length), 8 + length);
writeUInt32(PLTE, getCRC(PLTE, 4, 8 + length), 8 + length);
png.chunks.push(PLTE);
break;
case 'IEND':
......
ui/webui/resources/cr_elements_resources.grdp
View file @ 601571f8
......@@ -207,12 +207,12 @@
file="cr_elements/chromeos/cr_picture/cr_picture_types.js"
type="chrome_html"
compress="gzip" />
<structure name="IDR_CR_ELEMENTS_CHROMEOS_CR_PICTURE_CR_PNG_BEHAVIOR_HTML"
file="cr_elements/chromeos/cr_picture/cr_png_behavior.html"
<structure name="IDR_CR_ELEMENTS_CHROMEOS_CR_PICTURE_PNG_HTML"
file="cr_elements/chromeos/cr_picture/png.html"
type="chrome_html"
compress="gzip" />
<structure name="IDR_CR_ELEMENTS_CHROMEOS_CR_PICTURE_CR_PNG_BEHAVIOR_JS"
file="cr_elements/chromeos/cr_picture/cr_png_behavior.js"
<structure name="IDR_CR_ELEMENTS_CHROMEOS_CR_PICTURE_PNG_JS"
file="cr_elements/chromeos/cr_picture/png.js"
type="chrome_html"
compress="gzip" />
<structure name="IDR_CR_ELEMENTS_CHROMEOS_CR_PICTURE_ICONS_HTML"
......
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