diff options
| author | New Tobin Paradigm <email@mattatobin.com> | 2020-05-01 18:03:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-01 18:03:44 -0400 |
| commit | 2375e5ebe9bc7ae4135e9d81e345d62dcc244305 (patch) | |
| tree | 50fe1caf6e895e67497a20347f2bd7dcf7888108 /layout/base/nsPresShell.cpp | |
| parent | f1f9fdabf129e15b8fd5be7d93f61533617fed2e (diff) | |
| parent | 0c175b93cfe4e4bb1e399c35c9e0259b43a2dab8 (diff) | |
| download | UXP-2375e5ebe9bc7ae4135e9d81e345d62dcc244305.tar UXP-2375e5ebe9bc7ae4135e9d81e345d62dcc244305.tar.gz UXP-2375e5ebe9bc7ae4135e9d81e345d62dcc244305.tar.lz UXP-2375e5ebe9bc7ae4135e9d81e345d62dcc244305.tar.xz UXP-2375e5ebe9bc7ae4135e9d81e345d62dcc244305.zip | |
Merge pull request #1526 from MoonchildProductions/deunify_layout
De-unify layout
Diffstat (limited to 'layout/base/nsPresShell.cpp')
| -rw-r--r-- | layout/base/nsPresShell.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp index bd5125637..8b469185f 100644 --- a/layout/base/nsPresShell.cpp +++ b/layout/base/nsPresShell.cpp @@ -58,6 +58,7 @@ #include "nsNameSpaceManager.h" // for Pref-related rule management (bugs 22963,20760,31816) #include "nsFrame.h" #include "FrameLayerBuilder.h" +#include "FrameMetrics.h" // for ViewID #include "nsViewManager.h" #include "nsView.h" #include "nsCRTGlue.h" @@ -162,11 +163,12 @@ #endif -#include "mozilla/layers/CompositorBridgeChild.h" #include "GeckoProfiler.h" #include "gfxPlatform.h" #include "Layers.h" #include "LayerTreeInvalidation.h" +#include "ClientLayerManager.h" +#include "mozilla/layers/CompositorBridgeChild.h" #include "mozilla/css/ImageLoader.h" #include "mozilla/dom/DocumentTimeline.h" #include "mozilla/Preferences.h" @@ -221,6 +223,8 @@ using namespace mozilla::gfx; using namespace mozilla::layout; using PaintFrameFlags = nsLayoutUtils::PaintFrameFlags; +typedef FrameMetrics::ViewID ViewID; + CapturingContentInfo nsIPresShell::gCaptureInfo = { false /* mAllowed */, false /* mPointerLock */, false /* mRetargetToElement */, false /* mPreventDrag */ }; |