mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 684470 - Remove the FromParser argument from nsHTMLMediaElement and subclasses' constructors; r=jst

This commit is contained in:
Ms2ger 2011-09-18 11:22:18 +02:00
Родитель 4542f41878
Коммит 3fdd270683
6 изменённых файлов: 10 добавлений и 20 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
content/html/content/public/nsHTMLAudioElement.h
Просмотреть файл

@ -50,8 +50,7 @@ class nsHTMLAudioElement : public nsHTMLMediaElement,
public nsIJSNativeInitializer public nsIJSNativeInitializer
{ {
public: public:
nsHTMLAudioElement(already_AddRefed<nsINodeInfo> aNodeInfo, nsHTMLAudioElement(already_AddRefed<nsINodeInfo> aNodeInfo);
mozilla::dom::FromParser aFromParser = mozilla::dom::NOT_FROM_PARSER);
virtual ~nsHTMLAudioElement(); virtual ~nsHTMLAudioElement();
// nsISupports // nsISupports

3
content/html/content/public/nsHTMLMediaElement.h
Просмотреть файл

@ -73,8 +73,7 @@ public:
CANPLAY_YES CANPLAY_YES
}; };
nsHTMLMediaElement(already_AddRefed<nsINodeInfo> aNodeInfo, nsHTMLMediaElement(already_AddRefed<nsINodeInfo> aNodeInfo);
mozilla::dom::FromParser aFromParser = mozilla::dom::NOT_FROM_PARSER);
virtual ~nsHTMLMediaElement(); virtual ~nsHTMLMediaElement();
/** /**

3
content/html/content/public/nsHTMLVideoElement.h
Просмотреть файл

@ -45,8 +45,7 @@ class nsHTMLVideoElement : public nsHTMLMediaElement,
public nsIDOMHTMLVideoElement public nsIDOMHTMLVideoElement
{ {
public: public:
nsHTMLVideoElement(already_AddRefed<nsINodeInfo> aNodeInfo, nsHTMLVideoElement(already_AddRefed<nsINodeInfo> aNodeInfo);
mozilla::dom::FromParser aFromParser = mozilla::dom::NOT_FROM_PARSER);
virtual ~nsHTMLVideoElement(); virtual ~nsHTMLVideoElement();
// nsISupports // nsISupports

7
content/html/content/src/nsHTMLAudioElement.cpp
Просмотреть файл

@ -90,7 +90,7 @@ NS_NewHTMLAudioElement(already_AddRefed<nsINodeInfo> aNodeInfo,
NS_ENSURE_TRUE(nodeInfo, nsnull); NS_ENSURE_TRUE(nodeInfo, nsnull);
} }
return new nsHTMLAudioElement(nodeInfo.forget(), aFromParser); return new nsHTMLAudioElement(nodeInfo.forget());
} }
NS_IMPL_ADDREF_INHERITED(nsHTMLAudioElement, nsHTMLMediaElement) NS_IMPL_ADDREF_INHERITED(nsHTMLAudioElement, nsHTMLMediaElement)
@ -108,9 +108,8 @@ NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLAudioElement)
NS_IMPL_ELEMENT_CLONE(nsHTMLAudioElement) NS_IMPL_ELEMENT_CLONE(nsHTMLAudioElement)
nsHTMLAudioElement::nsHTMLAudioElement(already_AddRefed<nsINodeInfo> aNodeInfo, nsHTMLAudioElement::nsHTMLAudioElement(already_AddRefed<nsINodeInfo> aNodeInfo)
FromParser aFromParser) : nsHTMLMediaElement(aNodeInfo)
: nsHTMLMediaElement(aNodeInfo, aFromParser)
{ {
} }

7
content/html/content/src/nsHTMLMediaElement.cpp
Просмотреть файл

@ -50,12 +50,8 @@
#include "nsIDOMDocument.h" #include "nsIDOMDocument.h"
#include "nsDOMError.h" #include "nsDOMError.h"
#include "nsNodeInfoManager.h" #include "nsNodeInfoManager.h"
#include "plbase64.h"
#include "nsNetUtil.h"
#include "prmem.h"
#include "nsNetUtil.h" #include "nsNetUtil.h"
#include "nsXPCOMStrings.h" #include "nsXPCOMStrings.h"
#include "prlock.h"
#include "nsThreadUtils.h" #include "nsThreadUtils.h"
#include "nsIThreadInternal.h" #include "nsIThreadInternal.h"
#include "nsContentUtils.h" #include "nsContentUtils.h"
@ -1269,8 +1265,7 @@ NS_IMETHODIMP nsHTMLMediaElement::SetMuted(PRBool aMuted)
return NS_OK; return NS_OK;
} }
nsHTMLMediaElement::nsHTMLMediaElement(already_AddRefed<nsINodeInfo> aNodeInfo, nsHTMLMediaElement::nsHTMLMediaElement(already_AddRefed<nsINodeInfo> aNodeInfo)
FromParser aFromParser)
: nsGenericHTMLElement(aNodeInfo), : nsGenericHTMLElement(aNodeInfo),
mCurrentLoadID(0), mCurrentLoadID(0),
mNetworkState(nsIDOMHTMLMediaElement::NETWORK_EMPTY), mNetworkState(nsIDOMHTMLMediaElement::NETWORK_EMPTY),

7
content/html/content/src/nsHTMLVideoElement.cpp
Просмотреть файл

@ -66,7 +66,7 @@
using namespace mozilla::dom; using namespace mozilla::dom;
NS_IMPL_NS_NEW_HTML_ELEMENT_CHECK_PARSER(Video) NS_IMPL_NS_NEW_HTML_ELEMENT(Video)
NS_IMPL_ADDREF_INHERITED(nsHTMLVideoElement, nsHTMLMediaElement) NS_IMPL_ADDREF_INHERITED(nsHTMLVideoElement, nsHTMLMediaElement)
NS_IMPL_RELEASE_INHERITED(nsHTMLVideoElement, nsHTMLMediaElement) NS_IMPL_RELEASE_INHERITED(nsHTMLVideoElement, nsHTMLMediaElement)
@ -100,9 +100,8 @@ NS_IMETHODIMP nsHTMLVideoElement::GetVideoHeight(PRUint32 *aVideoHeight)
return NS_OK; return NS_OK;
} }
nsHTMLVideoElement::nsHTMLVideoElement(already_AddRefed<nsINodeInfo> aNodeInfo, nsHTMLVideoElement::nsHTMLVideoElement(already_AddRefed<nsINodeInfo> aNodeInfo)
FromParser aFromParser) : nsHTMLMediaElement(aNodeInfo)
: nsHTMLMediaElement(aNodeInfo, aFromParser)
{ {
} }