Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-13 03:24:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge mozilla-central to autoland. CLOSED TREE

Browse Source
This commit is contained in:
Bogdan Szekely 2022-06-08 12:36:05 +03:00
commit 8b28449887
3 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/locales/l10n-changesets.json
View File

@ -1749,7 +1749,7 @@
"win64-aarch64-devedition",
"win64-devedition"
],
"revision": "70c083fd1b4fcc3e77fc88f90f1b69f800d67928"
"revision": "f476ebaec678aa08dab8e5571974b732a703d533"
},
"th": {
"pin": false,

3
gfx/layers/apz/util/ActiveElementManager.cpp
View File

@ -131,7 +131,8 @@ void ActiveElementManager::SetActive(dom::Element* aTarget) {
AEM_LOG("Setting active %p\n", aTarget);
if (nsPresContext* pc = GetPresContextFor(aTarget)) {
pc->EventStateManager()->SetContentState(aTarget, dom::ElementState::ACTIVE);
pc->EventStateManager()->SetContentState(aTarget,
dom::ElementState::ACTIVE);
}
}

29
widget/ScrollbarDrawingCocoa.h
View File

@ -33,20 +33,16 @@ class ScrollbarDrawingCocoa final : public ScrollbarDrawing {
template <typename PaintBackendData>
void DoPaintScrollbarThumb(PaintBackendData&, const LayoutDeviceRect& aRect,
ScrollbarKind, nsIFrame* aFrame,
const ComputedStyle& aStyle,
const ElementState&,
const DocumentState&,
const DPIRatio&);
const ComputedStyle& aStyle, const ElementState&,
const DocumentState&, const DPIRatio&);
bool PaintScrollbarThumb(DrawTarget&, const LayoutDeviceRect&, ScrollbarKind,
nsIFrame*, const ComputedStyle&,
const ElementState&,
nsIFrame*, const ComputedStyle&, const ElementState&,
const DocumentState&, const Colors&,
const DPIRatio&) override;
bool PaintScrollbarThumb(WebRenderBackendData&, const LayoutDeviceRect&,
ScrollbarKind, nsIFrame*, const ComputedStyle&,
const ElementState&,
const DocumentState&, const Colors&,
const DPIRatio&) override;
const ElementState&, const DocumentState&,
const Colors&, const DPIRatio&) override;
template <typename PaintBackendData>
void DoPaintScrollbarTrack(PaintBackendData&, const LayoutDeviceRect&,
@ -54,23 +50,20 @@ class ScrollbarDrawingCocoa final : public ScrollbarDrawing {
const DocumentState&, const DPIRatio&);
bool PaintScrollbarTrack(DrawTarget&, const LayoutDeviceRect& aRect,
ScrollbarKind, nsIFrame* aFrame,
const ComputedStyle& aStyle,
const DocumentState&, const Colors&,
const DPIRatio&) override;
const ComputedStyle& aStyle, const DocumentState&,
const Colors&, const DPIRatio&) override;
bool PaintScrollbarTrack(WebRenderBackendData&, const LayoutDeviceRect& aRect,
ScrollbarKind, nsIFrame* aFrame,
const ComputedStyle& aStyle,
const DocumentState&, const Colors&,
const DPIRatio&) override;
const ComputedStyle& aStyle, const DocumentState&,
const Colors&, const DPIRatio&) override;
template <typename PaintBackendData>
void DoPaintScrollCorner(PaintBackendData&, const LayoutDeviceRect&,
ScrollbarKind, nsIFrame*, const ComputedStyle&,
const DocumentState&, const DPIRatio&);
bool PaintScrollCorner(DrawTarget&, const LayoutDeviceRect&, ScrollbarKind,
nsIFrame*, const ComputedStyle&,
const DocumentState&, const Colors&,
const DPIRatio&) override;
nsIFrame*, const ComputedStyle&, const DocumentState&,
const Colors&, const DPIRatio&) override;
bool PaintScrollCorner(WebRenderBackendData&, const LayoutDeviceRect&,
ScrollbarKind, nsIFrame*, const ComputedStyle&,
const DocumentState&, const Colors&,