Clean up "unseasoned" PDF Viewer references
Since the PPAPI-based PDF Viewer replacement has fully launched, it is no longer necessary to refer to the replacement as the "unseasoned" PDF Viewer. It is now the sole PDF Viewer implementation. Change-Id: I24a145c5f0065fc47b24414f625b3f3fc84dde3b Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4894461 Reviewed-by: Andy Phan <andyphan@chromium.org> Reviewed-by: James Maclean <wjmaclean@chromium.org> Commit-Queue: James Maclean <wjmaclean@chromium.org> Auto-Submit: Lei Zhang <thestig@chromium.org> Cr-Commit-Position: refs/heads/main@{#1211610}
This commit is contained in:
Lei Zhang
committed by
Chromium LUCI CQ
Chromium LUCI CQ
parent
f4d06763bd
commit
9352376cb0
chrome/test/data/pdf
extensions/browser/guest_view/mime_handler_view
pdf/pdfium
@@ -160,7 +160,7 @@ export class MockDocumentDimensions implements DocumentDimensions {
|
||||
}
|
||||
}
|
||||
|
||||
export class MockUnseasonedPdfPluginElement extends HTMLEmbedElement {
|
||||
export class MockPdfPluginElement extends HTMLEmbedElement {
|
||||
private messages_: any[] = [];
|
||||
|
||||
get messages(): any[] {
|
||||
@@ -180,16 +180,14 @@ export class MockUnseasonedPdfPluginElement extends HTMLEmbedElement {
|
||||
}
|
||||
}
|
||||
customElements.define(
|
||||
'mock-unseasoned-pdf-plugin', MockUnseasonedPdfPluginElement,
|
||||
{extends: 'embed'});
|
||||
'mock-pdf-plugin', MockPdfPluginElement, {extends: 'embed'});
|
||||
|
||||
/**
|
||||
* Creates a fake element simulating the unseasoned PDF plugin.
|
||||
* Creates a fake element simulating the PDF plugin.
|
||||
*/
|
||||
export function createMockUnseasonedPdfPluginForTest():
|
||||
MockUnseasonedPdfPluginElement {
|
||||
return document.createElement('embed', {is: 'mock-unseasoned-pdf-plugin'}) as
|
||||
MockUnseasonedPdfPluginElement;
|
||||
export function createMockPdfPluginForTest(): MockPdfPluginElement {
|
||||
return document.createElement('embed', {is: 'mock-pdf-plugin'}) as
|
||||
MockPdfPluginElement;
|
||||
}
|
||||
|
||||
class TestBookmarksElement extends PolymerElement {
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
import {FittingType, PAGE_SHADOW, Point, Rect, SwipeDirection, Viewport} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/pdf_viewer_wrapper.js';
|
||||
import {isMac} from 'chrome://resources/js/platform.js';
|
||||
|
||||
import {createMockUnseasonedPdfPluginForTest, getZoomableViewport, MockDocumentDimensions, MockElement, MockSizer, MockUnseasonedPdfPluginElement, MockViewportChangedCallback} from './test_util.js';
|
||||
import {createMockPdfPluginForTest, getZoomableViewport, MockDocumentDimensions, MockElement, MockPdfPluginElement, MockSizer, MockViewportChangedCallback} from './test_util.js';
|
||||
|
||||
const SCROLLBAR_WIDTH: number = 15;
|
||||
|
||||
@@ -21,7 +21,7 @@ class ScrollEventCounter {
|
||||
* Simulates acknowledgements to all "syncScrollToRemote" messages.
|
||||
*/
|
||||
function ackAllScrollToRemoteMessages(
|
||||
viewport: Viewport, plugin: MockUnseasonedPdfPluginElement) {
|
||||
viewport: Viewport, plugin: MockPdfPluginElement) {
|
||||
for (const message of plugin.messages) {
|
||||
if (message.type === 'syncScrollToRemote') {
|
||||
viewport.ackScrollToRemote(message);
|
||||
@@ -67,7 +67,7 @@ const tests = [
|
||||
function testOverlayScrollbarWidth_remote() {
|
||||
const viewport = getZoomableViewport(
|
||||
new MockElement(100, 100, null), new MockSizer(), 43, 1);
|
||||
viewport.setRemoteContent(createMockUnseasonedPdfPluginForTest());
|
||||
viewport.setRemoteContent(createMockPdfPluginForTest());
|
||||
|
||||
chrome.test.assertEq(isMac ? 16 : 43, viewport.overlayScrollbarWidth);
|
||||
chrome.test.succeed();
|
||||
@@ -1752,7 +1752,7 @@ const tests = [
|
||||
const mockSizer = new MockSizer();
|
||||
const viewport =
|
||||
getZoomableViewport(new MockElement(100, 100, null), mockSizer, 0, 1);
|
||||
viewport.setRemoteContent(createMockUnseasonedPdfPluginForTest());
|
||||
viewport.setRemoteContent(createMockPdfPluginForTest());
|
||||
|
||||
const dummyPlugin = document.body.querySelector('#plugin');
|
||||
viewport.setContent(dummyPlugin);
|
||||
@@ -1765,7 +1765,7 @@ const tests = [
|
||||
const mockSizer = new MockSizer();
|
||||
const viewport =
|
||||
getZoomableViewport(new MockElement(100, 100, null), mockSizer, 0, 1);
|
||||
viewport.setRemoteContent(createMockUnseasonedPdfPluginForTest());
|
||||
viewport.setRemoteContent(createMockPdfPluginForTest());
|
||||
viewport.setDocumentDimensions(new MockDocumentDimensions(20, 30));
|
||||
chrome.test.assertEq('0px', mockSizer.style.width);
|
||||
chrome.test.assertEq('0px', mockSizer.style.height);
|
||||
@@ -1781,7 +1781,7 @@ const tests = [
|
||||
function testSetContent_scrollToLocal() {
|
||||
const mockWindow = new MockElement(100, 100, null);
|
||||
const viewport = getZoomableViewport(mockWindow, new MockSizer(), 0, 1);
|
||||
viewport.setRemoteContent(createMockUnseasonedPdfPluginForTest());
|
||||
viewport.setRemoteContent(createMockPdfPluginForTest());
|
||||
viewport.setDocumentDimensions(new MockDocumentDimensions(200, 200));
|
||||
viewport.setZoom(1);
|
||||
viewport.setPosition({x: 20, y: 30});
|
||||
@@ -1800,7 +1800,7 @@ const tests = [
|
||||
const viewport = getZoomableViewport(
|
||||
new MockElement(100, 100, null), new MockSizer(), 0, 1);
|
||||
|
||||
const mockPlugin = createMockUnseasonedPdfPluginForTest();
|
||||
const mockPlugin = createMockPdfPluginForTest();
|
||||
viewport.setRemoteContent(mockPlugin);
|
||||
|
||||
const dummyContent = document.body.querySelector('div');
|
||||
@@ -1813,7 +1813,7 @@ const tests = [
|
||||
const viewport =
|
||||
getZoomableViewport(new MockElement(100, 100, null), mockSizer, 0, 1);
|
||||
|
||||
viewport.setRemoteContent(createMockUnseasonedPdfPluginForTest());
|
||||
viewport.setRemoteContent(createMockPdfPluginForTest());
|
||||
|
||||
chrome.test.assertEq('none', mockSizer.style.display);
|
||||
chrome.test.succeed();
|
||||
@@ -1824,7 +1824,7 @@ const tests = [
|
||||
new MockElement(100, 100, null), new MockSizer(), 0, 1);
|
||||
viewport.setDocumentDimensions(new MockDocumentDimensions(20, 30));
|
||||
|
||||
const mockPlugin = createMockUnseasonedPdfPluginForTest();
|
||||
const mockPlugin = createMockPdfPluginForTest();
|
||||
viewport.setRemoteContent(mockPlugin);
|
||||
|
||||
const {width, height} = mockPlugin.findMessage('updateSize');
|
||||
@@ -1840,7 +1840,7 @@ const tests = [
|
||||
viewport.setZoom(1);
|
||||
viewport.setPosition({x: 20, y: 30});
|
||||
|
||||
const mockPlugin = createMockUnseasonedPdfPluginForTest();
|
||||
const mockPlugin = createMockPdfPluginForTest();
|
||||
viewport.setRemoteContent(mockPlugin);
|
||||
|
||||
const {x, y} = mockPlugin.findMessage('syncScrollToRemote');
|
||||
@@ -1852,7 +1852,7 @@ const tests = [
|
||||
function testSetDocumentDimensions_remote() {
|
||||
const viewport = getZoomableViewport(
|
||||
new MockElement(100, 100, null), new MockSizer(), 0, 1);
|
||||
const mockPlugin = createMockUnseasonedPdfPluginForTest();
|
||||
const mockPlugin = createMockPdfPluginForTest();
|
||||
viewport.setRemoteContent(mockPlugin);
|
||||
mockPlugin.clearMessages();
|
||||
|
||||
@@ -1869,7 +1869,7 @@ const tests = [
|
||||
function testSetPosition_remote() {
|
||||
const viewport = getZoomableViewport(
|
||||
new MockElement(100, 100, null), new MockSizer(), 0, 1);
|
||||
const mockPlugin = createMockUnseasonedPdfPluginForTest();
|
||||
const mockPlugin = createMockPdfPluginForTest();
|
||||
viewport.setRemoteContent(mockPlugin);
|
||||
viewport.setDocumentDimensions(new MockDocumentDimensions(200, 200));
|
||||
viewport.setZoom(1);
|
||||
@@ -1888,7 +1888,7 @@ const tests = [
|
||||
function testSetPosition_remote_modifiedByAck() {
|
||||
const viewport = getZoomableViewport(
|
||||
new MockElement(100, 100, null), new MockSizer(), 0, 1);
|
||||
const mockPlugin = createMockUnseasonedPdfPluginForTest();
|
||||
const mockPlugin = createMockPdfPluginForTest();
|
||||
viewport.setRemoteContent(mockPlugin);
|
||||
viewport.setDocumentDimensions(new MockDocumentDimensions(200, 200));
|
||||
viewport.setZoom(1);
|
||||
@@ -1907,7 +1907,7 @@ const tests = [
|
||||
function testSetPosition_remote_modifiedByAck_ignoreOverlapping() {
|
||||
const viewport = getZoomableViewport(
|
||||
new MockElement(100, 100, null), new MockSizer(), 0, 1);
|
||||
const mockPlugin = createMockUnseasonedPdfPluginForTest();
|
||||
const mockPlugin = createMockPdfPluginForTest();
|
||||
viewport.setRemoteContent(mockPlugin);
|
||||
viewport.setDocumentDimensions(new MockDocumentDimensions(200, 200));
|
||||
viewport.setZoom(1);
|
||||
@@ -1927,7 +1927,7 @@ const tests = [
|
||||
function testSetPosition_remote_modifiedByAck_multiple() {
|
||||
const viewport = getZoomableViewport(
|
||||
new MockElement(100, 100, null), new MockSizer(), 0, 1);
|
||||
const mockPlugin = createMockUnseasonedPdfPluginForTest();
|
||||
const mockPlugin = createMockPdfPluginForTest();
|
||||
viewport.setRemoteContent(mockPlugin);
|
||||
viewport.setDocumentDimensions(new MockDocumentDimensions(200, 200));
|
||||
viewport.setZoom(1);
|
||||
@@ -1948,7 +1948,7 @@ const tests = [
|
||||
function testSetPosition_remote_NaN() {
|
||||
const viewport = getZoomableViewport(
|
||||
new MockElement(100, 100, null), new MockSizer(), 0, 1);
|
||||
viewport.setRemoteContent(createMockUnseasonedPdfPluginForTest());
|
||||
viewport.setRemoteContent(createMockPdfPluginForTest());
|
||||
|
||||
viewport.setPosition({x: NaN, y: NaN});
|
||||
|
||||
@@ -1960,7 +1960,7 @@ const tests = [
|
||||
function testSetPosition_remote_underflow_leftAndTop() {
|
||||
const viewport = getZoomableViewport(
|
||||
new MockElement(100, 100, null), new MockSizer(), SCROLLBAR_WIDTH, 1);
|
||||
viewport.setRemoteContent(createMockUnseasonedPdfPluginForTest());
|
||||
viewport.setRemoteContent(createMockPdfPluginForTest());
|
||||
viewport.setDocumentDimensions(new MockDocumentDimensions(200, 200));
|
||||
viewport.setZoom(1);
|
||||
|
||||
@@ -1976,7 +1976,7 @@ const tests = [
|
||||
mockWindow.dir = 'rtl';
|
||||
const viewport =
|
||||
getZoomableViewport(mockWindow, new MockSizer(), SCROLLBAR_WIDTH, 1);
|
||||
viewport.setRemoteContent(createMockUnseasonedPdfPluginForTest());
|
||||
viewport.setRemoteContent(createMockPdfPluginForTest());
|
||||
viewport.setDocumentDimensions(new MockDocumentDimensions(200, 200));
|
||||
viewport.setZoom(1);
|
||||
|
||||
@@ -1990,7 +1990,7 @@ const tests = [
|
||||
function testSetPosition_remote_overflow_rightAndBottom() {
|
||||
const viewport = getZoomableViewport(
|
||||
new MockElement(100, 100, null), new MockSizer(), SCROLLBAR_WIDTH, 1);
|
||||
viewport.setRemoteContent(createMockUnseasonedPdfPluginForTest());
|
||||
viewport.setRemoteContent(createMockPdfPluginForTest());
|
||||
viewport.setDocumentDimensions(new MockDocumentDimensions(200, 300));
|
||||
viewport.setZoom(1);
|
||||
|
||||
@@ -2006,7 +2006,7 @@ const tests = [
|
||||
mockWindow.dir = 'rtl';
|
||||
const viewport =
|
||||
getZoomableViewport(mockWindow, new MockSizer(), SCROLLBAR_WIDTH, 1);
|
||||
viewport.setRemoteContent(createMockUnseasonedPdfPluginForTest());
|
||||
viewport.setRemoteContent(createMockPdfPluginForTest());
|
||||
viewport.setDocumentDimensions(new MockDocumentDimensions(200, 300));
|
||||
viewport.setZoom(1);
|
||||
|
||||
@@ -2020,7 +2020,7 @@ const tests = [
|
||||
function testSetPosition_remote_overflowWithoutVerticalScrollbar_right() {
|
||||
const viewport = getZoomableViewport(
|
||||
new MockElement(100, 100, null), new MockSizer(), SCROLLBAR_WIDTH, 1);
|
||||
viewport.setRemoteContent(createMockUnseasonedPdfPluginForTest());
|
||||
viewport.setRemoteContent(createMockPdfPluginForTest());
|
||||
viewport.setDocumentDimensions(new MockDocumentDimensions(200, 85));
|
||||
viewport.setZoom(1);
|
||||
|
||||
@@ -2036,7 +2036,7 @@ const tests = [
|
||||
mockWindow.dir = 'rtl';
|
||||
const viewport =
|
||||
getZoomableViewport(mockWindow, new MockSizer(), SCROLLBAR_WIDTH, 1);
|
||||
viewport.setRemoteContent(createMockUnseasonedPdfPluginForTest());
|
||||
viewport.setRemoteContent(createMockPdfPluginForTest());
|
||||
viewport.setDocumentDimensions(new MockDocumentDimensions(200, 85));
|
||||
viewport.setZoom(1);
|
||||
|
||||
@@ -2050,7 +2050,7 @@ const tests = [
|
||||
function testSetPosition_remote_overflowWithoutHorizontalScrollbar_bottom() {
|
||||
const viewport = getZoomableViewport(
|
||||
new MockElement(100, 100, null), new MockSizer(), SCROLLBAR_WIDTH, 1);
|
||||
viewport.setRemoteContent(createMockUnseasonedPdfPluginForTest());
|
||||
viewport.setRemoteContent(createMockPdfPluginForTest());
|
||||
viewport.setDocumentDimensions(new MockDocumentDimensions(85, 300));
|
||||
viewport.setZoom(1);
|
||||
|
||||
@@ -2064,7 +2064,7 @@ const tests = [
|
||||
function testSyncScrollFromRemote() {
|
||||
const viewport = getZoomableViewport(
|
||||
new MockElement(100, 100, null), new MockSizer(), 0, 1);
|
||||
const mockPlugin = createMockUnseasonedPdfPluginForTest();
|
||||
const mockPlugin = createMockPdfPluginForTest();
|
||||
viewport.setRemoteContent(mockPlugin);
|
||||
ackAllScrollToRemoteMessages(viewport, mockPlugin);
|
||||
|
||||
@@ -2080,7 +2080,7 @@ const tests = [
|
||||
function testSyncScrollFromRemote_duplicateScroll() {
|
||||
const viewport = getZoomableViewport(
|
||||
new MockElement(100, 100, null), new MockSizer(), 0, 1);
|
||||
const mockPlugin = createMockUnseasonedPdfPluginForTest();
|
||||
const mockPlugin = createMockPdfPluginForTest();
|
||||
viewport.setRemoteContent(mockPlugin);
|
||||
ackAllScrollToRemoteMessages(viewport, mockPlugin);
|
||||
viewport.syncScrollFromRemote({x: 30, y: 20});
|
||||
@@ -2097,7 +2097,7 @@ const tests = [
|
||||
function testSyncScrollFromRemote_scrollToRemoteUnacked() {
|
||||
const viewport = getZoomableViewport(
|
||||
new MockElement(100, 100, null), new MockSizer(), 0, 1);
|
||||
const mockPlugin = createMockUnseasonedPdfPluginForTest();
|
||||
const mockPlugin = createMockPdfPluginForTest();
|
||||
viewport.setRemoteContent(mockPlugin);
|
||||
chrome.test.assertTrue(!!mockPlugin.findMessage('syncScrollToRemote'));
|
||||
|
||||
|
||||
@@ -450,7 +450,7 @@ void MimeHandlerViewGuest::ReadyToCommitNavigation(
|
||||
const GURL& url = navigation_handle->GetURL();
|
||||
if (url.SchemeIs(kExtensionScheme) &&
|
||||
url.host_piece() == extension_misc::kPdfExtensionId) {
|
||||
// The unseasoned PDF viewer will navigate to the stream URL (using
|
||||
// The PDF viewer will navigate to the stream URL (using
|
||||
// PdfNavigtionThrottle), rather than using it as a subresource.
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -246,8 +246,8 @@ bool IsV8Initialized() {
|
||||
|
||||
void SetUpV8() {
|
||||
if (!gin::IsolateHolder::Initialized()) {
|
||||
// TODO(crbug.com/1111024): V8 flags for the Unseasoned Viewer need to be
|
||||
// set up as soon as the renderer process is created in the constructor of
|
||||
// TODO(crbug.com/1111024): V8 flags for the PDF Viewer need to be set up as
|
||||
// soon as the renderer process is created in the constructor of
|
||||
// `content::RenderProcessImpl`.
|
||||
const char* recommended = FPDF_GetRecommendedV8Flags();
|
||||
v8::V8::SetFlagsFromString(recommended, strlen(recommended));
|
||||
|
||||
Reference in New Issue
Block a user