Bustage fix for bad merge of bug 569538.
authorHenri Sivonen <hsivonen@iki.fi>
Wed, 09 Jun 2010 11:23:25 +0300
changeset 43392 6dff4175b408a4eb8c68ed49a3634f416feacf52
parent 43391 ece35a7e40b9f77ea0b93475c099d211e22e96d7
child 43393 545c6d13e8e8227c187cfb5eb2a47bbd0948af07
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs569538
milestone1.9.3a5pre
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
Bustage fix for bad merge of bug 569538.
content/html/content/public/nsHTMLMediaElement.h
--- a/content/html/content/public/nsHTMLMediaElement.h
+++ b/content/html/content/public/nsHTMLMediaElement.h
@@ -62,17 +62,17 @@ class nsHTMLMediaElement : public nsGene
 
 public:
   enum CanPlayStatus {
     CANPLAY_NO,
     CANPLAY_MAYBE,
     CANPLAY_YES
   };
 
-  nsHTMLMediaElement(nsINodeInfo *aNodeInfo, PRBool aFromParser = 0);
+  nsHTMLMediaElement(nsINodeInfo *aNodeInfo, PRUint32 aFromParser = 0);
   virtual ~nsHTMLMediaElement();
 
   /**
    * This is used when the browser is constructing a video element to play
    * a channel that we've already started loading. The src attribute and
    * <source> children are ignored.
    * @param aChannel the channel to use
    * @param aListener returns a stream listener that should receive