Skip to content

Remove caching of sizing attributes for runtimeChecks #581

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 19, 2023
Merged

Remove caching of sizing attributes for runtimeChecks #581

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/features/runtime-checks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* global TrustedScriptURL, TrustedScript */

import ContentFeature from '../content-feature.js'
import { DDGProxy, getStackTraceOrigins, getStack, matchHostname, injectGlobalStyles, createStyleElement, postDebugMessage, taintSymbol, hasTaintedMethod, taintedOrigins, getTabHostname } from '../utils.js'
import { DDGProxy, getStackTraceOrigins, getStack, matchHostname, injectGlobalStyles, createStyleElement, postDebugMessage, taintSymbol, hasTaintedMethod, taintedOrigins, getTabHostname, isBeingFramed } from '../utils.js'
import { defineProperty } from '../wrapper-utils.js'
import { wrapScriptCodeOverload } from './runtime-checks/script-overload.js'
import { findClosestBreakpoint } from './runtime-checks/helpers.js'
Expand Down Expand Up @@ -604,6 +604,7 @@ export default class RuntimeChecks extends ContentFeature {
['innerHeight', 'innerWidth', 'outerHeight', 'outerWidth', 'Screen.prototype.height', 'Screen.prototype.width'].forEach(sizing => {
if (sizing in genericOverloads) {
const sizingConfig = genericOverloads[sizing]
if (isBeingFramed() && !sizingConfig.applyToFrames) return
this.overloadScreenSizes(sizingConfig, breakpoints, screenSize, sizing, sizingConfig.offset || 0)
}
})
Expand Down Expand Up @@ -791,9 +792,14 @@ export default class RuntimeChecks extends ContentFeature {
receiver = globalThis.screen
break
}
const defaultVal = Reflect.get(scope, overrideKey, receiver)
const defaultGetter = Object.getOwnPropertyDescriptor(scope, overrideKey)?.get
// Should never happen
if (!defaultGetter) {
return
}
defineProperty(scope, overrideKey, {
get () {
const defaultVal = Reflect.apply(defaultGetter, receiver, [])
if (getTaintFromScope(this, arguments, config.stackCheck)) {
return returnVal
}
Expand Down