Backed out 2 changesets (bug 579517)
authorEhsan Akhgari <ehsan@mozilla.com>
Thu, 25 Oct 2012 12:32:24 -0400
changeset 119348 6f9d1e6b22c0189e842b99855159f43493943cf1
parent 119347 6376bf9b9cc6a4dec8e9b154daa57e54213dac3a
child 119349 a09013468b3e29632d45edc4da0072f39e176767
push id1997
push userakeybl@mozilla.com
push dateMon, 07 Jan 2013 21:25:26 +0000
treeherdermozilla-beta@4baf45cdcf21 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs579517
milestone19.0a1
backs out5298adc7096310534bd9572f648a4164326a1078
86ccf7c918ce6392d8d5eb20acb05fdcf6936c11
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
Backed out 2 changesets (bug 579517) Backed out changeset 5298adc70963 Backed out changeset 86ccf7c918ce (bug 579517)
accessible/public/nsIAccessibleEvent.idl
content/base/public/nsIImageLoadingContent.idl
content/base/public/nsISelection.idl
content/base/public/nsISelectionController.idl
content/base/public/nsIXMLHttpRequest.idl
content/base/src/nsDOMMutationObserver.h
content/xtf/public/nsIXTFAttributeHandler.idl
docshell/base/nsIDocShellTreeItem.idl
dom/interfaces/events/nsIDOMEventTarget.idl
dom/ipc/PBrowser.ipdl
editor/composer/public/nsIEditingSession.idl
editor/idl/nsIContentFilter.idl
editor/idl/nsIEditor.idl
editor/idl/nsIHTMLEditor.idl
editor/txmgr/idl/nsITransactionListener.idl
embedding/browser/webBrowser/nsIPrintPreviewNavigation.idl
embedding/browser/webBrowser/nsITooltipTextProvider.idl
embedding/browser/webBrowser/nsIWebBrowserSetup.idl
intl/uconv/idl/nsIUTF8ConverterService.idl
ipc/chromium/src/base/crypto/signature_verifier_nss.cc
ipc/chromium/src/base/hmac_nss.cc
ipc/chromium/src/base/nss_init.cc
ipc/chromium/src/base/pr_time_unittest.cc
ipc/chromium/src/base/time.cc
js/xpconnect/idl/nsIXPCScriptable.idl
layout/base/nsFrameTraversal.cpp
layout/base/nsFrameTraversal.h
layout/base/nsIFrameTraversal.h
media/mtransport/dtlsidentity.cpp
media/mtransport/nr_socket_prsock.cpp
media/mtransport/nricectx.cpp
media/mtransport/transportlayerdtls.cpp
media/webrtc/signaling/src/media-conduit/AudioConduit.cpp
media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
media/webrtc/signaling/src/media/VcmSIPCCBinding.cpp
media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp
media/webrtc/signaling/src/mediapipeline/SrtpFlow.cpp
media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
media/webrtc/signaling/test/FakeMediaStreamsImpl.h
modules/libmar/verify/cryptox.h
netwerk/cache/nsDiskCacheStreams.cpp
netwerk/mime/nsIMIMEInfo.idl
netwerk/protocol/file/nsFileChannel.cpp
netwerk/protocol/http/nsIHttpAuthenticableChannel.idl
security/manager/ssl/src/SSLServerCertVerification.cpp
toolkit/components/places/AsyncFaviconHelpers.h
toolkit/identity/IdentityCryptoService.cpp
toolkit/xre/nsAppRunner.cpp
toolkit/xre/nsINativeAppSupport.idl
tools/trace-malloc/lib/nsTraceMalloc.h
tools/trace-malloc/spacetrace.h
widget/cocoa/TextInputHandler.mm
widget/nsIAppShell.idl
xpcom/components/nsIFactory.idl
xpcom/components/nsIModule.idl
xpcom/ds/nsISimpleEnumerator.idl
xpcom/ds/nsISupportsArray.idl
xpcom/io/nsIFile.idl
xpcom/threads/nsIEnvironment.idl
xpfe/appshell/public/nsIWindowMediator.idl
xpfe/appshell/public/nsIXULWindow.idl
--- a/accessible/public/nsIAccessibleEvent.idl
+++ b/accessible/public/nsIAccessibleEvent.idl
@@ -18,17 +18,17 @@ interface nsIDOMNode;
  * by in-process accessibility clients, which can be used
  * to find out how to get accessibility and DOM interfaces for
  * the event and its target. To listen to in-process accessibility invents,
  * make your object an nsIObserver, and listen for accessible-event by 
  * using code something like this:
  *   nsCOMPtr<nsIObserverService> observerService = 
  *     do_GetService("@mozilla.org/observer-service;1", &rv);
  *   if (NS_SUCCEEDED(rv)) 
- *     rv = observerService->AddObserver(this, "accessible-event", true);
+ *     rv = observerService->AddObserver(this, "accessible-event", PR_TRUE);
  */
 [scriptable, uuid(7f66a33a-9ed7-4fd4-87a8-e431b0f43368)]
 interface nsIAccessibleEvent : nsISupports
 {
   /**
    * An object has been created.
    */
   const unsigned long EVENT_SHOW = 0x0001;
--- a/content/base/public/nsIImageLoadingContent.idl
+++ b/content/base/public/nsIImageLoadingContent.idl
@@ -146,14 +146,14 @@ interface nsIImageLoadingContent : imgIN
   /**
    * forceReload forces reloading of the image pointed to by currentURI
    *
    * @throws NS_ERROR_NOT_AVAILABLE if there is no current URI to reload
    */
   void forceReload();
 
   /**
-   * Enables/disables image state forcing. When |aForce| is true, we force
+   * Enables/disables image state forcing. When |aForce| is PR_TRUE, we force
    * nsImageLoadingContent::ImageState() to return |aState|. Call again with |aForce|
-   * as false to revert ImageState() to its original behaviour.
+   * as PR_FALSE to revert ImageState() to its original behaviour.
    */
   void forceImageState(in boolean aForce, in unsigned long long aState);
 };
--- a/content/base/public/nsISelection.idl
+++ b/content/base/public/nsISelection.idl
@@ -88,18 +88,18 @@ interface nsISelection : nsISupports
      * Collapses the whole selection to a single point at the end
      * of the current selection (irrespective of direction).  If content
      * is focused and editable, the caret will blink there.
      */
     void collapseToEnd();
 
     /**
      * Indicates whether the node is part of the selection. If partlyContained 
-     * is set to true, the function returns true when some part of the node 
-     * is part of the selection. If partlyContained is set to false, the
+     * is set to PR_TRUE, the function returns true when some part of the node 
+     * is part of the selection. If partlyContained is set to PR_FALSE, the
      * function only returns true when the entire node is part of the selection.
      */
     boolean containsNode(in nsIDOMNode node, in boolean partlyContained);
 
     /**
      * Adds all children of the specified node to the selection.
      * @param parentNode  the parent of the children to be added to the selection.
      */
@@ -122,18 +122,18 @@ interface nsISelection : nsISupports
 
     /**
      * Deletes this selection from document the nodes belong to.
      */
     void deleteFromDocument();
 
     /**
      * Modifies the cursor Bidi level after a change in keyboard direction
-     * @param langRTL is true if the new language is right-to-left or
-     *                false if the new language is left-to-right.
+     * @param langRTL is PR_TRUE if the new language is right-to-left or
+     *                PR_FALSE if the new language is left-to-right.
      */
     void selectionLanguageChange(in boolean langRTL);
 
     /**
      * Returns the whole selection into a plain text string.
      */
     DOMString toString();
 
--- a/content/base/public/nsISelectionController.idl
+++ b/content/base/public/nsISelectionController.idl
@@ -94,26 +94,26 @@ interface nsISelectionController : nsISe
    * @param aType specifies the selection to repaint.
    */
     void repaintSelection(in short type);
 
    /**
    * Set the caret as enabled or disabled. An enabled caret will
    * draw or blink when made visible. A disabled caret will never show up.
    * Can be called any time.
-   * @param aEnable true to enable caret.  false to disable.
+   * @param aEnable PR_TRUE to enable caret.  PR_FALSE to disable.
    * @return always NS_OK
    */
 
     void setCaretEnabled(in boolean enabled);
 
    /**
    * Set the caret readonly or not. An readonly caret will
    * draw but not blink when made visible. 
-   * @param aReadOnly true to enable caret.  false to disable.
+   * @param aReadOnly PR_TRUE to enable caret.  PR_FALSE to disable.
    * @return always NS_OK
    */
     void setCaretReadOnly(in boolean readOnly);
 
    /**
    * Gets the current state of the caret.
    * @param aEnabled  [OUT] set to the current caret state, as set by SetCaretEnabled
    * @return   if aOutEnabled==null, returns NS_ERROR_INVALID_ARG
@@ -126,26 +126,26 @@ interface nsISelectionController : nsISe
     * This is still true when the caret is enabled, visible, but in its "off"
     * blink cycle.
     */
     readonly attribute boolean caretVisible;
     
    /**
    * Show the caret even in selections. By default the caret is hidden unless the
    * selection is collapsed. Use this function to show the caret even in selections.
-   * @param aVisibility true to show the caret in selections.  false to hide.
+   * @param aVisibility PR_TRUE to show the caret in selections.  PR_FALSE to hide.
    * @return always NS_OK
    */
     void setCaretVisibilityDuringSelection(in boolean visibility);
 
    /** CharacterMove will move the selection one character forward/backward in the document.
-   *  this will also have the effect of collapsing the selection if the aExtend = false
+   *  this will also have the effect of collapsing the selection if the aExtend = PR_FALSE
    *  the "point" of selection that is extended is considered the "focus" point. 
    *  or the last point adjusted by the selection.
-   *  @param aForward forward or backward if false
+   *  @param aForward forward or backward if PR_FALSE
    *  @param aExtend  should it collapse the selection of extend it?
    */
     void characterMove(in boolean forward, in boolean extend);
 
    /**
     * CharacterExtendForDelete will extend the selection one character cell
     * forward in the document.
     * this method is used internally for handling del key.
@@ -156,69 +156,69 @@ interface nsISelectionController : nsISe
     * CharacterExtendForBackspace will extend the selection one character cell
     * backward in the document.
     * this method is used internally for handling backspace key only when we're
     * after UTF-16 surrogates.
     */
     [noscript] void characterExtendForBackspace();
 
    /** WordMove will move the selection one word forward/backward in the document.
-   *  this will also have the effect of collapsing the selection if the aExtend = false
+   *  this will also have the effect of collapsing the selection if the aExtend = PR_FALSE
    *  the "point" of selection that is extended is considered the "focus" point. 
    *  or the last point adjusted by the selection.
-   *  @param aForward forward or backward if false
+   *  @param aForward forward or backward if PR_FALSE
    *  @param aExtend  should it collapse the selection of extend it?
    */
 
     void wordMove(in boolean forward, in boolean extend);
 
    /** wordExtendForDelete will extend the selection one word forward/backward in the document.
    *  this method is used internally for handling ctrl[option]-backspace and ctrl[option]-del.
-   *  @param aForward forward or backward if false
+   *  @param aForward forward or backward if PR_FALSE
    */
     [noscript] void wordExtendForDelete(in boolean forward);
 
     /** LineMove will move the selection one line forward/backward in the document.
-   *  this will also have the effect of collapsing the selection if the aExtend = false
+   *  this will also have the effect of collapsing the selection if the aExtend = PR_FALSE
    *  the "point" of selection that is extended is considered the "focus" point. 
    *  or the last point adjusted by the selection.
-   *  @param aForward forward or backward if false
+   *  @param aForward forward or backward if PR_FALSE
    *  @param aExtend  should it collapse the selection of extend it?
    */
     void lineMove(in boolean forward, in boolean extend);
 
   /** IntraLineMove will move the selection to the front of the line or end of the line
    *  in the document.
-   *  this will also have the effect of collapsing the selection if the aExtend = false
+   *  this will also have the effect of collapsing the selection if the aExtend = PR_FALSE
    *  the "point" of selection that is extended is considered the "focus" point. 
    *  or the last point adjusted by the selection.
-   *  @param aForward forward or backward if false
+   *  @param aForward forward or backward if PR_FALSE
    *  @param aExtend  should it collapse the selection of extend it?
    */
     void intraLineMove(in boolean forward, in boolean extend);
 
   /** PageMove will move the selection one page forward/backward in the document.
-   *  this will also have the effect of collapsing the selection if the aExtend = false
+   *  this will also have the effect of collapsing the selection if the aExtend = PR_FALSE
    *  the "point" of selection that is extended is considered the "focus" point. 
    *  or the last point adjusted by the selection.
-   *  @param aForward forward or backward if false
+   *  @param aForward forward or backward if PR_FALSE
    *  @param aExtend  should it collapse the selection of extend it?
    */
     void pageMove(in boolean forward, in boolean extend);
 
   /** CompleteScroll will move page view to the top or bottom of the document
-   *  @param aForward forward or backward if false
+   *  @param aForward forward or backward if PR_FALSE
    */
     void completeScroll(in boolean forward);
 
   /** CompleteMove will move page view to the top or bottom of the document
-   *  this will also have the effect of collapsing the selection if the aExtend = false
+   *  this will also have the effect of collapsing the selection if the aExtend = PR_FALSE
    *  the "point" of selection that is extended is considered the "focus" point. 
    *  or the last point adjusted by the selection.
-   *  @param aForward forward or backward if false
+   *  @param aForward forward or backward if PR_FALSE
    *  @param aExtend  should it collapse the selection of extend it?
    */
     void completeMove(in boolean forward, in boolean extend);
 
 
   /** ScrollPage will scroll the page without affecting the selection.
    *  @param aForward scroll forward or backwards in selection
    */
