yujunjun/playwright
1
0
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2025-06-26 21:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix(tracing): workaround chromium scrollTop slowness" (#23486)

Browse Source 
This commit reverts f6712ec43ae7b5f049311d72372dfd676546e968

I manually ran
https://github.com/microsoft/playwright/issues/14037#issuecomment-1122256514
and made sure that the performance did not regress. ~same.

Fixes https://github.com/microsoft/playwright/issues/23455
This commit is contained in:
Max Schmitt 2023-06-02 23:25:55 +02:00 committed by GitHub
parent 401fc4cb9e
commit 00f662531e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
packages/playwright-core/src/server/trace/recorder/snapshotterInjected.ts
View File

@ -311,28 +311,6 @@ export function frameSnapshotStreamer(snapshotStreamer: string) {
// Ensure we are up to date. // Ensure we are up to date.
this._handleMutations(this._observer.takeRecords()); this._handleMutations(this._observer.takeRecords());
// Restore scroll positions for all ancestors of action target elements
// that will show the highlight/red dot in the trace viewer.
// Workaround for chromium regression:
// https://bugs.chromium.org/p/chromium/issues/detail?id=1324419
// https://github.com/microsoft/playwright/issues/14037
// TODO: remove after chromium is fixed?
const elementsToRestoreScrollPosition = new Set<Node>();
const findElementsToRestoreScrollPositionRecursively = (element: Element) => {
let shouldAdd = '__playwright_target__' in element;
for (let child = element.firstElementChild; child; child = child.nextElementSibling)
shouldAdd = shouldAdd || findElementsToRestoreScrollPositionRecursively(child);
if (element.shadowRoot) {
for (let child = element.shadowRoot.firstElementChild; child; child = child.nextElementSibling)
shouldAdd = shouldAdd || findElementsToRestoreScrollPositionRecursively(child);
}
if (shouldAdd)
elementsToRestoreScrollPosition.add(element);
return shouldAdd;
};
if (document.documentElement)
findElementsToRestoreScrollPositionRecursively(document.documentElement);
const definedCustomElements = new Set<string>(); const definedCustomElements = new Set<string>();
const visitNode = (node: Node | ShadowRoot): { equals: boolean, n: NodeSnapshot } | undefined => { const visitNode = (node: Node | ShadowRoot): { equals: boolean, n: NodeSnapshot } | undefined => {
@ -444,12 +422,12 @@ export function frameSnapshotStreamer(snapshotStreamer: string) {
expectValue(value); expectValue(value);
attrs[kSelectedAttribute] = value; attrs[kSelectedAttribute] = value;
} }
if (elementsToRestoreScrollPosition.has(element) && element.scrollTop) { if (element.scrollTop) {
expectValue(kScrollTopAttribute); expectValue(kScrollTopAttribute);
expectValue(element.scrollTop); expectValue(element.scrollTop);
attrs[kScrollTopAttribute] = '' + element.scrollTop; attrs[kScrollTopAttribute] = '' + element.scrollTop;
} }
if (elementsToRestoreScrollPosition.has(element) && element.scrollLeft) { if (element.scrollLeft) {
expectValue(kScrollLeftAttribute); expectValue(kScrollLeftAttribute);
expectValue(element.scrollLeft); expectValue(element.scrollLeft);
attrs[kScrollLeftAttribute] = '' + element.scrollLeft; attrs[kScrollLeftAttribute] = '' + element.scrollLeft;