From 6c89f160e8213da6633e77dca3d6a7fa7c144bfe Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Mon, 14 Feb 2022 11:32:18 -0700 Subject: [PATCH] fix(highlight): drive-by fixes to selector highlight (#12083) --- packages/playwright-core/src/server/frames.ts | 2 +- .../playwright-core/src/server/injected/injectedScript.ts | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/playwright-core/src/server/frames.ts b/packages/playwright-core/src/server/frames.ts index 3bbecd73df..cdd0420e7a 100644 --- a/packages/playwright-core/src/server/frames.ts +++ b/packages/playwright-core/src/server/frames.ts @@ -1144,7 +1144,7 @@ export class Frame extends SdkObject { const pair = await this.resolveFrameForSelectorNoWait(selector); if (!pair) return; - const context = await this._utilityContext(); + const context = await pair.frame._utilityContext(); const injectedScript = await context.injectedScript(); return await injectedScript.evaluate((injected, { parsed }) => { return injected.highlight(parsed); diff --git a/packages/playwright-core/src/server/injected/injectedScript.ts b/packages/playwright-core/src/server/injected/injectedScript.ts index 715b7d38a2..a2ad0c1cec 100644 --- a/packages/playwright-core/src/server/injected/injectedScript.ts +++ b/packages/playwright-core/src/server/injected/injectedScript.ts @@ -882,8 +882,9 @@ export class InjectedScript { } _runHighlightOnRaf(selector: ParsedSelector) { - if (this._highlight) - this._highlight.updateHighlight(this.querySelectorAll(selector, document.documentElement), stringifySelector(selector), false); + if (!this._highlight) + return; + this._highlight.updateHighlight(this.querySelectorAll(selector, document.documentElement), stringifySelector(selector), false); requestAnimationFrame(() => this._runHighlightOnRaf(selector)); }