зеркало из https://github.com/mozilla/gecko-dev.git
Merge latest green fx-team changeset and mozilla-central; a=merge
This commit is contained in:
Коммит
4c3f72e562
|
@ -32,11 +32,11 @@ SOURCES += [
|
||||||
]
|
]
|
||||||
|
|
||||||
LOCAL_INCLUDES += [
|
LOCAL_INCLUDES += [
|
||||||
'../base',
|
'/accessible/base',
|
||||||
'../generic',
|
'/accessible/generic',
|
||||||
'../html',
|
'/accessible/html',
|
||||||
'../xpcom',
|
'/accessible/xpcom',
|
||||||
'../xul',
|
'/accessible/xul',
|
||||||
'/other-licenses/atk-1.0',
|
'/other-licenses/atk-1.0',
|
||||||
]
|
]
|
||||||
|
|
|
@ -79,7 +79,6 @@ public:
|
||||||
AccEvent(uint32_t aEventType, Accessible* aAccessible,
|
AccEvent(uint32_t aEventType, Accessible* aAccessible,
|
||||||
EIsFromUserInput aIsFromUserInput = eAutoDetect,
|
EIsFromUserInput aIsFromUserInput = eAutoDetect,
|
||||||
EEventRule aEventRule = eRemoveDupes);
|
EEventRule aEventRule = eRemoveDupes);
|
||||||
virtual ~AccEvent() {}
|
|
||||||
|
|
||||||
// AccEvent
|
// AccEvent
|
||||||
uint32_t GetEventType() const { return mEventType; }
|
uint32_t GetEventType() const { return mEventType; }
|
||||||
|
@ -122,6 +121,8 @@ public:
|
||||||
NS_DECL_CYCLE_COLLECTION_NATIVE_CLASS(AccEvent)
|
NS_DECL_CYCLE_COLLECTION_NATIVE_CLASS(AccEvent)
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
virtual ~AccEvent() {}
|
||||||
|
|
||||||
bool mIsFromUserInput;
|
bool mIsFromUserInput;
|
||||||
uint32_t mEventType;
|
uint32_t mEventType;
|
||||||
EEventRule mEventRule;
|
EEventRule mEventRule;
|
|
@ -26,8 +26,6 @@ class DocManager : public nsIWebProgressListener,
|
||||||
public nsSupportsWeakReference
|
public nsSupportsWeakReference
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
virtual ~DocManager() { }
|
|
||||||
|
|
||||||
NS_DECL_THREADSAFE_ISUPPORTS
|
NS_DECL_THREADSAFE_ISUPPORTS
|
||||||
NS_DECL_NSIWEBPROGRESSLISTENER
|
NS_DECL_NSIWEBPROGRESSLISTENER
|
||||||
NS_DECL_NSIDOMEVENTLISTENER
|
NS_DECL_NSIDOMEVENTLISTENER
|
||||||
|
@ -73,6 +71,7 @@ public:
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
DocManager();
|
DocManager();
|
||||||
|
virtual ~DocManager() { }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initialize the manager.
|
* Initialize the manager.
|
|
@ -90,7 +90,6 @@ class NotificationController : public EventQueue,
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
NotificationController(DocAccessible* aDocument, nsIPresShell* aPresShell);
|
NotificationController(DocAccessible* aDocument, nsIPresShell* aPresShell);
|
||||||
virtual ~NotificationController();
|
|
||||||
|
|
||||||
NS_IMETHOD_(MozExternalRefCountType) AddRef(void);
|
NS_IMETHOD_(MozExternalRefCountType) AddRef(void);
|
||||||
NS_IMETHOD_(MozExternalRefCountType) Release(void);
|
NS_IMETHOD_(MozExternalRefCountType) Release(void);
|
||||||
|
@ -183,6 +182,8 @@ public:
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
virtual ~NotificationController();
|
||||||
|
|
||||||
nsCycleCollectingAutoRefCnt mRefCnt;
|
nsCycleCollectingAutoRefCnt mRefCnt;
|
||||||
NS_DECL_OWNINGTHREAD
|
NS_DECL_OWNINGTHREAD
|
||||||
|
|
||||||
|
@ -234,7 +235,6 @@ private:
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ContentInsertion(DocAccessible* aDocument, Accessible* aContainer);
|
ContentInsertion(DocAccessible* aDocument, Accessible* aContainer);
|
||||||
virtual ~ContentInsertion() { mDocument = nullptr; }
|
|
||||||
|
|
||||||
NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(ContentInsertion)
|
NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(ContentInsertion)
|
||||||
NS_DECL_CYCLE_COLLECTION_NATIVE_CLASS(ContentInsertion)
|
NS_DECL_CYCLE_COLLECTION_NATIVE_CLASS(ContentInsertion)
|
||||||
|
@ -242,6 +242,9 @@ private:
|
||||||
bool InitChildList(nsIContent* aStartChildNode, nsIContent* aEndChildNode);
|
bool InitChildList(nsIContent* aStartChildNode, nsIContent* aEndChildNode);
|
||||||
void Process();
|
void Process();
|
||||||
|
|
||||||
|
protected:
|
||||||
|
virtual ~ContentInsertion() { mDocument = nullptr; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
ContentInsertion();
|
ContentInsertion();
|
||||||
ContentInsertion(const ContentInsertion&);
|
ContentInsertion(const ContentInsertion&);
|
|
@ -58,10 +58,10 @@ if CONFIG['A11Y_LOG']:
|
||||||
]
|
]
|
||||||
|
|
||||||
LOCAL_INCLUDES += [
|
LOCAL_INCLUDES += [
|
||||||
'../generic',
|
'/accessible/generic',
|
||||||
'../html',
|
'/accessible/html',
|
||||||
'../xpcom',
|
'/accessible/xpcom',
|
||||||
'../xul',
|
'/accessible/xul',
|
||||||
'/dom/xbl',
|
'/dom/xbl',
|
||||||
'/ipc/chromium/src',
|
'/ipc/chromium/src',
|
||||||
'/layout/generic',
|
'/layout/generic',
|
||||||
|
@ -73,20 +73,20 @@ LOCAL_INCLUDES += [
|
||||||
|
|
||||||
if CONFIG['MOZ_ENABLE_GTK']:
|
if CONFIG['MOZ_ENABLE_GTK']:
|
||||||
LOCAL_INCLUDES += [
|
LOCAL_INCLUDES += [
|
||||||
'../atk',
|
'/accessible/atk',
|
||||||
]
|
]
|
||||||
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
|
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
|
||||||
LOCAL_INCLUDES += [
|
LOCAL_INCLUDES += [
|
||||||
'../windows/ia2',
|
'/accessible/windows/ia2',
|
||||||
'../windows/msaa',
|
'/accessible/windows/msaa',
|
||||||
]
|
]
|
||||||
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
|
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
|
||||||
LOCAL_INCLUDES += [
|
LOCAL_INCLUDES += [
|
||||||
'../mac',
|
'/accessible/mac',
|
||||||
]
|
]
|
||||||
else:
|
else:
|
||||||
LOCAL_INCLUDES += [
|
LOCAL_INCLUDES += [
|
||||||
'../other',
|
'/accessible/other',
|
||||||
]
|
]
|
||||||
|
|
||||||
FINAL_LIBRARY = 'xul'
|
FINAL_LIBRARY = 'xul'
|
|
@ -45,6 +45,10 @@ nsAccessiblePivot::nsAccessiblePivot(Accessible* aRoot) :
|
||||||
NS_ASSERTION(aRoot, "A root accessible is required");
|
NS_ASSERTION(aRoot, "A root accessible is required");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
nsAccessiblePivot::~nsAccessiblePivot()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
// nsISupports
|
// nsISupports
|
||||||
|
|
|
@ -38,6 +38,7 @@ public:
|
||||||
Accessible* Position() { return mPosition; }
|
Accessible* Position() { return mPosition; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
~nsAccessiblePivot();
|
||||||
nsAccessiblePivot() MOZ_DELETE;
|
nsAccessiblePivot() MOZ_DELETE;
|
||||||
nsAccessiblePivot(const nsAccessiblePivot&) MOZ_DELETE;
|
nsAccessiblePivot(const nsAccessiblePivot&) MOZ_DELETE;
|
||||||
void operator = (const nsAccessiblePivot&) MOZ_DELETE;
|
void operator = (const nsAccessiblePivot&) MOZ_DELETE;
|
Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше
Загрузка…
Ссылка в новой задаче