--- a/content/base/public/nsIXMLHttpRequest.idl
+++ b/content/base/public/nsIXMLHttpRequest.idl
@@ -82,17 +82,17 @@ interface nsIXMLHttpRequestUpload : nsIX
  *
  *   The mozilla implementation of nsIXMLHttpRequest implements the interface
  *   nsIDOMEventTarget and that's how you're supported to add event listeners.
  *   Try something like this:
  *
  *   nsCOMPtr<nsIDOMEventTarget> target(do_QueryInterface(myxmlhttpreq));
  *
  *   target->AddEventListener(NS_LITERAL_STRING("load"), mylistener,
- *                            false)
+ *                            PR_FALSE)
  *
  *   where mylistener is your event listener object that implements the
  *   interface nsIDOMEventListener.
  *
  *   The 'onload', 'onerror', and 'onreadystatechange' attributes moved to
  *   nsIJSXMLHttpRequest, but if you're coding in C++ you should avoid using
  *   those.
  *
--- a/content/base/src/nsDOMMutationObserver.h
+++ b/content/base/src/nsDOMMutationObserver.h
@@ -26,19 +26,19 @@
 
 class nsDOMMutationObserver;
 
 class nsDOMMutationRecord : public nsIDOMMutationRecord
 {
 public:
   nsDOMMutationRecord(const nsAString& aType) : mType(aType)
   {
-    mAttrName.SetIsVoid(true);
-    mAttrNamespace.SetIsVoid(true);
-    mPrevValue.SetIsVoid(true);
+    mAttrName.SetIsVoid(PR_TRUE);
+    mAttrNamespace.SetIsVoid(PR_TRUE);
+    mPrevValue.SetIsVoid(PR_TRUE);
   }
   virtual ~nsDOMMutationRecord() {}
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_CLASS(nsDOMMutationRecord)
   NS_DECL_NSIDOMMUTATIONRECORD
 
   nsCOMPtr<nsINode>             mTarget;
   nsString                      mType;
--- a/content/xtf/public/nsIXTFAttributeHandler.idl
+++ b/content/xtf/public/nsIXTFAttributeHandler.idl
@@ -16,17 +16,17 @@ interface nsIXTFAttributeHandler : nsISu
   boolean handlesAttribute(in nsIAtom name);
   
   void setAttribute(in nsIAtom name, in AString newValue);
   
   void removeAttribute(in nsIAtom name);
 
   // If the attribute 'name' is unknown the implementation should mark
   // the returned string as being 'null' (i.e. return 'null' in JS;
-  // call SetIsVoid(true) in C++) rather than throw an exception.
+  // call SetIsVoid(PR_TRUE) in C++) rather than throw an exception.
   // A 'void' result will be translated into the attribute missing
   // by the wrapper. An empty result will be translated into
   // the attribute having no value.
   AString getAttribute(in nsIAtom name);
   
   boolean hasAttribute(in nsIAtom name);
   
   unsigned long getAttributeCount();
--- a/docshell/base/nsIDocShellTreeItem.idl
+++ b/docshell/base/nsIDocShellTreeItem.idl
@@ -22,18 +22,18 @@ interface nsIDocShellTreeItem : nsIDocSh
 	name of the DocShellTreeItem
 	*/
 	attribute wstring name;
 
         /**
          * Compares the provided name against the item's name and
          * returns the appropriate result.
          *
-         * @return <CODE>true</CODE> if names match;
-         *         <CODE>false</CODE> otherwise.
+         * @return <CODE>PR_TRUE</CODE> if names match;
+         *         <CODE>PR_FALSE</CODE> otherwise.
          */
         boolean nameEquals(in wstring name);
 
 	/*
 	Definitions for the item types.
 	*/
 	const long typeChrome=0;            // typeChrome must equal 0
 	const long typeContent=1;           // typeContent must equal 1
--- a/dom/interfaces/events/nsIDOMEventTarget.idl
+++ b/dom/interfaces/events/nsIDOMEventTarget.idl
@@ -201,31 +201,31 @@ interface nsIDOMEventTarget : nsISupport
    */
    [notxpcom, nostdcall] nsIDOMEventTarget GetTargetForEventTargetChain();
 
   /**
    * Called before the capture phase of the event flow.
    * This is used to create the event target chain and implementations
    * should set the necessary members of nsEventChainPreVisitor.
    * At least aVisitor.mCanHandle must be set,
-   * usually also aVisitor.mParentTarget if mCanHandle is true.
+   * usually also aVisitor.mParentTarget if mCanHandle is PR_TRUE.
    * First one tells that this object can handle the aVisitor.mEvent event and
    * the latter one is the possible parent object for the event target chain.
    * @see nsEventDispatcher.h for more documentation about aVisitor.
    *
    * @param aVisitor the visitor object which is used to create the
    *                 event target chain for event dispatching.
    *
    * @note Only nsEventDispatcher should call this method.
    */
   [noscript, nostdcall]
   void PreHandleEvent(in nsEventChainPreVisitorRef aVisitor);
 
   /**
-   * If nsEventChainPreVisitor.mWantsWillHandleEvent is set true,
+   * If nsEventChainPreVisitor.mWantsWillHandleEvent is set PR_TRUE,
    * called just before possible event handlers on this object will be called.
    */
   [noscript, nostdcall]
   void WillHandleEvent(in nsEventChainPostVisitorRef aVisitor);
 
   /**
    * Called after the bubble phase of the system event group.
    * The default handling of the event should happen here.
@@ -258,17 +258,17 @@ interface nsIDOMEventTarget : nsISupport
   void DispatchDOMEvent(in nsEventPtr aEvent,
                         in nsIDOMEvent aDOMEvent,
                         in nsPresContextPtr aPresContext,
                         in nsEventStatusPtr aEventStatus);
 
   /**
    * Get the event listener manager, the guy you talk to to register for events
    * on this node.
-   * @param aMayCreate If false, returns a listener manager only if
+   * @param aMayCreate If PR_FALSE, returns a listener manager only if
    *                   one already exists.
    */
   [notxpcom, nostdcall]
   nsEventListenerManagerPtr GetListenerManager(in boolean aMayCreate);
 
   /**
    * Get the script context in which the event handlers should be run.
    * May return null.
--- a/dom/ipc/PBrowser.ipdl
+++ b/dom/ipc/PBrowser.ipdl
@@ -98,65 +98,65 @@ parent:
      * chrome seqno-on-blur match again. These events, meant for the blurred
      * textfield, are discarded to prevent events going to the wrong target
      */
 
     /**
      * Notifies chrome that there is a focus change involving an editable
      * object (input, textarea, document, contentEditable. etc.)
      *
-     *  focus        true if editable object is receiving focus
-     *               false if losing focus
+     *  focus        PR_TRUE if editable object is receiving focus
+     *               PR_FALSE if losing focus
      *  preference   Native widget preference for IME updates
      *  seqno        Current seqno value on the chrome side
      */
     sync NotifyIMEFocus(bool focus)
       returns (nsIMEUpdatePreference preference, uint32_t seqno);
 
     /**
      * Notifies chrome that there has been a change in text content
      * One call can encompass both a delete and an insert operation
-     * Only called when NotifyIMEFocus returns true for mWantUpdates
+     * Only called when NotifyIMEFocus returns PR_TRUE for mWantUpdates
      *
      *  offset       Starting offset of the change
      *  end          Ending offset of the range deleted
      *  newEnd       New ending offset after insertion
      *
      *  for insertion, offset == end
      *  for deletion, offset == newEnd
      */
     NotifyIMETextChange(uint32_t offset, uint32_t end, uint32_t newEnd);
 
     /**
      * Notifies chrome that there has been a change in selection
-     * Only called when NotifyIMEFocus returns true for mWantUpdates
+     * Only called when NotifyIMEFocus returns PR_TRUE for mWantUpdates
      *
      *  seqno        Current seqno value on the content side
      *  anchor       Offset where the selection started
      *  focus        Offset where the caret is
      */
     NotifyIMESelection(uint32_t seqno, uint32_t anchor, uint32_t focus);
 
     /**
      * Notifies chrome to refresh its text cache 
-     * Only called when NotifyIMEFocus returns true for mWantHints
+     * Only called when NotifyIMEFocus returns PR_TRUE for mWantHints
      *
      *  text         The entire content of the text field
      */
     NotifyIMETextHint(nsString text);
 
     /**
      * Instructs chrome to end any pending composition
      *
-     *  cancel       true if composition should be cancelled
+     *  cancel       PR_TRUE if composition should be cancelled
      *  composition  Text to commit before ending the composition
      *
-     *  if cancel is true,
+     *  if cancel is PR_TRUE,
      *    widget should return empty string for composition
-     *  if cancel is false,
+     *  if cancel is PR_FALSE,
      *    widget should return the current composition text
      */
     sync EndIMEComposition(bool cancel) returns (nsString composition);
 
     sync GetInputContext() returns (int32_t IMEEnabled, int32_t IMEOpen);
 
     SetInputContext(int32_t IMEEnabled,
                     int32_t IMEOpen,
--- a/editor/composer/public/nsIEditingSession.idl
+++ b/editor/composer/public/nsIEditingSession.idl
@@ -28,21 +28,21 @@ interface nsIEditingSession : nsISupport
    *  Value is one of the above error codes
    */
   readonly attribute unsigned long editorStatus;
 
   /**
    *  Make this window editable
    *  @param aWindow nsIDOMWindow, the window the embedder needs to make editable
    *  @param aEditorType string, "html" "htmlsimple" "text" "textsimple"
-   *  @param aMakeWholeDocumentEditable if true make the whole document in
+   *  @param aMakeWholeDocumentEditable if PR_TRUE make the whole document in
    *                                    aWindow editable, otherwise it's the
    *                                    embedder who should make the document
    *                                    (or part of it) editable.
-   *  @param aInteractive if false turn off scripting and plugins
+   *  @param aInteractive if PR_FALSE turn off scripting and plugins
    */
   void makeWindowEditable(in nsIDOMWindow window, in string aEditorType,
                           in boolean doAfterUriLoad,
                           in boolean aMakeWholeDocumentEditable,
                           in boolean aInteractive);
   
   /**
    *  Test whether a specific window has had its editable flag set; it may have an editor
--- a/editor/idl/nsIContentFilter.idl
+++ b/editor/idl/nsIContentFilter.idl
@@ -22,22 +22,22 @@ interface nsIContentFilter : nsISupports
    * that results (if any) from all filter callbacks is what will be used
    * for transaction purposes (undo/redo) except for the open event.
    *
    * The willDeleteSelection parameter is offered for filters who want to
    * handle the insertion themselves and need to handle drag/drop correctly.
    * The flag is true when the editor intends to delete the selection.
    *
    * Callers who want to cancel all insertion can simply set
-   * continueWithInsertion to false and return.
+   * continueWithInsertion to PR_FALSE and return.
    * Note: If cancellation occurs during the "open" event, the editor will
    * still be available but will be empty.
    *
    * Callers who want to allow insertion of the data with no changes
-   * can simply set continueWithInsertion to true and return.
+   * can simply set continueWithInsertion to PR_TRUE and return.
    *
    * Callers who want to modify the content (docFragment) being inserted are 
    * responsible for updating contentStartNode, contentStartOffset, 
    * contentEndNode, and contentEndOffset (if necessary).  
    * Callers are responsible for freeing and addref'ing if they want to 
    * completely replace any of the DOM nodes passed in.
    *
    * The location where insertion will occur should be considered an
--- a/editor/idl/nsIEditor.idl
+++ b/editor/idl/nsIEditor.idl
@@ -171,22 +171,22 @@ interface nsIEditor  : nsISupports
     * Otherwise, the transaction is just executed directly.
     *
     * @param aTxn the transaction to execute
     */
   void doTransaction(in nsITransaction txn);
 
 
   /** turn the undo system on or off
-    * @param aEnable  if true, the undo system is turned on if available
-    *                 if false the undo system is turned off if it
+    * @param aEnable  if PR_TRUE, the undo system is turned on if available
+    *                 if PR_FALSE the undo system is turned off if it
     *                 was previously on
-    * @return         if aEnable is true, returns NS_OK if
+    * @return         if aEnable is PR_TRUE, returns NS_OK if
     *                 the undo system could be initialized properly
-    *                 if aEnable is false, returns NS_OK.
+    *                 if aEnable is PR_FALSE, returns NS_OK.
     */
   void enableUndo(in boolean enable);
 
   /**
    * The number of items on the undo stack.
    */
   readonly attribute long numberOfUndoItems;
 
@@ -203,18 +203,18 @@ interface nsIEditor  : nsISupports
     * and the result of that undo is returned.  
     * Otherwise, the Undo request is ignored and an
     * error NS_ERROR_NOT_AVAILABLE is returned.
     *
     */
   void undo(in unsigned long count);
 
   /** returns state information about the undo system.
-    * @param aIsEnabled [OUT] true if undo is enabled
-    * @param aCanUndo   [OUT] true if at least one transaction is
+    * @param aIsEnabled [OUT] PR_TRUE if undo is enabled
+    * @param aCanUndo   [OUT] PR_TRUE if at least one transaction is
     *                         currently ready to be undone.
     */
   void canUndo(out boolean isEnabled, out boolean canUndo);
 
   /** redo reverses the effects of the last Undo operation
     * It is provided here so clients need no knowledge of whether
     * the editor has a transaction manager or not.
     * If a transaction manager is present, it is told to redo and the
@@ -222,18 +222,18 @@ interface nsIEditor  : nsISupports
     * If no transaction is available for Redo, or if the document
     * has no transaction manager, the Redo request is ignored and an
     * error NS_ERROR_NOT_AVAILABLE is returned.
     *
     */
   void redo(in unsigned long count);
 
   /** returns state information about the redo system.
-    * @param aIsEnabled [OUT] true if redo is enabled
-    * @param aCanRedo   [OUT] true if at least one transaction is
+    * @param aIsEnabled [OUT] PR_TRUE if redo is enabled
+    * @param aCanRedo   [OUT] PR_TRUE if at least one transaction is
                               currently ready to be redone.
     */
   void canRedo(out boolean isEnabled, out boolean canRedo);
 
   /** beginTransaction is a signal from the caller to the editor that
     * the caller will execute multiple updates to the content tree
     * that should be treated as a single logical operation,
     * in the most efficient way possible.<br>
@@ -256,18 +256,18 @@ interface nsIEditor  : nsISupports
   void beginPlaceHolderTransaction(in nsIAtom name);
   void endPlaceHolderTransaction();
   boolean shouldTxnSetSelection();
 
   /** Set the flag that prevents insertElementTxn from changing the selection
     * @param   should  Set false to suppress changing the selection;
     *                  i.e., before using InsertElement() to insert
     *                  under <head> element
-    * WARNING: You must be very careful to reset back to true after
-    *          setting false, else selection/caret is trashed
+    * WARNING: You must be very careful to reset back to PR_TRUE after
+    *          setting PR_FALSE, else selection/caret is trashed
     *          for further editing.
     */
   void setShouldTxnSetSelection(in boolean should);
 
   /* ------------ Inline Spell Checking methods -------------- */
 
   /** Returns the inline spell checker associated with this object. The spell
     * checker is lazily created, so this function may create the object for
@@ -365,19 +365,19 @@ interface nsIEditor  : nsISupports
                     in AString attvalue);
 
   /**
    * getAttributeValue() retrieves the attribute's value for aElement.
    *
    * @param aElement      the content element to operate on
    * @param aAttribute    the string representation of the attribute to get
    * @param aResultValue  [OUT] the value of aAttribute.
-   *                      Only valid if aResultIsSet is true
-   * @return              true if aAttribute is set on the current node,
-   *                      false if it is not.
+   *                      Only valid if aResultIsSet is PR_TRUE
+   * @return              PR_TRUE if aAttribute is set on the current node,
+   *                      PR_FALSE if it is not.
    */
   boolean getAttributeValue(in nsIDOMElement aElement, 
                             in AString attributestr, 
                             out AString resultValue);
 
   /**
    * removeAttribute() deletes aAttribute from the attribute list of aElement.
    * If aAttribute is not an attribute of aElement, nothing is done.
--- a/editor/idl/nsIHTMLEditor.idl
+++ b/editor/idl/nsIHTMLEditor.idl
@@ -100,21 +100,21 @@ interface nsIHTMLEditor : nsISupports
    * @param aProperty   the property to get on the selection 
    * @param aAttribute  the attribute of the property, if applicable.
    *                    May be null.
    *                    Example: aProperty="font", aAttribute="color"
    * @param aValue      if aAttribute is not null, the value of the attribute.
    *                    May be null.
    *                    Example: aProperty="font", aAttribute="color",
    *                             aValue="0x00FFFF"
-   * @param aFirst      [OUT] true if the first text node in the
+   * @param aFirst      [OUT] PR_TRUE if the first text node in the
    *                          selection has the property
-   * @param aAny        [OUT] true if any of the text nodes in the
+   * @param aAny        [OUT] PR_TRUE if any of the text nodes in the
    *                          selection have the property
-   * @param aAll        [OUT] true if all of the text nodes in the
+   * @param aAll        [OUT] PR_TRUE if all of the text nodes in the
    *                          selection have the property
    */
   void getInlineProperty(in nsIAtom aProperty, 
                          in AString  aAttribute,
                          in AString  aValue,
                          out boolean aFirst,
                          out boolean aAny,
                          out boolean aAll);
@@ -225,17 +225,17 @@ interface nsIHTMLEditor : nsISupports
   /** 
     * Insert an element, which may have child nodes, at the selection
     * Used primarily to insert a new element for various insert element dialogs,
     *   but it enforces the HTML 4.0 DTD "CanContain" rules, so it should
     *   be useful for other elements.
     *
     * @param aElement           The element to insert
     * @param aDeleteSelection   Delete the selection before inserting
-    *     If aDeleteSelection is false, then the element is inserted 
+    *     If aDeleteSelection is PR_FALSE, then the element is inserted 
     *     after the end of the selection for all element except
     *     Named Anchors, which insert before the selection
     */  
   void insertElementAtSelection(in nsIDOMElement aElement,
                                 in boolean aDeleteSelection);
 
   /** 
    *   Set the documents title.
--- a/editor/txmgr/idl/nsITransactionListener.idl
+++ b/editor/txmgr/idl/nsITransactionListener.idl
@@ -150,17 +150,17 @@ interface nsITransactionListener : nsISu
    * Called after a transaction manager tries to merge
    * a transaction, that was just executed, with the
    * transaction at the top of the undo stack.
    * @param aManager the transaction manager ending a batch.
    * @param aTopTransaction the transaction at the top of the undo stack.
    * @param aTransactionToMerge the transaction to merge.
    * @param aDidMerge true if transaction was merged, else false.
    * @param aMergeResult the nsresult returned after the merge attempt.
-   * @param aInterrupt listeners should set this to true if they
+   * @param aInterrupt listeners should set this to PR_TRUE if they
    * want to interrupt normal control flow, without throwing an error.
    */
   void didMerge(in nsITransactionManager aManager,
                 in nsITransaction aTopTransaction,
                 in nsITransaction aTransactionToMerge,
                 in boolean aDidMerge,
                 in nsresult aMergeResult);
 
--- a/embedding/browser/webBrowser/nsIPrintPreviewNavigation.idl
+++ b/embedding/browser/webBrowser/nsIPrintPreviewNavigation.idl
@@ -15,32 +15,32 @@ interface nsIPrintPreviewNavigation  : n
 {
 
   readonly attribute long pageCount;
 
 
   /**
    * Preview the next Page
    *
-   * Return - true if success
+   * Return - PR_TRUE if success
    */
   boolean	nextPage();
   
   /**
    * Preview the previous Page
    *
-   * Return - true if success
+   * Return - PR_TRUE if success
    */
   boolean	previousPage();
 
   /**
    * Go to a page to preview
    *
    * aPageNumber - Page to go preview
-   * Return - true if success
+   * Return - PR_TRUE if success
    */
   boolean	goToPage(unsigned long aPageNumber);
 
 
   /**
    * Skip pages
    *
    * aNumPages - number of pages to skip including the current page. Neg. goes back
--- a/embedding/browser/webBrowser/nsITooltipTextProvider.idl
+++ b/embedding/browser/webBrowser/nsITooltipTextProvider.idl
@@ -30,14 +30,14 @@ interface nsIDOMNode;
 interface nsITooltipTextProvider : nsISupports
 {
     /**
      * Called to obtain the tooltip text for a node.
      *
      * @arg aNode The node to obtain the text from.
      * @arg aText The tooltip text.
      *
-     * @return <CODE>true</CODE> if tooltip text is associated
+     * @return <CODE>PR_TRUE</CODE> if tooltip text is associated
      *         with the node and was returned in the aText argument;
-     *         <CODE>false</CODE> otherwise.
+     *         <CODE>PR_FALSE</CODE> otherwise.
      */
     boolean getNodeText(in nsIDOMNode aNode, out wstring aText);
 };
--- a/embedding/browser/webBrowser/nsIWebBrowserSetup.idl
+++ b/embedding/browser/webBrowser/nsIWebBrowserSetup.idl
@@ -72,18 +72,18 @@ interface nsIWebBrowserSetup : nsISuppor
      * Boolean. Enables/disables the use of global history in the browser. Visited
      * URLs will not be recorded in the global history when it is disabled.
      *
      * @see setProperty
      */
     const unsigned long SETUP_USE_GLOBAL_HISTORY    = 256;
 
     /**
-     * Boolean. A value of true makes the browser a chrome wrapper.
-     * Default is false.
+     * Boolean. A value of PR_TRUE makes the browser a chrome wrapper.
+     * Default is PR_FALSE.
      *
      * @since mozilla1.0
      *
      * @see setProperty
      */
     const unsigned long SETUP_IS_CHROME_WRAPPER     = 7;
 
 
@@ -94,16 +94,16 @@ interface nsIWebBrowserSetup : nsISuppor
      * compatibility.
      *
      * @see setProperty
      */
     const unsigned long SETUP_ALLOW_DNS_PREFETCH    = 8;
 
     /**
      * Sets an integer or boolean property on the new web browser object.
-     * Only true and false are legal boolean values.
+     * Only PR_TRUE and PR_FALSE are legal boolean values.
      *
      * @param aId The identifier of the property to be set.
      * @param aValue The value of the property.
      */
     void setProperty(in unsigned long aId, in unsigned long aValue);
 };
 
--- a/intl/uconv/idl/nsIUTF8ConverterService.idl
+++ b/intl/uconv/idl/nsIUTF8ConverterService.idl
@@ -13,17 +13,17 @@ interface nsIUTF8ConverterService : nsIS
   /**
    * Ensure that |aString| is encoded in UTF-8.  If not, 
    * convert to UTF-8 assuming it's encoded in |aCharset|
    * and return the converted string in UTF-8.
    *
    * @param aString a string to  ensure its UTF8ness
    * @param aCharset the charset to convert from if |aString| is not in UTF-8
    * @param aSkipCheck determines whether or not to skip 'ASCIIness' and 
-   *        'UTF8ness' check. Set this to true only if you suspect that 
+   *        'UTF8ness' check. Set this to PR_TRUE only if you suspect that 
    *        aString can be mistaken for ASCII / UTF-8 but is actually NOT 
    *        in ASCII / UTF-8 so that aString has to go through the conversion.
    *        skipping ASCIIness/UTF8ness check.
    *        The most common case is the input is in 7bit non-ASCII charsets
    *        like ISO-2022-JP, HZ or UTF-7 (in its original form or
    *        a modified form used in IMAP folder names).
    * @param aAllowSubstitution when true, allow the decoder to substitute
    *        invalid input sequences by replacement characters (defaults to
--- a/ipc/chromium/src/base/crypto/signature_verifier_nss.cc
+++ b/ipc/chromium/src/base/crypto/signature_verifier_nss.cc
@@ -53,30 +53,30 @@ bool SignatureVerifier::VerifyInit(const
   sig_alg_der.data = const_cast<uint8_t*>(signature_algorithm);
   sig_alg_der.len = signature_algorithm_len;
   SECAlgorithmID sig_alg_id;
   SECStatus rv;
   rv = SEC_QuickDERDecodeItem(arena, &sig_alg_id, SECOID_AlgorithmIDTemplate,
                               &sig_alg_der);
   if (rv != SECSuccess) {
     SECKEY_DestroyPublicKey(public_key);
-    PORT_FreeArena(arena, true);
+    PORT_FreeArena(arena, PR_TRUE);
     return false;
   }
 
   SECItem sig;
   sig.type = siBuffer;
   sig.data = const_cast<uint8_t*>(signature);
   sig.len = signature_len;
   SECOidTag hash_alg_tag;
   vfy_context_ = VFY_CreateContextWithAlgorithmID(public_key, &sig,
                                                   &sig_alg_id, &hash_alg_tag,
                                                   NULL);
   SECKEY_DestroyPublicKey(public_key);  // Done with public_key.
-  PORT_FreeArena(arena, true);  // Done with sig_alg_id.
+  PORT_FreeArena(arena, PR_TRUE);  // Done with sig_alg_id.
   if (!vfy_context_) {
     // A corrupted RSA signature could be detected without the data, so
     // VFY_CreateContextWithAlgorithmID may fail with SEC_ERROR_BAD_SIGNATURE
     // (-8182).
     return false;
   }
 
   rv = VFY_Begin(vfy_context_);
@@ -99,16 +99,16 @@ bool SignatureVerifier::VerifyFinal() {
 
   // If signature verification fails, the error code is
   // SEC_ERROR_BAD_SIGNATURE (-8182).
   return (rv == SECSuccess);
 }
 
 void SignatureVerifier::Reset() {
   if (vfy_context_) {
-    VFY_DestroyContext(vfy_context_, true);
+    VFY_DestroyContext(vfy_context_, PR_TRUE);
     vfy_context_ = NULL;
   }
   signature_.clear();
 }
 
 }  // namespace base
 
--- a/ipc/chromium/src/base/hmac_nss.cc
+++ b/ipc/chromium/src/base/hmac_nss.cc
@@ -17,17 +17,17 @@ template <typename Type, void (*Destroye
 struct NSSDestroyer {
   void operator()(Type* ptr) const {
     if (ptr)
       Destroyer(ptr);
   }
 };
 
 void DestroyContext(PK11Context* context) {
-  PK11_DestroyContext(context, true);
+  PK11_DestroyContext(context, PR_TRUE);
 }
 
 // Define some convenient scopers around NSS pointers.
 typedef scoped_ptr_malloc<
     PK11SlotInfo, NSSDestroyer<PK11SlotInfo, PK11_FreeSlot> > ScopedNSSSlot;
 typedef scoped_ptr_malloc<
     PK11SymKey, NSSDestroyer<PK11SymKey, PK11_FreeSymKey> > ScopedNSSSymKey;
 typedef scoped_ptr_malloc<
--- a/ipc/chromium/src/base/nss_init.cc
+++ b/ipc/chromium/src/base/nss_init.cc
@@ -23,17 +23,17 @@
 namespace {
 
 // Load nss's built-in root certs.
 SECMODModule *InitDefaultRootCerts() {
   const char* kModulePath = "libnssckbi.so";
   char modparams[1024];
   snprintf(modparams, sizeof(modparams),
           "name=\"Root Certs\" library=\"%s\"", kModulePath);
-  SECMODModule *root = SECMOD_LoadUserModule(modparams, NULL, false);
+  SECMODModule *root = SECMOD_LoadUserModule(modparams, NULL, PR_FALSE);
   if (root)
     return root;
 
   // Aw, snap.  Can't find/load root cert shared library.
   // This will make it hard to talk to anybody via https.
   NOTREACHED();
   return NULL;
 }
@@ -62,17 +62,17 @@ class NSSInitSingleton {
       if (SSL_GetCipherSuiteInfo(SSL_ImplementedCiphers[i], &info,
                                  sizeof(info)) == SECSuccess) {
         SSL_CipherPrefSetDefault(SSL_ImplementedCiphers[i],
                                  (info.effectiveKeyBits >= 80));
       }
     }
 
     // Enable SSL
-    SSL_OptionSetDefault(SSL_SECURITY, true);
+    SSL_OptionSetDefault(SSL_SECURITY, PR_TRUE);
 
     // All other SSL options are set per-session by SSLClientSocket.
   }
 
   ~NSSInitSingleton() {
     if (root_) {
       SECMOD_UnloadUserModule(root_);
       SECMOD_DestroyModule(root_);
--- a/ipc/chromium/src/base/pr_time_unittest.cc
+++ b/ipc/chromium/src/base/pr_time_unittest.cc
@@ -59,81 +59,81 @@ TEST_F(PRTimeTest, ParseTimeTest1) {
 #elif defined(OS_POSIX)
   localtime_r(&current_time, &local_time);
   asctime_r(&local_time, time_buf);
 #endif
 
   PRTime current_time64 = static_cast<PRTime>(current_time) * PR_USEC_PER_SEC;
 
   PRTime parsed_time = 0;
-  PRStatus result = PR_ParseTimeString(time_buf, false, &parsed_time);
+  PRStatus result = PR_ParseTimeString(time_buf, PR_FALSE, &parsed_time);
   EXPECT_EQ(PR_SUCCESS, result);
   EXPECT_EQ(current_time64, parsed_time);
 }
 
 TEST_F(PRTimeTest, ParseTimeTest2) {
   PRTime parsed_time = 0;
   PRStatus result = PR_ParseTimeString("Mon, 15 Oct 2007 19:45:00 GMT",
-                                       false, &parsed_time);
+                                       PR_FALSE, &parsed_time);
   EXPECT_EQ(PR_SUCCESS, result);
   EXPECT_EQ(parsed_time, comparison_time_pdt);
 }
 
 TEST_F(PRTimeTest, ParseTimeTest3) {
   PRTime parsed_time = 0;
-  PRStatus result = PR_ParseTimeString("15 Oct 07 12:45:00", false,
+  PRStatus result = PR_ParseTimeString("15 Oct 07 12:45:00", PR_FALSE,
                                        &parsed_time);
   EXPECT_EQ(PR_SUCCESS, result);
   EXPECT_EQ(parsed_time, comparison_time_local_);
 }
 
 TEST_F(PRTimeTest, ParseTimeTest4) {
   PRTime parsed_time = 0;
-  PRStatus result = PR_ParseTimeString("15 Oct 07 19:45 GMT", false,
+  PRStatus result = PR_ParseTimeString("15 Oct 07 19:45 GMT", PR_FALSE,
                                        &parsed_time);
   EXPECT_EQ(PR_SUCCESS, result);
   EXPECT_EQ(parsed_time, comparison_time_pdt);
 }
 
 TEST_F(PRTimeTest, ParseTimeTest5) {
   PRTime parsed_time = 0;
   PRStatus result = PR_ParseTimeString("Mon Oct 15 12:45 PDT 2007",
-                                       false, &parsed_time);
+                                       PR_FALSE, &parsed_time);
   EXPECT_EQ(PR_SUCCESS, result);
   EXPECT_EQ(parsed_time, comparison_time_pdt);
 }
 
 TEST_F(PRTimeTest, ParseTimeTest6) {
   PRTime parsed_time = 0;
   PRStatus result = PR_ParseTimeString("Monday, Oct 15, 2007 12:45 PM",
-                                       false, &parsed_time);
+                                       PR_FALSE, &parsed_time);
   EXPECT_EQ(PR_SUCCESS, result);
   EXPECT_EQ(parsed_time, comparison_time_local_);
 }
 
 TEST_F(PRTimeTest, ParseTimeTest7) {
   PRTime parsed_time = 0;
-  PRStatus result = PR_ParseTimeString("10/15/07 12:45:00 PM", false,
+  PRStatus result = PR_ParseTimeString("10/15/07 12:45:00 PM", PR_FALSE,
                                        &parsed_time);
   EXPECT_EQ(PR_SUCCESS, result);
   EXPECT_EQ(parsed_time, comparison_time_local_);
 }
 
 TEST_F(PRTimeTest, ParseTimeTest8) {
   PRTime parsed_time = 0;
-  PRStatus result = PR_ParseTimeString("15-OCT-2007 12:45pm", false,
+  PRStatus result = PR_ParseTimeString("15-OCT-2007 12:45pm", PR_FALSE,
                                        &parsed_time);
   EXPECT_EQ(PR_SUCCESS, result);
   EXPECT_EQ(parsed_time, comparison_time_local_);
 }
 
 TEST_F(PRTimeTest, ParseTimeTest9) {
   PRTime parsed_time = 0;
   PRStatus result = PR_ParseTimeString("16 Oct 2007 4:45-JST (Tuesday)",
-                                       false, &parsed_time);
+                                       PR_FALSE, &parsed_time);
   EXPECT_EQ(PR_SUCCESS, result);
   EXPECT_EQ(parsed_time, comparison_time_pdt);
 }
 
 // This tests the Time::FromString wrapper over PR_ParseTimeString
 TEST_F(PRTimeTest, ParseTimeTest10) {
   Time parsed_time;
   bool result = Time::FromString(L"15/10/07 12:45", &parsed_time);
@@ -242,29 +242,29 @@ TEST_F(PRTimeTest, ParseTimeTestEmpty) {
 // http://crbug.com/4387).
 TEST_F(PRTimeTest, ParseTimeTestOutOfRange) {
   PRTime parsed_time = 0;
   // Note the lack of timezone in the time string.  The year has to be 3001.
   // The date has to be after 23:59:59, December 31, 3000, US Pacific Time, so
   // we use January 2, 3001 to make sure it's after the magic maximum in any
   // timezone.
   PRStatus result = PR_ParseTimeString("Sun Jan  2 00:00:00 3001",
-                                       false, &parsed_time);
+                                       PR_FALSE, &parsed_time);
   EXPECT_EQ(PR_SUCCESS, result);
 }
 
 TEST_F(PRTimeTest, ParseTimeTestNotNormalized1) {
   PRTime parsed_time = 0;
   PRStatus result = PR_ParseTimeString("Mon Oct 15 12:44:60 PDT 2007",
-                                       false, &parsed_time);
+                                       PR_FALSE, &parsed_time);
   EXPECT_EQ(PR_SUCCESS, result);
   EXPECT_EQ(comparison_time_pdt, parsed_time);
 }
 
 TEST_F(PRTimeTest, ParseTimeTestNotNormalized2) {
   PRTime parsed_time = 0;
   PRStatus result = PR_ParseTimeString("Sun Oct 14 36:45 PDT 2007",
-                                       false, &parsed_time);
+                                       PR_FALSE, &parsed_time);
   EXPECT_EQ(PR_SUCCESS, result);
   EXPECT_EQ(comparison_time_pdt, parsed_time);
 }
 
 }  // namespace
--- a/ipc/chromium/src/base/time.cc
+++ b/ipc/chromium/src/base/time.cc
@@ -85,17 +85,17 @@ Time Time::LocalMidnight() const {
 
 // static
 bool Time::FromString(const wchar_t* time_string, Time* parsed_time) {
   DCHECK((time_string != NULL) && (parsed_time != NULL));
   std::string ascii_time_string = SysWideToUTF8(time_string);
   if (ascii_time_string.length() == 0)
     return false;
   PRTime result_time = 0;
-  PRStatus result = PR_ParseTimeString(ascii_time_string.c_str(), false,
+  PRStatus result = PR_ParseTimeString(ascii_time_string.c_str(), PR_FALSE,
                                        &result_time);
   if (PR_SUCCESS != result)
     return false;
   result_time += kTimeTToMicrosecondsOffset;
   *parsed_time = Time(result_time);
   return true;
 }
 
--- a/js/xpconnect/idl/nsIXPCScriptable.idl
+++ b/js/xpconnect/idl/nsIXPCScriptable.idl
@@ -5,18 +5,18 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
 #include "nsIXPConnect.idl"
 
 /**
  * Note: This is not really an XPCOM interface.  For example, callers must
  * guarantee that they set the *_retval of the various methods that return a
- * boolean to true before making the call.  Implementations may skip writing
- * to *_retval unless they want to return false.
+ * boolean to PR_TRUE before making the call.  Implementations may skip writing
+ * to *_retval unless they want to return PR_FALSE.
  */
 
 [uuid(c4788e02-3239-490a-8aeb-60fad08303fd)]
 interface nsIXPCScriptable : nsISupports
 {
     /* bitflags used for 'flags' (only 32 bits available!) */
 
     const uint32_t WANT_PRECREATE                   = 1 <<  0;
--- a/layout/base/nsFrameTraversal.cpp
+++ b/layout/base/nsFrameTraversal.cpp
@@ -32,18 +32,18 @@ public:
 
 protected:
   void      setCurrent(nsIFrame *aFrame){mCurrent = aFrame;}
   nsIFrame *getCurrent(){return mCurrent;}
   void      setStart(nsIFrame *aFrame){mStart = aFrame;}
   nsIFrame *getStart(){return mStart;}
   nsIFrame *getLast(){return mLast;}
   void      setLast(nsIFrame *aFrame){mLast = aFrame;}
-  int8_t    getOffEdge(){return mOffEdge;}
-  void      setOffEdge(int8_t aOffEdge){mOffEdge = aOffEdge;}
+  PRInt8    getOffEdge(){return mOffEdge;}
+  void      setOffEdge(PRInt8 aOffEdge){mOffEdge = aOffEdge;}
   void      SetLockInScrollView(bool aLockScroll){mLockScroll = aLockScroll;}
 
   /*
    Our own versions of the standard frame tree navigation
    methods, which, if the iterator is following out-of-flows,
    apply the following rules for placeholder frames:
    
    - If a frame HAS a placeholder frame, getting its parent
@@ -89,17 +89,17 @@ protected:
   bool mLockScroll;
   bool mFollowOOFs;
   nsIteratorType mType;
 
 private:
   nsIFrame *mStart;
   nsIFrame *mCurrent;
   nsIFrame *mLast; //the last one that was in current;
-  int8_t    mOffEdge; //0= no -1 to far prev, 1 to far next;
+  PRInt8    mOffEdge; //0= no -1 to far prev, 1 to far next;
 };
 
 
 
 // Bidi visual iterator
 class nsVisualIterator: public nsFrameIterator
 {
 public:
@@ -163,17 +163,17 @@ nsFrameTraversal::~nsFrameTraversal()
 }
 
 NS_IMPL_ISUPPORTS1(nsFrameTraversal,nsIFrameTraversal)
 
 NS_IMETHODIMP 
  nsFrameTraversal::NewFrameTraversal(nsIFrameEnumerator **aEnumerator,
                                      nsPresContext* aPresContext,
                                      nsIFrame *aStart,
-                                     int32_t aType,
+                                     PRInt32 aType,
                                      bool aVisual,
                                      bool aLockInScrollView,
                                      bool aFollowOOFs)
 {
   return NS_NewFrameTraversal(aEnumerator, aPresContext, aStart,
                               static_cast<nsIteratorType>(aType),
                               aVisual, aLockInScrollView, aFollowOOFs);  
 }
--- a/layout/base/nsFrameTraversal.h
+++ b/layout/base/nsFrameTraversal.h
@@ -24,15 +24,15 @@ public:
   nsFrameTraversal();
   virtual ~nsFrameTraversal();
 
   NS_DECL_ISUPPORTS
 
   NS_IMETHOD NewFrameTraversal(nsIFrameEnumerator **aEnumerator,
                                nsPresContext* aPresContext,
                                nsIFrame *aStart,
-                               int32_t aType,
+                               PRInt32 aType,
                                bool aVisual,
                                bool aLockInScrollView,
                                bool aFollowOOFs);
 };
 
 #endif //NSFRAMETRAVERSAL_H
--- a/layout/base/nsIFrameTraversal.h
+++ b/layout/base/nsIFrameTraversal.h
@@ -56,17 +56,17 @@ public:
    * @param aFollowOOFs [in] whether the iterator should follow out-of-flows.
    *        If true, when reaching a placeholder frame while going down will get
    *        the real frame. Going back up will go on past the placeholder,
    *        so the placeholders are logically part of the frame tree.
    */
   NS_IMETHOD NewFrameTraversal(nsIFrameEnumerator **aEnumerator,
                                nsPresContext* aPresContext,
                                nsIFrame *aStart,
-                               int32_t aType,
+                               PRInt32 aType,
                                bool aVisual,
                                bool aLockInScrollView,
                                bool aFollowOOFs) = 0;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsIFrameTraversal, NS_IFRAMETRAVERSAL_IID)
 
 #endif //NSIFRAMETRAVERSAL_H
--- a/media/mtransport/dtlsidentity.cpp
+++ b/media/mtransport/dtlsidentity.cpp
@@ -59,17 +59,17 @@ TemporaryRef<DtlsIdentity> DtlsIdentity:
 
   ScopedSECKEYPrivateKey private_key;
   ScopedSECKEYPublicKey public_key;
   SECKEYPublicKey *pubkey;
 
   private_key =
       PK11_GenerateKeyPair(slot,
                            CKM_RSA_PKCS_KEY_PAIR_GEN, &rsaparams, &pubkey,
-                           false, true, nullptr);
+                           PR_FALSE, PR_TRUE, nullptr);
   if (private_key == nullptr)
     return nullptr;
   public_key = pubkey;
 
   ScopedCERTSubjectPublicKeyInfo spki(
       SECKEY_CreateSubjectPublicKeyInfo(pubkey));
   if (!spki) {
     return nullptr;
--- a/media/mtransport/nr_socket_prsock.cpp
+++ b/media/mtransport/nr_socket_prsock.cpp
@@ -319,17 +319,17 @@ int NrSocket::create(nr_transport_addr *
     if((r=nr_praddr_to_transport_addr(&naddr,&my_addr_,1)))
       ABORT(r);
   }
 
 
   // Set nonblocking
   PRSocketOptionData option;
   option.option = PR_SockOpt_Nonblocking;
-  option.value.non_blocking = true;
+  option.value.non_blocking = PR_TRUE;
   status = PR_SetSocketOption(fd_, &option);
   if (status != PR_SUCCESS) {
     r_log(LOG_GENERIC, LOG_CRIT, "Couldn't make socket nonblocking");
     ABORT(R_INTERNAL);
   }
 
   // Finally, register with the STS
   rv = stservice->AttachSocket(fd_, this);
--- a/media/mtransport/nricectx.cpp
+++ b/media/mtransport/nricectx.cpp
@@ -139,17 +139,17 @@ static int nr_crypto_nss_hmac(UCHAR *key
   if (status != SECSuccess)
     goto abort;
 
   MOZ_ASSERT(hmac_len == 20);
 
   err = 0;
 
  abort:
-  if(hmac_ctx) PK11_DestroyContext(hmac_ctx, true);
+  if(hmac_ctx) PK11_DestroyContext(hmac_ctx, PR_TRUE);
   if (skey) PK11_FreeSymKey(skey);
   if (slot) PK11_FreeSlot(slot);
 
   return err;
 }
 
 static nr_ice_crypto_vtbl nr_ice_crypto_nss_vtbl = {
   nr_crypto_nss_random_bytes,
--- a/media/mtransport/transportlayerdtls.cpp
+++ b/media/mtransport/transportlayerdtls.cpp
@@ -263,17 +263,17 @@ static PRStatus TransportLayerGetpeernam
 static PRStatus TransportLayerGetsockname(PRFileDesc *f, PRNetAddr *addr) {
   UNIMPLEMENTED;
   return PR_FAILURE;
 }
 
 static PRStatus TransportLayerGetsockoption(PRFileDesc *f, PRSocketOptionData *opt) {
   switch (opt->option) {
     case PR_SockOpt_Nonblocking:
-      opt->value.non_blocking = true;
+      opt->value.non_blocking = PR_TRUE;
       return PR_SUCCESS;
     default:
       UNIMPLEMENTED;
       break;
   }
 
   return PR_FAILURE;
 }
@@ -476,23 +476,23 @@ bool TransportLayerDtls::Setup() {
                                 identity_->privkey(),
                                 kt_rsa);
     if (rv != SECSuccess) {
       MOZ_MTLOG(PR_LOG_ERROR, "Couldn't set identity");
       return false;
     }
 
     // Insist on a certificate from the client
-    rv = SSL_OptionSet(ssl_fd, SSL_REQUEST_CERTIFICATE, true);
+    rv = SSL_OptionSet(ssl_fd, SSL_REQUEST_CERTIFICATE, PR_TRUE);
     if (rv != SECSuccess) {
       MOZ_MTLOG(PR_LOG_ERROR, "Couldn't request certificate");
       return false;
     }
 
-    rv = SSL_OptionSet(ssl_fd, SSL_REQUIRE_CERTIFICATE, true);
+    rv = SSL_OptionSet(ssl_fd, SSL_REQUIRE_CERTIFICATE, PR_TRUE);
     if (rv != SECSuccess) {
       MOZ_MTLOG(PR_LOG_ERROR, "Couldn't require certificate");
       return false;
     }
   }
 
   // Require TLS 1.1. Perhaps some day in the future we will allow
   // TLS 1.0 for stream modes.
@@ -502,47 +502,47 @@ bool TransportLayerDtls::Setup() {
   };
 
   rv = SSL_VersionRangeSet(ssl_fd, &version_range);
   if (rv != SECSuccess) {
     MOZ_MTLOG(PR_LOG_ERROR, "Can't disable SSLv3");
     return false;
   }
 
-  rv = SSL_OptionSet(ssl_fd, SSL_ENABLE_SESSION_TICKETS, false);
+  rv = SSL_OptionSet(ssl_fd, SSL_ENABLE_SESSION_TICKETS, PR_FALSE);
   if (rv != SECSuccess) {
     MOZ_MTLOG(PR_LOG_ERROR, "Couldn't disable session tickets");
     return false;
   }
 
-  rv = SSL_OptionSet(ssl_fd, SSL_NO_CACHE, true);
+  rv = SSL_OptionSet(ssl_fd, SSL_NO_CACHE, PR_TRUE);
   if (rv != SECSuccess) {
     MOZ_MTLOG(PR_LOG_ERROR, "Couldn't disable session caching");
     return false;
   }
 
-  rv = SSL_OptionSet(ssl_fd, SSL_ENABLE_DEFLATE, false);
+  rv = SSL_OptionSet(ssl_fd, SSL_ENABLE_DEFLATE, PR_FALSE);
   if (rv != SECSuccess) {
     MOZ_MTLOG(PR_LOG_ERROR, "Couldn't disable deflate");
     return false;
   }
 
   rv = SSL_OptionSet(ssl_fd, SSL_ENABLE_RENEGOTIATION, SSL_RENEGOTIATE_NEVER);
   if (rv != SECSuccess) {
     MOZ_MTLOG(PR_LOG_ERROR, "Couldn't disable renegotiation");
     return false;
   }
 
-  rv = SSL_OptionSet(ssl_fd, SSL_ENABLE_FALSE_START, false);
+  rv = SSL_OptionSet(ssl_fd, SSL_ENABLE_FALSE_START, PR_FALSE);
   if (rv != SECSuccess) {
     MOZ_MTLOG(PR_LOG_ERROR, "Couldn't disable false start");
     return false;
   }
 
-  rv = SSL_OptionSet(ssl_fd, SSL_NO_LOCKS, true);
+  rv = SSL_OptionSet(ssl_fd, SSL_NO_LOCKS, PR_TRUE);
   if (rv != SECSuccess) {
     MOZ_MTLOG(PR_LOG_ERROR, "Couldn't disable locks");
     return false;
   }
 
   // Set the SRTP ciphers
   if (srtp_ciphers_.size()) {
     // Note: std::vector is guaranteed to contiguous
@@ -559,17 +559,17 @@ bool TransportLayerDtls::Setup() {
   rv = SSL_AuthCertificateHook(ssl_fd, AuthCertificateHook,
                                reinterpret_cast<void *>(this));
   if (rv != SECSuccess) {
     MOZ_MTLOG(PR_LOG_ERROR, "Couldn't set certificate validation hook");
     return false;
   }
 
   // Now start the handshake
-  rv = SSL_ResetHandshake(ssl_fd, role_ == SERVER ? true : false);
+  rv = SSL_ResetHandshake(ssl_fd, role_ == SERVER ? PR_TRUE : PR_FALSE);
   if (rv != SECSuccess) {
     MOZ_MTLOG(PR_LOG_ERROR, "Couldn't reset handshake");
     return false;
   }
   ssl_fd_ = ssl_fd.forget();
 
   // Finally, get ready to receive data
   downward_->SignalStateChange.connect(this, &TransportLayerDtls::StateChange);
--- a/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp
+++ b/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp
@@ -365,25 +365,25 @@ WebrtcAudioConduit::SendAudioFrame(const
   //    Similarly for 32000 sampling rate, valid block length is 320
   //    We do the check by the verify modular operator below to be zero
 
   if(!audio_data || (lengthSamples <= 0) ||
                     (IsSamplingFreqSupported(samplingFreqHz) == false) ||
                     ((lengthSamples % (samplingFreqHz / 100) != 0)) )
   {
     CSFLogError(logTag, "%s Invalid Params ", __FUNCTION__);
-    MOZ_ASSERT(false);
+    MOZ_ASSERT(PR_FALSE);
     return kMediaConduitMalformedArgument;
   }
 
   //validate capture time
   if(capture_delay < 0 )
   {
     CSFLogError(logTag,"%s Invalid Capture Delay ", __FUNCTION__);
-    MOZ_ASSERT(false);
+    MOZ_ASSERT(PR_FALSE);
     return kMediaConduitMalformedArgument;
   }
 
   // if transmission is not started .. conduit cannot insert frames
   if(!mEngineTransmitting)
   {
     CSFLogError(logTag, "%s Engine not transmitting ", __FUNCTION__);
     return kMediaConduitSessionNotInited;
@@ -417,33 +417,33 @@ WebrtcAudioConduit::GetAudioFrame(int16_
 
   CSFLogDebug(logTag,  "%s ", __FUNCTION__);
   unsigned int numSamples = 0;
 
   //validate params
   if(!speechData )
   {
     CSFLogError(logTag,"%s Null Audio Buffer Pointer", __FUNCTION__);
-    MOZ_ASSERT(false);
+    MOZ_ASSERT(PR_FALSE);
     return kMediaConduitMalformedArgument;
   }
 
   // Validate sample length
   if((numSamples = GetNum10msSamplesForFrequency(samplingFreqHz)) == 0  )
   {
     CSFLogError(logTag,"%s Invalid Sampling Frequency ", __FUNCTION__);
-    MOZ_ASSERT(false);
+    MOZ_ASSERT(PR_FALSE);
     return kMediaConduitMalformedArgument;
   }
 
   //validate capture time
   if(capture_delay < 0 )
   {
     CSFLogError(logTag,"%s Invalid Capture Delay ", __FUNCTION__);
-    MOZ_ASSERT(false);
+    MOZ_ASSERT(PR_FALSE);
     return kMediaConduitMalformedArgument;
   }
 
   //Conduit should have reception enabled before we ask for decoded
   // samples
   if(!mEngineReceiving)
   {
     CSFLogError(logTag, "%s Engine not Receiving ", __FUNCTION__);
--- a/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
+++ b/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
@@ -193,17 +193,17 @@ MediaConduitErrorCode
 WebrtcVideoConduit::AttachRenderer(mozilla::RefPtr<VideoRenderer> aVideoRenderer)
 {
   CSFLogDebug(logTag,  "%s ", __FUNCTION__);
 
   //null renderer
   if(!aVideoRenderer)
   {
     CSFLogError(logTag, "%s NULL Renderer", __FUNCTION__);
-    MOZ_ASSERT(false);
+    MOZ_ASSERT(PR_FALSE);
     return kMediaConduitInvalidRenderer;
   }
   //Assign the new renderer - overwrites if there is already one
   mRenderer = aVideoRenderer;
 
   //Start Rendering if we haven't already
   if(!mEngineRendererStarted)
   {
@@ -222,17 +222,17 @@ WebrtcVideoConduit::AttachRenderer(mozil
 
 MediaConduitErrorCode
 WebrtcVideoConduit::AttachTransport(mozilla::RefPtr<TransportInterface> aTransport)
 {
   CSFLogDebug(logTag,  "%s ", __FUNCTION__);
   if(!aTransport)
   {
     CSFLogError(logTag, "%s NULL Transport ", __FUNCTION__);
-    MOZ_ASSERT(false);
+    MOZ_ASSERT(PR_FALSE);
     return kMediaConduitInvalidTransport;
   }
   //Assign the transport
   mTransport = aTransport;
   return kMediaConduitNoError;
 }
 
 /**
@@ -443,24 +443,24 @@ WebrtcVideoConduit::SendVideoFrame(unsig
 
   CSFLogDebug(logTag,  "%s ", __FUNCTION__);
 
   //check for  the parameters sanity
   if(!video_frame || video_frame_length == 0 ||
                      width == 0 || height == 0)
   {
     CSFLogError(logTag,  "%s Invalid Parameters ",__FUNCTION__);
-    MOZ_ASSERT(false);
+    MOZ_ASSERT(PR_FALSE);
     return kMediaConduitMalformedArgument;
   }
 
   if(video_type != kVideoI420)
   {
     CSFLogError(logTag,  "%s VideoType Invalid. Only 1420 Supported",__FUNCTION__);
-    MOZ_ASSERT(false);
+    MOZ_ASSERT(PR_FALSE);
     return kMediaConduitMalformedArgument;
   }
   //Transmission should be enabled before we insert any frames.
   if(!mEngineTransmitting)
   {
     CSFLogError(logTag, "%s Engine not transmitting ", __FUNCTION__);
     return kMediaConduitSessionNotInited;
   }
--- a/media/webrtc/signaling/src/media/VcmSIPCCBinding.cpp
+++ b/media/webrtc/signaling/src/media/VcmSIPCCBinding.cpp
@@ -643,17 +643,17 @@ void vcmGetIceParams(const char *peercon
       if (!pwd)
         return;
       sstrncpy(pwd, attrs[i].c_str(), attrs[i].size() + 1);
       pwd[attrs[i].size()] = 0;
     }
 
   }
   if (!ufrag || !pwd) {
-    MOZ_ASSERT(false);
+    MOZ_ASSERT(PR_FALSE);
     cpr_free(ufrag);
     cpr_free(pwd);
     CSFLogDebug( logTag, "%s: no ufrag or password", __FUNCTION__);
     return;
   }
 
   *ufragp = ufrag;
   *pwdp = pwd;
@@ -1180,17 +1180,17 @@ int vcmRxStartICE(cc_mcapid_t mcap_id,
       return VCM_ERROR;
   }
 
   // Find the stream we need
   nsRefPtr<sipcc::RemoteSourceStreamInfo> stream =
     pc->impl()->GetRemoteStream(pc_stream_id);
   if (!stream) {
     // This should never happen
-    PR_ASSERT(false);
+    PR_ASSERT(PR_FALSE);
     return VCM_ERROR;
   }
   // Create the transport flows
   mozilla::RefPtr<TransportFlow> rtp_flow =
       vcmCreateTransportFlow(pc->impl(), level, false,
                              fingerprint_alg, fingerprint);
   if (!rtp_flow) {
       CSFLogError( logTag, "Could not create RTP flow");
@@ -1213,17 +1213,17 @@ int vcmRxStartICE(cc_mcapid_t mcap_id,
       return VCM_ERROR;
 
     mozilla::AudioCodecConfig *config_raw;
 
     for(int i=0; i <num_payloads ; i++)
     {
       int ret = vcmPayloadType2AudioCodec(payloads[i], &config_raw);
       if (ret) {
-       PR_ASSERT(false);
+       PR_ASSERT(PR_FALSE);
        return VCM_ERROR;
       }
       configs.push_back(config_raw);
     }
 
     if (conduit->ConfigureRecvMediaCodecs(configs))
       return VCM_ERROR;
 
@@ -1245,17 +1245,17 @@ int vcmRxStartICE(cc_mcapid_t mcap_id,
       return VCM_ERROR;
 
     mozilla::VideoCodecConfig *config_raw;
 
     for(int i=0; i <num_payloads; i++)
     {
       int ret = vcmPayloadType2VideoCodec(payloads[i], &config_raw);
       if (ret) {
-       PR_ASSERT(false);
+       PR_ASSERT(PR_FALSE);
        return VCM_ERROR;
       }
       configs.push_back(config_raw);
     }
 
     if (conduit->ConfigureRecvMediaCodecs(configs))
       return VCM_ERROR;
 
@@ -2359,21 +2359,21 @@ static int vcmPayloadType2AudioCodec(vcm
       //ilBC 30ms sample
       *config = new mozilla::AudioCodecConfig(wire_payload, "iLBC", 8000, 240, 1, 13300);
       break;
     case VCM_Media_Payload_G722_64k:
     case VCM_Media_Payload_G722_56k:
       //TODO: Check with Ekr, Derf if 64k and 56K are valid frequency rates for G722.1
       // or G722.2
       CSFLogError(logTag, "vcmPayloadType2AudioCodec Codec Not Implemented !");
-      PR_ASSERT(false);
+      PR_ASSERT(PR_FALSE);
       return VCM_ERROR;
     default:
       CSFLogError(logTag, "vcmPayloadType2AudioCodec unknown codec. Apparent internal error");
-      PR_ASSERT(false);
+      PR_ASSERT(PR_FALSE);
       return VCM_ERROR;
   }
 
   return 0;
 }
 
 static int vcmPayloadType2VideoCodec(vcm_media_payload_type_t payload_in,
                               mozilla::VideoCodecConfig **config) {
@@ -2396,17 +2396,17 @@ static int vcmPayloadType2VideoCodec(vcm
     case VCM_Media_Payload_I420:
       *config = new mozilla::VideoCodecConfig(wire_payload, "I420", 176, 144);
       break;
     case VCM_Media_Payload_VP8:
       *config = new mozilla::VideoCodecConfig(wire_payload, "VP8", 640, 480);
       break;
     default:
       CSFLogError(logTag, "vcmPayloadType2VideoCodec unknown codec. Apparent internal error");
-      PR_ASSERT(false);
+      PR_ASSERT(PR_FALSE);
       return VCM_ERROR;
   }
   return 0;
 }
 
 
 
 static mozilla::RefPtr<TransportFlow>
--- a/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp
+++ b/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp
@@ -550,17 +550,17 @@ void MediaPipelineTransmit::ProcessAudio
   // TODO(ekr@rtfm.com): Do more than one channel
   nsAutoArrayPtr<int16_t> samples(new int16_t[chunk.mDuration]);
 
   if (chunk.mBuffer) {
     switch(chunk.mBufferFormat) {
       case nsAudioStream::FORMAT_U8:
       case nsAudioStream::FORMAT_FLOAT32:
         MOZ_MTLOG(PR_LOG_ERROR, "Can't process audio except in 16-bit PCM yet");
-        MOZ_ASSERT(false);
+        MOZ_ASSERT(PR_FALSE);
         return;
         break;
       case nsAudioStream::FORMAT_S16:
         {
           // Code based on nsAudioStream
           const short* buf = static_cast<const short *>(chunk.mBuffer->Data());
 
           int32_t volume = int32_t((1 << 16) * chunk.mVolume);
@@ -569,17 +569,17 @@ void MediaPipelineTransmit::ProcessAudio
 #if defined(IS_BIG_ENDIAN)
             s = ((s & 0x00ff) << 8) | ((s & 0xff00) >> 8);
 #endif
             samples[i] = short((int32_t(s) * volume) >> 16);
           }
         }
         break;
       default:
-        MOZ_ASSERT(false);
+        MOZ_ASSERT(PR_FALSE);
         return;
         break;
     }
   } else {
     // This means silence.
     for (uint32_t i = 0; i < chunk.mDuration; ++i) {
       samples[i] = 0;
     }
@@ -599,17 +599,17 @@ void MediaPipelineTransmit::ProcessVideo
     // segment.AppendFrame() allows null images, which show up here as null
     return;
   }
 
   ImageFormat format = img->GetFormat();
 
   if (format != PLANAR_YCBCR) {
     MOZ_MTLOG(PR_LOG_ERROR, "Can't process non-YCBCR video");
-    MOZ_ASSERT(false);
+    MOZ_ASSERT(PR_FALSE);
     return;
   }
 
   // Cast away constness b/c some of the accessors are non-const
   layers::PlanarYCbCrImage* yuv =
     const_cast<layers::PlanarYCbCrImage *>(
       static_cast<const layers::PlanarYCbCrImage *>(img));
 
--- a/media/webrtc/signaling/src/mediapipeline/SrtpFlow.cpp
+++ b/media/webrtc/signaling/src/mediapipeline/SrtpFlow.cpp
@@ -220,24 +220,24 @@ void SrtpFlow::srtp_event_handler(srtp_e
   MOZ_CRASH();
 }
 
 nsresult SrtpFlow::Init() {
   if (!initialized) {
     err_status_t r = srtp_init();
     if (r != err_status_ok) {
       MOZ_MTLOG(PR_LOG_ERROR, "Could not initialize SRTP");
-      MOZ_ASSERT(false);
+      MOZ_ASSERT(PR_FALSE);
       return NS_ERROR_FAILURE;
     }
 
     r = srtp_install_event_handler(&SrtpFlow::srtp_event_handler);
     if (r != err_status_ok) {
       MOZ_MTLOG(PR_LOG_ERROR, "Could not install SRTP event handler");
-      MOZ_ASSERT(false);
+      MOZ_ASSERT(PR_FALSE);
       return NS_ERROR_FAILURE;
     }
 
     initialized = true;
   }
 
   return NS_OK;
 }
--- a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
+++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
@@ -206,17 +206,17 @@ public:
                 stream = remoteStream->GetMediaStream();
                 hint = stream->GetHintContents();
                 if (hint == nsDOMMediaStream::HINT_CONTENTS_AUDIO) {
                   mObserver->OnAddStream(stream, "audio");
                 } else if (hint == nsDOMMediaStream::HINT_CONTENTS_VIDEO) {
                   mObserver->OnAddStream(stream, "video");
                 } else {
                   CSFLogErrorS(logTag, __FUNCTION__ << "Audio & Video not supported");
-                  MOZ_ASSERT(false);
+                  MOZ_ASSERT(PR_FALSE);
                 }
               }
               break;
             }
             default:
               CSFLogDebugS(logTag, ": **** UNHANDLED CALL STATE : " << statestr);
               break;
           }
--- a/media/webrtc/signaling/test/FakeMediaStreamsImpl.h
+++ b/media/webrtc/signaling/test/FakeMediaStreamsImpl.h
@@ -11,17 +11,17 @@
 #include "nsError.h"
 
 NS_IMPL_THREADSAFE_ISUPPORTS1(Fake_nsDOMMediaStream, nsIDOMMediaStream)
 
 // DOM Media stream
 NS_IMETHODIMP
 Fake_nsDOMMediaStream::GetCurrentTime(double *aCurrentTime)
 {
-  PR_ASSERT(false);
+  PR_ASSERT(PR_FALSE);
 
   *aCurrentTime = 0;
   return NS_OK;
 }
 
 // Fake_SourceMediaStream
 nsresult Fake_SourceMediaStream::Start() {
   mTimer = do_CreateInstance(NS_TIMER_CONTRACTID);
--- a/modules/libmar/verify/cryptox.h
+++ b/modules/libmar/verify/cryptox.h
@@ -31,17 +31,17 @@ CryptoX_Result NSS_VerifySignature(VFYCo
 #define CryptoX_SignatureHandle VFYContext *
 #define CryptoX_PublicKey SECKEYPublicKey *
 #define CryptoX_Certificate CERTCertificate *
 #define CryptoX_InitCryptoProvider(CryptoHandle) \
   CryptoX_Success
 #define CryptoX_VerifyBegin(CryptoHandle, SignatureHandle, PublicKey) \
   NSS_VerifyBegin(SignatureHandle, PublicKey)
 #define CryptoX_FreeSignatureHandle(SignatureHandle) \
-  VFY_DestroyContext(SignatureHandle, true)
+  VFY_DestroyContext(SignatureHandle, PR_TRUE)
 #define CryptoX_VerifyUpdate(SignatureHandle, buf, len) \
   VFY_Update(*SignatureHandle, (const unsigned char*)(buf), len)
 #define CryptoX_LoadPublicKey(CryptoHandle, certData, dataSize, \
                               publicKey, certName, cert) \
   NSS_LoadPublicKey(certName, publicKey, cert)
 #define CryptoX_VerifySignature(hash, publicKey, signedData, len) \
   NSS_VerifySignature(hash, (const unsigned char *)(signedData), len)
 #define CryptoX_FreePublicKey(key) \
--- a/netwerk/cache/nsDiskCacheStreams.cpp
+++ b/netwerk/cache/nsDiskCacheStreams.cpp
@@ -387,17 +387,17 @@ nsDiskCacheStreamIO::CloseInternal()
 
     if (mOutputStreamIsOpen) {
         if (!mBinding) {    // if we're severed, just clear member variables
             NS_ASSERTION(!mBufDirty, "oops");
         } else {
             nsresult rv = Flush();
             NS_ENSURE_SUCCESS(rv, rv);
         }
-        mOutputStreamIsOpen = false;
+        mOutputStreamIsOpen = PR_FALSE;
     }
 
     // Make sure to always close the FileDescriptor
     if (mFD) {
         (void) PR_Close(mFD);
         mFD = nullptr;
     }
 
--- a/netwerk/mime/nsIMIMEInfo.idl
+++ b/netwerk/mime/nsIMIMEInfo.idl
@@ -167,17 +167,17 @@ interface nsIMIMEInfo : nsIHandlerInfo {
      * @deprecated  use nsIHandlerInfo::type instead.
      */
     readonly attribute ACString MIMEType;
 
     /**
      * Returns whether or not these two nsIMIMEInfos are logically
      * equivalent.
      *
-     * @returns true if the two are considered equal
+     * @returns PR_TRUE if the two are considered equal
      */
     boolean equals(in nsIMIMEInfo aMIMEInfo);
 
     /** 
      * Returns a list of nsILocalHandlerApp objects containing
      * handlers associated with this mimeinfo. Implemented per 
      * platform using information in this object to generate the
      * best list. Typically used for an "open with" style user 
--- a/netwerk/protocol/file/nsFileChannel.cpp
+++ b/netwerk/protocol/file/nsFileChannel.cpp
@@ -251,17 +251,17 @@ nsFileChannel::nsFileChannel(nsIURI *uri
   nsCOMPtr<nsIFile> resolvedFile;
   bool symLink;
   nsCOMPtr<nsIFileURL> fileURL = do_QueryInterface(uri);
   if (fileURL && 
       NS_SUCCEEDED(fileURL->GetFile(getter_AddRefs(file))) &&
       NS_SUCCEEDED(file->IsSymlink(&symLink)) && 
       symLink &&
       NS_SUCCEEDED(file->GetNativeTarget(fileTarget)) &&
-      NS_SUCCEEDED(NS_NewNativeLocalFile(fileTarget, true, 
+      NS_SUCCEEDED(NS_NewNativeLocalFile(fileTarget, PR_TRUE, 
                                          getter_AddRefs(resolvedFile))) &&
       NS_SUCCEEDED(NS_NewFileURI(getter_AddRefs(targetURI), 
                    resolvedFile, nullptr))) {
     SetURI(targetURI);
     SetOriginalURI(uri);
     nsLoadFlags loadFlags = 0;
     GetLoadFlags(&loadFlags);
     SetLoadFlags(loadFlags | nsIChannel::LOAD_REPLACE);
--- a/netwerk/protocol/http/nsIHttpAuthenticableChannel.idl
+++ b/netwerk/protocol/http/nsIHttpAuthenticableChannel.idl
@@ -15,17 +15,17 @@ interface nsIHttpAuthenticableChannel : 
 {
     /**
      * If the channel being authenticated is using SSL.
      */
     readonly attribute boolean isSSL;
     
     /**
      * Returns if the proxy HTTP method used is CONNECT. If no proxy is being
-     * used it must return false.
+     * used it must return PR_FALSE.
      */
     readonly attribute boolean proxyMethodIsConnect;
 
     /**
      * Cancels the current request. See nsIRequest.
      */
     void cancel(in nsresult aStatus);
 
--- a/security/manager/ssl/src/SSLServerCertVerification.cpp
+++ b/security/manager/ssl/src/SSLServerCertVerification.cpp
@@ -1097,21 +1097,21 @@ SSLServerCertVerificationJob::Run()
 SECStatus
 AuthCertificateHook(void *arg, PRFileDesc *fd, PRBool checkSig, PRBool isServer)
 {
   // Runs on the socket transport thread
 
   PR_LOG(gPIPNSSLog, PR_LOG_DEBUG,
          ("[%p] starting AuthCertificateHook\n", fd));
 
-  // Modern libssl always passes true for checkSig, and we have no means of
+  // Modern libssl always passes PR_TRUE for checkSig, and we have no means of
   // doing verification without checking signatures.
   NS_ASSERTION(checkSig, "AuthCertificateHook: checkSig unexpectedly false");
 
-  // PSM never causes libssl to call this function with true for isServer,
+  // PSM never causes libssl to call this function with PR_TRUE for isServer,
   // and many things in PSM assume that we are a client.
   NS_ASSERTION(!isServer, "AuthCertificateHook: isServer unexpectedly true");
 
   nsNSSSocketInfo *socketInfo = static_cast<nsNSSSocketInfo*>(arg);
   
   if (socketInfo) {
     // This is the first callback during full handshakes.
     socketInfo->SetFirstServerHelloReceived();
--- a/toolkit/components/places/AsyncFaviconHelpers.h
+++ b/toolkit/components/places/AsyncFaviconHelpers.h
@@ -52,17 +52,17 @@ enum AsyncFaviconFetchMode {
 struct IconData
 {
   IconData()
   : id(0)
   , expiration(0)
   , fetchMode(FETCH_NEVER)
   , status(ICON_STATUS_UNKNOWN)
   {
-    guid.SetIsVoid(true);
+    guid.SetIsVoid(PR_TRUE);
   }
 
   int64_t id;
   nsCString spec;
   nsCString data;
   nsCString mimeType;
   PRTime expiration;
   enum AsyncFaviconFetchMode fetchMode;
--- a/toolkit/identity/IdentityCryptoService.cpp
+++ b/toolkit/identity/IdentityCryptoService.cpp
@@ -367,18 +367,18 @@ MOZ_WARN_UNUSED_RESULT nsresult
 GenerateKeyPair(PK11SlotInfo * slot,
                 SECKEYPrivateKey ** privateKey,
                 SECKEYPublicKey ** publicKey,
                 CK_MECHANISM_TYPE mechanism,
                 void * params)
 {
   *publicKey = NULL;
   *privateKey = PK11_GenerateKeyPair(slot, mechanism, params, publicKey,
-                                     false /*isPerm*/,
-                                     true /*isSensitive*/,
+                                     PR_FALSE /*isPerm*/,
+                                     PR_TRUE /*isSensitive*/,
                                      NULL /*&pwdata*/);
   if (!*privateKey) {
     MOZ_ASSERT(!*publicKey);
     return PRErrorCode_to_nsresult(PR_GetError());
   }
   if (!*publicKey) {
 	SECKEY_DestroyPrivateKey(*privateKey);
 	*privateKey = NULL;
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -2664,17 +2664,17 @@ static void MOZ_gdk_display_close(GdkDis
  *
  * Since most applications (e.g. Firefox and Thunderbird) don't use any special
  * allocators and therefore don't define this symbol, NSPR must search the
  * entire process, which reduces startup performance.
  *
  * By defining the symbol here, we can avoid the wasted lookup and hopefully
  * improve startup performance.
  */
-NS_VISIBILITY_DEFAULT PRBool nspr_use_zone_allocator = false;
+NS_VISIBILITY_DEFAULT PRBool nspr_use_zone_allocator = PR_FALSE;
 
 #ifdef CAIRO_HAS_DWRITE_FONT
 
 #include <dwrite.h>
 
 typedef HRESULT (WINAPI*DWriteCreateFactoryFunc)(
   DWRITE_FACTORY_TYPE factoryType,
   REFIID iid,
--- a/toolkit/xre/nsINativeAppSupport.idl
+++ b/toolkit/xre/nsINativeAppSupport.idl
@@ -24,38 +24,38 @@
  * in nsAppRunner.cpp
  *
  * The interface provides these functions:
  *  start - You call this to inform the native app support that the  
  *          application is starting.  In addition, it serves as a
  *          query as to whether the application should continue to
  *          run.
  *
- *          If the returned boolean result is false, then the
+ *          If the returned boolean result is PR_FALSE, then the
  *          application should exit without further processing.  In
  *          such cases, the returned nsresult indicates whether the
  *          reason to exit is due to an error or not.
  *
  *          Win32 Note: In the case of starting a second instance
  *                      of this executable, this function will return
- *                      false and nsresult==NS_OK.  This means that
+ *                      PR_FALSE and nsresult==NS_OK.  This means that
  *                      the command line arguments have been
  *                      successfully passed to the instance of the
  *                      application acting as a DDE server.
  *
  *  stop - You call this to inform the native app support that the
  *         application *wishes* to terminate.  If the returned boolean
- *         value is false, then the application should continue
+ *         value is PR_FALSE, then the application should continue
  *         (as if there were still additional top-level windows open).
  *         
  *         Win32 Note: If this is the instance of the application
  *                     acting as the DDE server, and there are current
  *                     DDE conversations active with other instances
  *                     acting as DDE clients, then this function will
- *                     return false.
+ *                     return PR_FALSE.
  * 
  *  quit - Like Stop, but this method *forces* termination (or more 
  *         precisely, indicates that the application is about to be
  *         terminated regardless of what a call to Stop might have
  *         returned.
  *
  *         This method is intended to be called when the user selects
  *         the "Quit" option (close all windows and exit).
--- a/tools/trace-malloc/lib/nsTraceMalloc.h
+++ b/tools/trace-malloc/lib/nsTraceMalloc.h
@@ -130,17 +130,17 @@ typedef struct nsTMStats {
 PR_EXTERN(void) NS_TraceMallocStartup(int logfd);
 
 /**
  * Initialize malloc tracing, using the ``standard'' startup arguments.
  */
 PR_EXTERN(int) NS_TraceMallocStartupArgs(int argc, char* argv[]);
 
 /**
- * Return true iff |NS_TraceMallocStartup[Args]| has been successfully called.
+ * Return PR_TRUE iff |NS_TraceMallocStartup[Args]| has been successfully called.
  */
 PR_EXTERN(PRBool) NS_TraceMallocHasStarted(void);
 
 /**
  * Stop all malloc tracing, flushing any buffered events to the logfile.
  */
 PR_EXTERN(void) NS_TraceMallocShutdown(void);
 
--- a/tools/trace-malloc/spacetrace.h
+++ b/tools/trace-malloc/spacetrace.h
@@ -503,17 +503,17 @@ typedef struct __struct_STContextCacheIt
 **                      decide to evict this context.
 **                  Should this item not be 0, once it reaches
 **                      zero a condition variable in the context cache
 **                      will be signaled to notify the availability.
 **  mLastAccessed   A timestamp of when this item was last accessed/released.
 **                  Ignore this unless the reference count is 0,
 **                  This is used to evict the oldest unused item from
 **                      the context cache.
-**  mInUse          Mainly false only at the beginning of the process,
+**  mInUse          Mainly PR_FALSE only at the beginning of the process,
 **                      but this indicates that the item has not yet been
 **                      used at all, and thus shouldn't be evaluated for
 **                      a cache hit.
 */
 {
     STOptions mOptions;
     STContext mContext;
     int32_t mReferenceCount;
--- a/widget/cocoa/TextInputHandler.mm
+++ b/widget/cocoa/TextInputHandler.mm
@@ -810,17 +810,17 @@ TISInputSourceWrapper::InitKeyEvent(NSEv
     // the ASCII capable keyboard layout.
     // NOTE: Such keyboard layouts typically change the layout to its ASCII
     //       capable layout when Command key is pressed.  And we don't worry
     //       when Control key is pressed too because it causes inputting
     //       control characters.
     if (!aKeyEvent.IsMeta() && !aKeyEvent.IsControl() && IsOpenedIMEMode()) {
       UInt32 state =
         nsCocoaUtils::ConvertToCarbonModifier([aNativeKeyEvent modifierFlags]);
-      uint32_t ch = TranslateToChar(nativeKeyCode, state, kbType);
+      PRUint32 ch = TranslateToChar(nativeKeyCode, state, kbType);
       if (ch) {
         insertString = ch;
       }
     } else {
       // If the caller isn't sure what string will be input, let's use
       // characters of NSEvent.
       nsCocoaUtils::GetStringForNSString([aNativeKeyEvent characters],
                                          insertString);
--- a/widget/nsIAppShell.idl
+++ b/widget/nsIAppShell.idl
@@ -27,23 +27,23 @@ interface nsIAppShell : nsISupports
 
   /**
    * Give hint to native event queue notification mechanism. If the native
    * platform needs to tradeoff performance vs. native event starvation this
    * hint tells the native dispatch code which to favor.  The default is to
    * prevent native event starvation.
    *
    * Calls to this function may be nested. When the number of calls that pass
-   * true is subtracted from the number of calls that pass false is
+   * PR_TRUE is subtracted from the number of calls that pass PR_FALSE is
    * greater than 0, performance is given precedence over preventing event
    * starvation.
    *
    * The starvationDelay arg is only used when favorPerfOverStarvation is
-   * false. It is the amount of time in milliseconds to wait before the
-   * false actually takes effect.
+   * PR_FALSE. It is the amount of time in milliseconds to wait before the
+   * PR_FALSE actually takes effect.
    */
   void favorPerformanceHint(in boolean favorPerfOverStarvation,
                             in unsigned long starvationDelay);
 
   /**
    * Suspends the use of additional platform-specific methods (besides the
    * nsIAppShell->run() event loop) to run Gecko events on the main
    * application thread.  Under some circumstances these "additional methods"
--- a/xpcom/components/nsIFactory.idl
+++ b/xpcom/components/nsIFactory.idl
@@ -29,17 +29,17 @@ interface nsIFactory :  nsISupports {
     *         NS_ERROR* - Method failure.
     */
     void createInstance(in nsISupports aOuter, in nsIIDRef iid,
                       [retval, iid_is(iid)] out nsQIResult result);
 
    /**
     * LockFactory provides the client a way to keep the component
     * in memory until it is finished with it. The client can call
-    * LockFactory(true) to lock the factory and LockFactory(false)
+    * LockFactory(PR_TRUE) to lock the factory and LockFactory(PR_FALSE)
     * to release the factory.	 
     *
-    * @param lock - Must be true or false
+    * @param lock - Must be PR_TRUE or PR_FALSE
     * @return NS_OK - If the lock operation was successful.
     *         NS_ERROR* - Method failure.
     */
     void lockFactory(in boolean lock);
 };
--- a/xpcom/components/nsIModule.idl
+++ b/xpcom/components/nsIModule.idl
@@ -64,19 +64,19 @@ interface nsIModule : nsISupports
                         in string  aLoaderStr);
 
    /** 
     * Module load management
     * 
     * @param aCompMgr  : The global component manager
     *
     * @return indicates to the caller if the module can be unloaded.
-    * 		Returning true isn't a guarantee that the module will be
+    * 		Returning PR_TRUE isn't a guarantee that the module will be
     *		unloaded. It constitues only willingness of the module to be
     *		unloaded.  It is very important to ensure that no outstanding 
     *       references to the module's code/data exist before returning 
-    *       true. 
-    *		Returning false guaratees that the module won't be unloaded.
+    *       PR_TRUE. 
+    *		Returning PR_FALSE guaratees that the module won't be unloaded.
     */
     boolean canUnload(in nsIComponentManager aCompMgr);
 };
 
 
--- a/xpcom/ds/nsISimpleEnumerator.idl
+++ b/xpcom/ds/nsISimpleEnumerator.idl
@@ -20,25 +20,25 @@ interface nsISimpleEnumerator : nsISuppo
    * Called to determine whether or not the enumerator has
    * any elements that can be returned via getNext(). This method
    * is generally used to determine whether or not to initiate or
    * continue iteration over the enumerator, though it can be
    * called without subsequent getNext() calls. Does not affect
    * internal state of enumerator.
    *
    * @see getNext()
-   * @return true if there are remaining elements in the enumerator.
-   *         false if there are no more elements in the enumerator.
+   * @return PR_TRUE if there are remaining elements in the enumerator.
+   *         PR_FALSE if there are no more elements in the enumerator.
    */                                            
   boolean hasMoreElements();
 
   /**
    * Called to retrieve the next element in the enumerator. The "next"
    * element is the first element upon the first call. Must be
-   * pre-ceeded by a call to hasMoreElements() which returns true.
+   * pre-ceeded by a call to hasMoreElements() which returns PR_TRUE.
    * This method is generally called within a loop to iterate over
    * the elements in the enumerator.
    *
    * @see hasMoreElements()
    * @return NS_OK if the call succeeded in returning a non-null
    *               value through the out parameter.
    *         NS_ERROR_FAILURE if there are no more elements
    *                          to enumerate.
--- a/xpcom/ds/nsISupportsArray.idl
+++ b/xpcom/ds/nsISupportsArray.idl
@@ -27,17 +27,17 @@ class nsISupportsArray;
     0xbda17d50,                                      \
     0x0d6b,                                          \
     0x11d3,                                          \
     {0x93, 0x31, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
 }
 #define NS_SUPPORTSARRAY_CONTRACTID "@mozilla.org/supports-array;1"
 #define NS_SUPPORTSARRAY_CLASSNAME "Supports Array"
  
-// Enumerator callback function. Return false to stop
+// Enumerator callback function. Return PR_FALSE to stop
 typedef bool (*nsISupportsArrayEnumFunc)(nsISupports* aElement, void *aData);
  
 nsresult
 NS_NewArrayEnumerator(nsISimpleEnumerator* *result,
                       nsISupportsArray* array);
 %}
 
 [scriptable, uuid(791eafa0-b9e6-11d1-8031-006008159b5a)]
--- a/xpcom/io/nsIFile.idl
+++ b/xpcom/io/nsIFile.idl
@@ -165,17 +165,17 @@ interface nsIFile : nsISupports
      *       the file to be moved. This param may be empty, in
      *       which case the current leaf name will be used.
      */
     void moveTo(in nsIFile newParentDir, in AString newName);
     [noscript] void moveToNative(in nsIFile newParentDir, in ACString newName);
 
     /**
      *  This will try to delete this file.  The 'recursive' flag
-     *  must be true to delete directories which are not empty.
+     *  must be PR_TRUE to delete directories which are not empty.
      *
      *  This will not resolve any symlinks.
      */
     void remove(in boolean recursive);
 
     /**
      *  Attributes of nsIFile.
      */
--- a/xpcom/threads/nsIEnvironment.idl
+++ b/xpcom/threads/nsIEnvironment.idl
@@ -42,14 +42,14 @@ interface nsIEnvironment : nsISupports
      * An environment variable does not exist when |getenv()| returns NULL.
      * - For non-Unix/Linux platforms we have to fall back to a 
      * "portable" definition (which is incorrect for Unix/Linux!!!!)
      * which simply checks whether the string returned by |Get()| is empty
      * or not.
      *
      * @param aName   the variable name to probe.
      * @return        if the variable has been set, the value returned is
-     *                true. If the variable was not defined in the
-     *                environment false will be returned.
+     *                PR_TRUE. If the variable was not defined in the
+     *                environment PR_FALSE will be returned.
      */
     boolean exists(in AString aName);
 };
 
--- a/xpfe/appshell/public/nsIWindowMediator.idl
+++ b/xpfe/appshell/public/nsIWindowMediator.idl
@@ -123,17 +123,17 @@ interface nsIWindowMediator: nsISupports
     *                   be ignored for zLevelTop and Bottom.)
     * @param inBelow if inPosition==zLevelBelow, the window
     *                 below which inWindow wants to be placed. Otherwise this
     *                 variable is ignored.
     * @param outPosition constrained position, values like inPosition.
     * @param outBelow if outPosition==zLevelBelow, the window
     *                 below which inWindow should be placed. Otherwise this
     *                 this value will be null.
-    * @return true if the position returned is different from
+    * @return PR_TRUE if the position returned is different from
     *         the position given.
     */
 
   [noscript] boolean calculateZPosition(in nsIXULWindow   inWindow,
                                         in unsigned long  inPosition,
                                         in nsIWidget      inBelow,
                                         out unsigned long outPosition,
                                         out nsIWidget     outBelow);
--- a/xpfe/appshell/public/nsIXULWindow.idl
+++ b/xpfe/appshell/public/nsIXULWindow.idl
@@ -61,24 +61,24 @@ interface nsIXULWindow : nsISupports
    * @param aChild the child window being removed
    */
   void removeChildWindow(in nsIXULWindow aChild);
 
   /**
    * Move the window to a centered position.
    * @param aRelative If not null, the window relative to which the window is
    *                  moved. See aScreen parameter for details.
-   * @param aScreen   true to center the window relative to the screen
+   * @param aScreen   PR_TRUE to center the window relative to the screen
    *                  containing aRelative if aRelative is not null. If
    *                  aRelative is null then relative to the screen of the
    *                  opener window if it was initialized by passing it to
    *                  nsWebShellWindow::Initialize. Failing that relative to
    *                  the main screen.
-   *                  false to center it relative to aRelative itself.
-   * @param aAlert    true to move the window to an alert position,
+   *                  PR_FALSE to center it relative to aRelative itself.
+   * @param aAlert    PR_TRUE to move the window to an alert position,
    *                  generally centered horizontally and 1/3 down from the top.
    */
   void center(in nsIXULWindow aRelative, in boolean aScreen, in boolean aAlert);
 
   /**
    * Shows the window as a modal window. That is, ensures that it is visible
    * and runs a local event loop, exiting only once the window has been closed.
    */