Skip to content

Commit aff1438

Browse files
Remove caching of sizing attributes for runtimeChecks (#581)
1 parent ea5b5fc commit aff1438

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

src/features/runtime-checks.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* global TrustedScriptURL, TrustedScript */
22

33
import ContentFeature from '../content-feature.js'
4-
import { DDGProxy, getStackTraceOrigins, getStack, matchHostname, injectGlobalStyles, createStyleElement, postDebugMessage, taintSymbol, hasTaintedMethod, taintedOrigins, getTabHostname } from '../utils.js'
4+
import { DDGProxy, getStackTraceOrigins, getStack, matchHostname, injectGlobalStyles, createStyleElement, postDebugMessage, taintSymbol, hasTaintedMethod, taintedOrigins, getTabHostname, isBeingFramed } from '../utils.js'
55
import { defineProperty } from '../wrapper-utils.js'
66
import { wrapScriptCodeOverload } from './runtime-checks/script-overload.js'
77
import { findClosestBreakpoint } from './runtime-checks/helpers.js'
@@ -604,6 +604,7 @@ export default class RuntimeChecks extends ContentFeature {
604604
['innerHeight', 'innerWidth', 'outerHeight', 'outerWidth', 'Screen.prototype.height', 'Screen.prototype.width'].forEach(sizing => {
605605
if (sizing in genericOverloads) {
606606
const sizingConfig = genericOverloads[sizing]
607+
if (isBeingFramed() && !sizingConfig.applyToFrames) return
607608
this.overloadScreenSizes(sizingConfig, breakpoints, screenSize, sizing, sizingConfig.offset || 0)
608609
}
609610
})
@@ -791,9 +792,14 @@ export default class RuntimeChecks extends ContentFeature {
791792
receiver = globalThis.screen
792793
break
793794
}
794-
const defaultVal = Reflect.get(scope, overrideKey, receiver)
795+
const defaultGetter = Object.getOwnPropertyDescriptor(scope, overrideKey)?.get
796+
// Should never happen
797+
if (!defaultGetter) {
798+
return
799+
}
795800
defineProperty(scope, overrideKey, {
796801
get () {
802+
const defaultVal = Reflect.apply(defaultGetter, receiver, [])
797803
if (getTaintFromScope(this, arguments, config.stackCheck)) {
798804
return returnVal
799805
}

0 commit comments

Comments
 (0)