Bug 888323 - Stop including prtime.h in nsrootidl.idl. r=ehsan

2013-07-03 02:08:01 +09:00 · 2013-07-03 02:08:01 +09:00 · c9b73ddb89
--- a/content/events/src/DOMWheelEvent.cpp
+++ b/content/events/src/DOMWheelEvent.cpp
@ -8,6 +8,7 @@
 #include "nsGUIEvent.h"
 #include "nsIContent.h"
 #include "nsContentUtils.h"
+#include "prtime.h"

 namespace mozilla {
 namespace dom {
--- a/content/events/src/nsDOMAnimationEvent.cpp
+++ b/content/events/src/nsDOMAnimationEvent.cpp
@ -5,6 +5,7 @@

 #include "nsDOMAnimationEvent.h"
 #include "nsGUIEvent.h"
+#include "prtime.h"

 nsDOMAnimationEvent::nsDOMAnimationEvent(mozilla::dom::EventTarget* aOwner,
                                         nsPresContext *aPresContext,
--- a/content/events/src/nsDOMCommandEvent.cpp
+++ b/content/events/src/nsDOMCommandEvent.cpp
@ -4,6 +4,7 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 #include "nsDOMCommandEvent.h"
+#include "prtime.h"

 nsDOMCommandEvent::nsDOMCommandEvent(mozilla::dom::EventTarget* aOwner,
                                     nsPresContext* aPresContext,
--- a/content/events/src/nsDOMCompositionEvent.cpp
+++ b/content/events/src/nsDOMCompositionEvent.cpp
@ -5,6 +5,7 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 #include "nsDOMCompositionEvent.h"
+#include "prtime.h"

 nsDOMCompositionEvent::nsDOMCompositionEvent(mozilla::dom::EventTarget* aOwner,
                                             nsPresContext* aPresContext,
--- a/content/events/src/nsDOMFocusEvent.cpp
+++ b/content/events/src/nsDOMFocusEvent.cpp
@ -4,6 +4,7 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 #include "nsDOMFocusEvent.h"
+#include "prtime.h"

 using namespace mozilla;
 using namespace mozilla::dom;
--- a/content/events/src/nsDOMKeyboardEvent.cpp
+++ b/content/events/src/nsDOMKeyboardEvent.cpp
@ -4,6 +4,7 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 #include "nsDOMKeyboardEvent.h"
+#include "prtime.h"

 nsDOMKeyboardEvent::nsDOMKeyboardEvent(mozilla::dom::EventTarget* aOwner,
                                       nsPresContext* aPresContext,
--- a/content/events/src/nsDOMMouseEvent.cpp
+++ b/content/events/src/nsDOMMouseEvent.cpp
@ -7,6 +7,7 @@
 #include "nsGUIEvent.h"
 #include "nsIContent.h"
 #include "nsContentUtils.h"
+#include "prtime.h"

 using namespace mozilla;

--- a/content/events/src/nsDOMMouseScrollEvent.cpp
+++ b/content/events/src/nsDOMMouseScrollEvent.cpp
@ -4,6 +4,7 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 #include "nsDOMMouseScrollEvent.h"
+#include "prtime.h"

 nsDOMMouseScrollEvent::nsDOMMouseScrollEvent(mozilla::dom::EventTarget* aOwner,
                                             nsPresContext* aPresContext,
--- a/content/events/src/nsDOMSimpleGestureEvent.cpp
+++ b/content/events/src/nsDOMSimpleGestureEvent.cpp
@ -4,6 +4,7 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 #include "nsDOMSimpleGestureEvent.h"
+#include "prtime.h"

 nsDOMSimpleGestureEvent::nsDOMSimpleGestureEvent(mozilla::dom::EventTarget* aOwner,
                                                 nsPresContext* aPresContext,
--- a/content/events/src/nsDOMTextEvent.cpp
+++ b/content/events/src/nsDOMTextEvent.cpp
@ -6,6 +6,7 @@

 #include "nsDOMTextEvent.h"
 #include "nsPrivateTextRange.h"
+#include "prtime.h"

 nsDOMTextEvent::nsDOMTextEvent(mozilla::dom::EventTarget* aOwner,
                               nsPresContext* aPresContext,
--- a/content/events/src/nsDOMTransitionEvent.cpp
+++ b/content/events/src/nsDOMTransitionEvent.cpp
@ -5,6 +5,7 @@

 #include "nsDOMTransitionEvent.h"
 #include "nsGUIEvent.h"
+#include "prtime.h"

 nsDOMTransitionEvent::nsDOMTransitionEvent(mozilla::dom::EventTarget* aOwner,
                                           nsPresContext *aPresContext,
--- a/content/events/src/nsDOMUIEvent.cpp
+++ b/content/events/src/nsDOMUIEvent.cpp
@ -18,6 +18,7 @@
 #include "nsIScrollableFrame.h"
 #include "mozilla/Util.h"
 #include "mozilla/Assertions.h"
+#include "prtime.h"

 using namespace mozilla;

--- a/content/events/src/nsDOMXULCommandEvent.cpp
+++ b/content/events/src/nsDOMXULCommandEvent.cpp
@ -5,6 +5,7 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 #include "nsDOMXULCommandEvent.h"
+#include "prtime.h"

 nsDOMXULCommandEvent::nsDOMXULCommandEvent(mozilla::dom::EventTarget* aOwner,
                                           nsPresContext* aPresContext,
--- a/content/media/ogg/OggWriter.cpp
+++ b/content/media/ogg/OggWriter.cpp
@ -3,6 +3,7 @@
 * 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/. */
 #include "OggWriter.h"
+#include "prtime.h"

 #undef LOG
 #ifdef MOZ_WIDGET_GONK
--- a/content/svg/content/src/SVGAnimationElement.cpp
+++ b/content/svg/content/src/SVGAnimationElement.cpp
@ -9,6 +9,7 @@
 #include "nsSMILAnimationController.h"
 #include "nsSMILAnimationFunction.h"
 #include "nsContentUtils.h"
+#include "prtime.h"

 namespace mozilla {
 namespace dom {
--- a/content/svg/content/src/SVGSVGElement.cpp
+++ b/content/svg/content/src/SVGSVGElement.cpp
@ -37,6 +37,7 @@
 #include "nsSMILTypes.h"
 #include "SVGAngle.h"
 #include <algorithm>
+#include "prtime.h"

 NS_IMPL_NS_NEW_NAMESPACED_SVG_ELEMENT_CHECK_PARSER(SVG)

--- a/content/svg/content/src/SVGZoomEvent.cpp
+++ b/content/svg/content/src/SVGZoomEvent.cpp
@ -9,6 +9,7 @@
 #include "nsIPresShell.h"
 #include "nsIDocument.h"
 #include "mozilla/dom/Element.h"
+#include "prtime.h"

 namespace mozilla {
 namespace dom {
--- a/docshell/base/nsDocShell.h
+++ b/docshell/base/nsDocShell.h
@ -76,6 +76,7 @@
 #include "nsIClipboardCommands.h"
 #include "nsICommandManager.h"
 #include "nsCRT.h"
+#include "prtime.h"

 namespace mozilla {
 namespace dom {
--- a/dom/base/nsDOMNavigationTiming.cpp
+++ b/dom/base/nsDOMNavigationTiming.cpp
@ -5,11 +5,11 @@

 #include "nsDOMNavigationTiming.h"
 #include "nsCOMPtr.h"
-#include "nscore.h"
-#include "TimeStamp.h"
 #include "nsContentUtils.h"
-
 #include "nsIScriptSecurityManager.h"
+#include "nscore.h"
+#include "prtime.h"
+#include "TimeStamp.h"

 nsDOMNavigationTiming::nsDOMNavigationTiming()
 {
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@ -14,6 +14,7 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/Likely.h"
+#include "mozilla/LookAndFeel.h"
 #include "mozilla/Util.h"

 #include "nsRuleNode.h"
@ -40,8 +41,7 @@
 #include "nsPrintfCString.h"
 #include "nsRenderingContext.h"
 #include "nsStyleUtil.h"
-
-#include "mozilla/LookAndFeel.h"
+#include "prtime.h"

 #if defined(_MSC_VER) || defined(__MINGW32__)
 #include <malloc.h>
--- a/layout/xul/base/src/nsListBoxBodyFrame.cpp
+++ b/layout/xul/base/src/nsListBoxBodyFrame.cpp
@ -34,6 +34,7 @@
 #include "nsContentUtils.h"
 #include "ChildIterator.h"
 #include "nsRenderingContext.h"
+#include "prtime.h"
 #include <algorithm>

 #ifdef ACCESSIBILITY
--- a/modules/libjar/zipwriter/src/nsZipHeader.cpp
+++ b/modules/libjar/zipwriter/src/nsZipHeader.cpp
@ -6,6 +6,7 @@
 #include "StreamFunctions.h"
 #include "nsZipHeader.h"
 #include "nsMemory.h"
+#include "prtime.h"

 #define ZIP_FILE_HEADER_SIGNATURE 0x04034b50
 #define ZIP_FILE_HEADER_SIZE 30
--- a/rdf/tests/rdfpoll/rdfpoll.cpp
+++ b/rdf/tests/rdfpoll/rdfpoll.cpp
@ -37,6 +37,7 @@
 #include "plstr.h"
 #include "nsEmbedString.h"
 #include "nsNetCID.h"
+#include "prtime.h"

 ////////////////////////////////////////////////////////////////////////
 // CIDs
--- a/security/manager/boot/src/nsStrictTransportSecurityService.h
+++ b/security/manager/boot/src/nsStrictTransportSecurityService.h
@ -17,6 +17,7 @@
 #include "nsIURI.h"
 #include "nsString.h"
 #include "nsTHashtable.h"
+#include "prtime.h"

 // {16955eee-6c48-4152-9309-c42a465138a1}
 #define NS_STRICT_TRANSPORT_SECURITY_CID \
--- a/toolkit/components/places/nsNavBookmarks.h
+++ b/toolkit/components/places/nsNavBookmarks.h
@ -15,6 +15,7 @@
 #include "nsTHashtable.h"
 #include "nsWeakReference.h"
 #include "mozilla/Attributes.h"
+#include "prtime.h"

 class nsNavBookmarks;
 class nsIOutputStream;
--- a/widget/xpwidgets/nsIdleService.cpp
+++ b/widget/xpwidgets/nsIdleService.cpp
@ -13,6 +13,7 @@
 #include "nsCOMArray.h"
 #include "prinrval.h"
 #include "prlog.h"
+#include "prtime.h"
 #include "mozilla/Services.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Telemetry.h"
--- a/xpcom/base/nsrootidl.idl
+++ b/xpcom/base/nsrootidl.idl
@ -10,7 +10,7 @@
 %{C++

 #include "nscore.h"
-#include "prtime.h"
+typedef int64_t PRTime;

 /*
 * Forward declarations for new string types
--- a/xpcom/glue/nsISupportsUtils.h
+++ b/xpcom/glue/nsISupportsUtils.h
@ -82,10 +82,10 @@ ns_if_addref( T expr )
 * @param _ptr The interface pointer.
 */
 #define NS_RELEASE(_ptr)                                                      \
-  PR_BEGIN_MACRO                                                              \
+  do {                                                                        \
    (_ptr)->Release();                                                        \
    (_ptr) = 0;                                                               \
-  PR_END_MACRO
+  } while (0)

 /**
 * Macro for releasing a reference to this interface.
@ -103,22 +103,22 @@ ns_if_addref( T expr )
 * @param _rc  The reference count.
 */
 #define NS_RELEASE2(_ptr, _rc)                                                \
-  PR_BEGIN_MACRO                                                              \
+  do {                                                                        \
    _rc = (_ptr)->Release();                                                  \
    if (0 == (_rc)) (_ptr) = 0;                                               \
-  PR_END_MACRO
+  } while (0)

 /**
 * Macro for releasing a reference to an interface that checks for NULL;
 * @param _ptr The interface pointer.
 */
 #define NS_IF_RELEASE(_ptr)                                                   \
-  PR_BEGIN_MACRO                                                              \
+  do {                                                                        \
    if (_ptr) {                                                               \
      (_ptr)->Release();                                                      \
      (_ptr) = 0;                                                             \
    }                                                                         \
-  PR_END_MACRO
+  } while (0)

 /*
 * Often you have to cast an implementation pointer, e.g., |this|, to an