diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-04-25 01:44:14 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-04-25 01:44:14 +0200 |
| commit | fe8155c118c4d536c048957156a1473a8595ab8d (patch) | |
| tree | bd7863368d6072ed3ac75126f80a09b11346c3c7 /layout/base/nsPresContext.h | |
| parent | fcfd61829a1edd8519e3965f201f575d70a84239 (diff) | |
| parent | a203f449bbc01f97564b7c5e2272b06a9569d7b4 (diff) | |
| download | UXP-fe8155c118c4d536c048957156a1473a8595ab8d.tar UXP-fe8155c118c4d536c048957156a1473a8595ab8d.tar.gz UXP-fe8155c118c4d536c048957156a1473a8595ab8d.tar.lz UXP-fe8155c118c4d536c048957156a1473a8595ab8d.tar.xz UXP-fe8155c118c4d536c048957156a1473a8595ab8d.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP
Diffstat (limited to 'layout/base/nsPresContext.h')
| -rw-r--r-- | layout/base/nsPresContext.h | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/layout/base/nsPresContext.h b/layout/base/nsPresContext.h index 4fdc60a2e..d8f876291 100644 --- a/layout/base/nsPresContext.h +++ b/layout/base/nsPresContext.h @@ -719,7 +719,18 @@ public: * it was propagated from. */ nsIContent* UpdateViewportScrollbarStylesOverride(); - const ScrollbarStyles& GetViewportScrollbarStylesOverride() + + /** + * Returns the cached result from the last call to + * UpdateViewportScrollbarStylesOverride() -- i.e. return the node + * whose scrollbar styles we have propagated to the viewport (or nullptr if + * there is no such node). + */ + nsIContent* GetViewportScrollbarStylesOverrideNode() const { + return mViewportScrollbarOverrideNode; + } + + const ScrollbarStyles& GetViewportScrollbarStylesOverride() const { return mViewportStyleScrollbar; } @@ -1310,7 +1321,16 @@ protected: nscolor mBodyTextColor; + // This is a non-owning pointer. May be null. If non-null, it's guaranteed + // to be pointing to a node that's still alive, because we'll reset it in + // UpdateViewportScrollbarStylesOverride() as part of the cleanup code + // when this node is removed from the document. (For <body> and the root node, + // this call happens in nsCSSFrameConstructor::ContentRemoved(). For + // fullscreen elements, it happens in the fullscreen-specific cleanup + // invoked by Element::UnbindFromTree().) + nsIContent* MOZ_NON_OWNING_REF mViewportScrollbarOverrideNode; ScrollbarStyles mViewportStyleScrollbar; + uint8_t mFocusRingWidth; bool mExistThrottledUpdates; |