PDF Viewer cleanup: Use the Point typedef in more places.

Move Point from viewport.js to constants.js and re-use in
open_pdf_params_parser.js and gesture_detector.js.

Bug: None
Change-Id: I743e6653055dc760f3f63472ffa7a4e8f2ee6bda
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2322170
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Auto-Submit: dpapad <dpapad@chromium.org>
Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#792464}

chrome/browser/resources/pdf/BUILD.gn

@@ -48,7 +48,10 @@ js_library("constants") {
 }
 
 js_library("gesture_detector") {
-  deps = [ "//ui/webui/resources/js/cr:event_target.m" ]
+  deps = [
+    ":constants",
+    "//ui/webui/resources/js/cr:event_target.m",
+  ]
 }
 
 js_library("open_pdf_params_parser") {
@@ -153,7 +156,6 @@ js_library("pdf_viewer") {
     ":pdf_viewer_base",
     ":pdf_viewer_utils",
     ":toolbar_manager",
-    ":viewport",
     "elements:viewer-error-screen",
     "elements:viewer-password-screen",
     "elements:viewer-pdf-toolbar",

chrome/browser/resources/pdf/constants.js

@@ -32,3 +32,6 @@ export const SaveRequestType = {
   ORIGINAL: 1,
   EDITED: 2,
 };
+
+/** @typedef {{x: number, y: number}} */
+export let Point;

chrome/browser/resources/pdf/controller.js

@@ -7,8 +7,8 @@ import {NativeEventTarget as EventTarget} from 'chrome://resources/js/cr/event_t
 import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
 import {PromiseResolver} from 'chrome://resources/js/promise_resolver.m.js';
 
-import {SaveRequestType} from './constants.js';
-import {PartialPoint, Point, Viewport} from './viewport.js';
+import {Point, SaveRequestType} from './constants.js';
+import {PartialPoint, Viewport} from './viewport.js';
 
 /** @typedef {{type: string, messageId: (string|undefined)}} */
 export let MessageData;

chrome/browser/resources/pdf/gesture_detector.js

@@ -3,10 +3,11 @@
 // found in the LICENSE file.
 
 import {NativeEventTarget as EventTarget} from 'chrome://resources/js/cr/event_target.m.js';
+import {Point} from './constants.js';
 
 /**
  * @typedef {{
- *   center: !{x: number, y: number},
+ *   center: !Point,
  *   direction: (string|undefined),
  *   scaleRatio: (?number|undefined),
  *   startScaleRatio: (?number|undefined),
@@ -249,7 +250,7 @@ export class GestureDetector {
   /**
    * Computes the midpoint between fingers.
    * @param {!TouchEvent} event Touch event with at least 2 touch points.
-   * @return {!{x: number, y: number}} Midpoint between touch[0] and touch[1].
+   * @return {!Point} Midpoint between touch[0] and touch[1].
    * @private
    */
   static center_(event) {

chrome/browser/resources/pdf/open_pdf_params_parser.js

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {FittingType} from './constants.js';
+import {FittingType, Point} from './constants.js';
 
 /**
  * @typedef {{
  *   url: (string|undefined),
  *   zoom: (number|undefined),
  *   view: (!FittingType|undefined),
- *   viewPosition: ({x: number, y: number}|undefined)
+ *   viewPosition: (!Point|undefined)
  * }}
  */
 let OpenPdfParams;

chrome/browser/resources/pdf/pdf_viewer.js

@@ -20,7 +20,7 @@ import {html} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.
 
 import {Bookmark} from './bookmark_type.js';
 import {BrowserApi} from './browser_api.js';
-import {FittingType, SaveRequestType, TwoUpViewAction} from './constants.js';
+import {FittingType, Point, SaveRequestType, TwoUpViewAction} from './constants.js';
 import {ViewerPdfToolbarNewElement} from './elements/viewer-pdf-toolbar-new.js';
 // <if expr="chromeos">
 import {InkController} from './ink_controller.js';
@@ -32,7 +32,6 @@ import {DeserializeKeyEvent, LoadState, SerializeKeyEvent} from './pdf_scripting
 import {PDFViewerBaseElement} from './pdf_viewer_base.js';
 import {DestinationMessageData, DocumentDimensionsMessageData, shouldIgnoreKeyEvents} from './pdf_viewer_utils.js';
 import {ToolbarManager} from './toolbar_manager.js';
-import {Point} from './viewport.js';
 
 
 /**

chrome/browser/resources/pdf/pdf_viewer_base.js

@@ -9,13 +9,13 @@ import {PromiseResolver} from 'chrome://resources/js/promise_resolver.m.js';
 import {html, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {BrowserApi} from './browser_api.js';
-import {FittingType} from './constants.js';
+import {FittingType, Point} from './constants.js';
 import {ContentController, MessageData, PluginController} from './controller.js';
 import {PDFMetrics} from './metrics.js';
 import {OpenPdfParamsParser} from './open_pdf_params_parser.js';
 import {LoadState} from './pdf_scripting_api.js';
 import {DocumentDimensionsMessageData, MessageObject} from './pdf_viewer_utils.js';
-import {Point, Viewport} from './viewport.js';
+import {Viewport} from './viewport.js';
 import {ViewportScroller} from './viewport_scroller.js';
 import {ZoomManager} from './zoom_manager.js';
 

chrome/browser/resources/pdf/viewport.js

@@ -6,7 +6,7 @@ import {assert} from 'chrome://resources/js/assert.m.js';
 import {EventTracker} from 'chrome://resources/js/event_tracker.m.js';
 import {$, hasKeyModifiers} from 'chrome://resources/js/util.m.js';
 
-import {FittingType} from './constants.js';
+import {FittingType, Point} from './constants.js';
 import {GestureDetector, PinchEventDetail} from './gesture_detector.js';
 import {InactiveZoomManager, ZoomManager} from './zoom_manager.js';
 
@@ -28,9 +28,6 @@ let DocumentDimensions;
  */
 export let LayoutOptions;
 
-/** @typedef {{x: number, y: number}} */
-export let Point;
-
 /** @typedef {{x: (number|undefined), y: (number|undefined)}} */
 export let PartialPoint;