Bug 1183223 - Create a markers directory temporarily inside docshell/base where all marker logic should go into, r=smaug
authorVictor Porof <vporof@mozilla.com>
Fri, 17 Jul 2015 15:51:19 -0400
changeset 253545 12c6b2a7799fca37dcc7e4e6da0942a0308191d3
parent 253544 5826ab3dc275962f3ed64a765051258ff3cacbb7
child 253546 40bf29309bf5debf45ec79038b077fc228575d12
push id29070
push userttaubert@mozilla.com
push dateMon, 20 Jul 2015 07:15:19 +0000
treeherdermozilla-central@202e9233d130 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs1183223
milestone42.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 1183223 - Create a markers directory temporarily inside docshell/base where all marker logic should go into, r=smaug
docshell/base/AutoTimelineMarker.cpp
docshell/base/AutoTimelineMarker.h
docshell/base/TimelineMarker.cpp
docshell/base/TimelineMarker.h
docshell/base/moz.build
docshell/base/nsDocShell.h
docshell/base/timeline/AutoTimelineMarker.cpp
docshell/base/timeline/AutoTimelineMarker.h
docshell/base/timeline/TimelineMarker.cpp
docshell/base/timeline/TimelineMarker.h
docshell/base/timeline/moz.build
--- a/docshell/base/moz.build
+++ b/docshell/base/moz.build
@@ -1,14 +1,18 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+DIRS += [
+    'timeline',
+]
+
 XPIDL_SOURCES += [
     'nsCDefaultURIFixup.idl',
     'nsIClipboardCommands.idl',
     'nsIContentViewer.idl',
     'nsIContentViewerContainer.idl',
     'nsIContentViewerEdit.idl',
     'nsIContentViewerFile.idl',
     'nsIDocCharset.idl',
@@ -37,36 +41,33 @@ EXPORTS += [
     'nsDocShellLoadTypes.h',
     'nsILinkHandler.h',
     'nsIScrollObserver.h',
     'nsIWebShellServices.h',
     'SerializedLoadContext.h',
 ]
 
 EXPORTS.mozilla += [
-    'AutoTimelineMarker.h',
     'IHistory.h',
     'LoadContext.h',
 ]
 
 UNIFIED_SOURCES += [
-    'AutoTimelineMarker.cpp',
     'LoadContext.cpp',
     'nsAboutRedirector.cpp',
     'nsDefaultURIFixup.cpp',
     'nsDocShell.cpp',
     'nsDocShellEditorData.cpp',
     'nsDocShellEnumerator.cpp',
     'nsDocShellLoadInfo.cpp',
     'nsDocShellTransferableHooks.cpp',
     'nsDownloadHistory.cpp',
     'nsDSURIContentListener.cpp',
     'nsWebNavigationInfo.cpp',
     'SerializedLoadContext.cpp',
-    'TimelineMarker.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
--- a/docshell/base/nsDocShell.h
+++ b/docshell/base/nsDocShell.h
@@ -28,17 +28,17 @@
 
 // Helper Classes
 #include "nsCOMPtr.h"
 #include "nsPoint.h" // mCurrent/mDefaultScrollbarPreferences
 #include "nsString.h"
 #include "nsAutoPtr.h"
 #include "nsThreadUtils.h"
 #include "nsContentUtils.h"
-#include "TimelineMarker.h"
+#include "timeline/TimelineMarker.h"
 
 // Threshold value in ms for META refresh based redirects
 #define REFRESH_REDIRECT_TIMER 15000
 
 // Interfaces Needed
 #include "nsIDocCharset.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsIRefreshURI.h"
rename from docshell/base/AutoTimelineMarker.cpp
rename to docshell/base/timeline/AutoTimelineMarker.cpp
rename from docshell/base/AutoTimelineMarker.h
rename to docshell/base/timeline/AutoTimelineMarker.h
rename from docshell/base/TimelineMarker.cpp
rename to docshell/base/timeline/TimelineMarker.cpp
rename from docshell/base/TimelineMarker.h
rename to docshell/base/timeline/TimelineMarker.h
new file mode 100644
--- /dev/null
+++ b/docshell/base/timeline/moz.build
@@ -0,0 +1,22 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+EXPORTS.mozilla += [
+    'AutoTimelineMarker.h',
+]
+
+UNIFIED_SOURCES += [
+    'AutoTimelineMarker.cpp',
+    'TimelineMarker.cpp',
+]
+
+FAIL_ON_WARNINGS = True
+
+FINAL_LIBRARY = 'xul'
+
+LOCAL_INCLUDES += [
+    '/docshell/base'
+]