diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2019-10-16 12:44:36 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2019-10-16 12:44:36 -0400 |
| commit | 201635685c6654f5df20bcc91b971dc499accc18 (patch) | |
| tree | 0602b1da4bb0e95bf31e15b8ab509c195090f2f2 | |
| parent | b51ff1f69273f116eb9a1a36043e23d77d2235cb (diff) | |
| parent | 5a6f737e176a074140b4119515d5af108ad1c76f (diff) | |
| download | UXP-201635685c6654f5df20bcc91b971dc499accc18.tar UXP-201635685c6654f5df20bcc91b971dc499accc18.tar.gz UXP-201635685c6654f5df20bcc91b971dc499accc18.tar.lz UXP-201635685c6654f5df20bcc91b971dc499accc18.tar.xz UXP-201635685c6654f5df20bcc91b971dc499accc18.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP
| -rw-r--r-- | js/src/jit/arm/MacroAssembler-arm.cpp | 4 | ||||
| -rw-r--r-- | widget/windows/GfxInfo.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/js/src/jit/arm/MacroAssembler-arm.cpp b/js/src/jit/arm/MacroAssembler-arm.cpp index a4161ab00..3421001f7 100644 --- a/js/src/jit/arm/MacroAssembler-arm.cpp +++ b/js/src/jit/arm/MacroAssembler-arm.cpp @@ -3462,8 +3462,8 @@ MacroAssemblerARMCompat::storePayload(const Value& val, const Address& dest) ScratchRegisterScope scratch(asMasm()); SecondScratchRegisterScope scratch2(asMasm()); - if (val.isMarkable()) - ma_mov(ImmGCPtr(val.toMarkablePointer()), scratch); + if (val.isGCThing()) + ma_mov(ImmGCPtr(val.toGCThing()), scratch); else ma_mov(Imm32(val.toNunboxPayload()), scratch); ma_str(scratch, ToPayload(dest), scratch2); diff --git a/widget/windows/GfxInfo.cpp b/widget/windows/GfxInfo.cpp index c62f5873e..6f3c5313f 100644 --- a/widget/windows/GfxInfo.cpp +++ b/widget/windows/GfxInfo.cpp @@ -329,7 +329,7 @@ GfxInfo::Init() // Unfortunately, the Device ID is nullptr, and we can't enumerate // it using the setup infrastructure (SetupDiGetClassDevsW below // will return INVALID_HANDLE_VALUE). - if (mWindowsVersion == kWindows8 && + if (mWindowsVersion >= kWindows8 && mDeviceID.Length() == 0 && mDeviceString.EqualsLiteral("RDPUDD Chained DD")) { |