Bug 1379280 - Move FocusTarget include from nsIPresShell to PresShell. r=smaug
authorRyan Hunt <rhunt@eqrion.net>
Thu, 13 Jul 2017 13:00:21 -0500
changeset 418449 5b0d1fdf2d20b75caf46d07af956ba5251674359
parent 418448 6d68d842f601c310626d2ccedab94b38da321b72
child 418450 24dc2160940436a8d5bfcf2a591c7936df0f00ee
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs1379280
milestone56.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1379280 - Move FocusTarget include from nsIPresShell to PresShell. r=smaug FocusTarget used to be needed in nsIPresShell, but it was moved to PresShell. MozReview-Commit-ID: HQFpT9OJaUz
layout/base/PresShell.h
layout/base/nsIPresShell.h
--- a/layout/base/PresShell.h
+++ b/layout/base/PresShell.h
@@ -19,16 +19,17 @@
 /* a presentation of a document, part 2 */
 
 #ifndef mozilla_PresShell_h
 #define mozilla_PresShell_h
 
 #include "MobileViewportManager.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/EventForwards.h"
+#include "mozilla/layers/FocusTarget.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/StyleSetHandle.h"
 #include "mozilla/UniquePtr.h"
 #include "nsAutoPtr.h"
 #include "nsContentUtils.h" // For AddScriptBlocker().
 #include "nsCRT.h"
 #include "nsIObserver.h"
 #include "nsIPresShell.h"
@@ -80,16 +81,19 @@ typedef nsClassHashtable<nsUint64HashKey
 #endif
 
 class PresShell final : public nsIPresShell,
                         public nsStubDocumentObserver,
                         public nsISelectionController,
                         public nsIObserver,
                         public nsSupportsWeakReference
 {
+protected:
+  typedef mozilla::layers::FocusTarget FocusTarget;
+
 public:
   PresShell();
 
   // nsISupports
   NS_DECL_ISUPPORTS
 
   static bool AccessibleCaretEnabled(nsIDocShell* aDocShell);
 
--- a/layout/base/nsIPresShell.h
+++ b/layout/base/nsIPresShell.h
@@ -18,17 +18,16 @@
 /* a presentation of a document, part 2 */
 
 #ifndef nsIPresShell_h___
 #define nsIPresShell_h___
 
 #include "mozilla/ArenaObjectID.h"
 #include "mozilla/EventForwards.h"
 #include "mozilla/FlushType.h"
-#include "mozilla/layers/FocusTarget.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/StyleSetHandle.h"
 #include "mozilla/StyleSheet.h"
 #include "mozilla/WeakPtr.h"
 #include "gfxPoint.h"
 #include "nsTHashtable.h"
 #include "nsHashKeys.h"
@@ -176,17 +175,16 @@ enum nsRectVisibility {
  */
 
 class nsIPresShell : public nsISupports
 {
 public:
   NS_DECLARE_STATIC_IID_ACCESSOR(NS_IPRESSHELL_IID)
 
 protected:
-  typedef mozilla::layers::FocusTarget FocusTarget;
   typedef mozilla::layers::LayerManager LayerManager;
   typedef mozilla::gfx::SourceSurface SourceSurface;
 
   enum eRenderFlag {
     STATE_IGNORING_VIEWPORT_SCROLLING = 0x1,
     STATE_DRAWWINDOW_NOT_FLUSHING = 0x2
   };
   typedef uint8_t RenderFlags; // for storing the above flags