diff options
author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-03-06 12:30:20 +0100 |
---|---|---|
committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-03-06 12:30:20 +0100 |
commit | e25ad543952b5afc13181aaebef9c5951fc27be0 (patch) | |
tree | 456a1359b3e5f810319edd423dd5cc5a1e22ada5 /docshell/base/timeline/TimelineConsumers.h | |
parent | 74533a843277c3687c749989ed1522354d1054d2 (diff) | |
parent | 5dba1ebe8498286762873fff0016f35f3e14d2d5 (diff) | |
download | UXP-2019.03.08.tar UXP-2019.03.08.tar.gz UXP-2019.03.08.tar.lz UXP-2019.03.08.tar.xz UXP-2019.03.08.zip |
Merge branch 'master' into Basilisk-releasev2019.03.08
Diffstat (limited to 'docshell/base/timeline/TimelineConsumers.h')
-rw-r--r-- | docshell/base/timeline/TimelineConsumers.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/docshell/base/timeline/TimelineConsumers.h b/docshell/base/timeline/TimelineConsumers.h index 04099e1b9..2a77b83ac 100644 --- a/docshell/base/timeline/TimelineConsumers.h +++ b/docshell/base/timeline/TimelineConsumers.h @@ -7,11 +7,14 @@ #define mozilla_TimelineConsumers_h_ #include "nsIObserver.h" +#include "nsIDocShell.h" #include "mozilla/StaticPtr.h" #include "mozilla/UniquePtr.h" #include "mozilla/LinkedList.h" #include "mozilla/StaticMutex.h" #include "TimelineMarkerEnums.h" // for MarkerTracingType +#include "mozilla/dom/ProfileTimelineMarkerBinding.h" +#include "nsTArray.h" class nsDocShell; class nsIDocShell; |