mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-07 09:54:42 +00:00
Bug 1521000 - Part 2: Adjust our clang-format rules to include spaces after the hash for nested preprocessor directives r=sylvestre
# ignore-this-changeset --HG-- extra : amend_source : 7221c8d15a765df71171099468e7c7faa648f37c extra : histedit_source : a0cce6015636202bff09e35a13f72e03257a7695
This commit is contained in:
parent
06c3d29113
commit
e5e885ae31
@ -24,3 +24,4 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_END_INHERITED|\
|
||||
NS_QUERYFRAME_TAIL.*$"
|
||||
|
||||
SortIncludes: false
|
||||
IndentPPDirectives: AfterHash
|
||||
|
@ -20,13 +20,13 @@
|
||||
#include "mozilla/a11y/DocManager.h"
|
||||
|
||||
#ifdef DEBUG
|
||||
#include <android/log.h>
|
||||
#define AALOG(args...) \
|
||||
__android_log_print(ANDROID_LOG_INFO, "GeckoAccessibilityNative", ##args)
|
||||
# include <android/log.h>
|
||||
# define AALOG(args...) \
|
||||
__android_log_print(ANDROID_LOG_INFO, "GeckoAccessibilityNative", ##args)
|
||||
#else
|
||||
#define AALOG(args...) \
|
||||
do { \
|
||||
} while (0)
|
||||
# define AALOG(args...) \
|
||||
do { \
|
||||
} while (0)
|
||||
#endif
|
||||
|
||||
template <>
|
||||
|
@ -15,7 +15,7 @@
|
||||
#include "prlink.h"
|
||||
|
||||
#ifdef MOZ_ENABLE_DBUS
|
||||
#include <dbus/dbus.h>
|
||||
# include <dbus/dbus.h>
|
||||
#endif
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
|
@ -6,7 +6,7 @@
|
||||
|
||||
#include "AccGroupInfo.h"
|
||||
#ifdef MOZ_XUL
|
||||
#include "XULTreeAccessible.h"
|
||||
# include "XULTreeAccessible.h"
|
||||
#endif
|
||||
|
||||
#include "mozilla/dom/HTMLLabelElement.h"
|
||||
|
@ -17,7 +17,7 @@
|
||||
#include "xpcAccessibleDocument.h"
|
||||
|
||||
#ifdef A11Y_LOG
|
||||
#include "Logging.h"
|
||||
# include "Logging.h"
|
||||
#endif
|
||||
|
||||
#include "mozilla/EventListenerManager.h"
|
||||
|
@ -12,7 +12,7 @@
|
||||
#include "nsAccessibilityService.h"
|
||||
#include "nsTextEquivUtils.h"
|
||||
#ifdef A11Y_LOG
|
||||
#include "Logging.h"
|
||||
# include "Logging.h"
|
||||
#endif
|
||||
|
||||
using namespace mozilla;
|
||||
|
@ -11,7 +11,7 @@
|
||||
#include "nsEventShell.h"
|
||||
#include "DocAccessible.h"
|
||||
#ifdef A11Y_LOG
|
||||
#include "Logging.h"
|
||||
# include "Logging.h"
|
||||
#endif
|
||||
|
||||
#include "mozilla/UniquePtr.h"
|
||||
|
@ -16,7 +16,7 @@
|
||||
#include <utility>
|
||||
|
||||
#ifdef A11Y_LOG
|
||||
#include "Logging.h"
|
||||
# include "Logging.h"
|
||||
#endif
|
||||
|
||||
namespace mozilla {
|
||||
|
@ -11,8 +11,8 @@
|
||||
#include "nsStringFwd.h"
|
||||
|
||||
#if defined(ANDROID)
|
||||
#include "nsTArray.h"
|
||||
#include "nsRect.h"
|
||||
# include "nsTArray.h"
|
||||
# include "nsRect.h"
|
||||
#endif
|
||||
|
||||
namespace mozilla {
|
||||
|
@ -30,7 +30,7 @@
|
||||
#include "OuterDocAccessible.h"
|
||||
#include "Role.h"
|
||||
#ifdef MOZ_ACCESSIBILITY_ATK
|
||||
#include "RootAccessibleWrap.h"
|
||||
# include "RootAccessibleWrap.h"
|
||||
#endif
|
||||
#include "States.h"
|
||||
#include "Statistics.h"
|
||||
@ -40,18 +40,18 @@
|
||||
#include "xpcAccessibleDocument.h"
|
||||
|
||||
#ifdef MOZ_ACCESSIBILITY_ATK
|
||||
#include "AtkSocketAccessible.h"
|
||||
# include "AtkSocketAccessible.h"
|
||||
#endif
|
||||
|
||||
#ifdef XP_WIN
|
||||
#include "mozilla/a11y/Compatibility.h"
|
||||
#include "mozilla/dom/ContentChild.h"
|
||||
#include "HTMLWin32ObjectAccessible.h"
|
||||
#include "mozilla/StaticPtr.h"
|
||||
# include "mozilla/a11y/Compatibility.h"
|
||||
# include "mozilla/dom/ContentChild.h"
|
||||
# include "HTMLWin32ObjectAccessible.h"
|
||||
# include "mozilla/StaticPtr.h"
|
||||
#endif
|
||||
|
||||
#ifdef A11Y_LOG
|
||||
#include "Logging.h"
|
||||
# include "Logging.h"
|
||||
#endif
|
||||
|
||||
#include "nsExceptionHandler.h"
|
||||
@ -75,18 +75,18 @@
|
||||
#include "nsDeckFrame.h"
|
||||
|
||||
#ifdef MOZ_XUL
|
||||
#include "XULAlertAccessible.h"
|
||||
#include "XULComboboxAccessible.h"
|
||||
#include "XULElementAccessibles.h"
|
||||
#include "XULFormControlAccessible.h"
|
||||
#include "XULListboxAccessibleWrap.h"
|
||||
#include "XULMenuAccessibleWrap.h"
|
||||
#include "XULTabAccessible.h"
|
||||
#include "XULTreeGridAccessibleWrap.h"
|
||||
# include "XULAlertAccessible.h"
|
||||
# include "XULComboboxAccessible.h"
|
||||
# include "XULElementAccessibles.h"
|
||||
# include "XULFormControlAccessible.h"
|
||||
# include "XULListboxAccessibleWrap.h"
|
||||
# include "XULMenuAccessibleWrap.h"
|
||||
# include "XULTabAccessible.h"
|
||||
# include "XULTreeGridAccessibleWrap.h"
|
||||
#endif
|
||||
|
||||
#if defined(XP_WIN) || defined(MOZ_ACCESSIBILITY_ATK)
|
||||
#include "nsNPAPIPluginInstance.h"
|
||||
# include "nsNPAPIPluginInstance.h"
|
||||
#endif
|
||||
|
||||
using namespace mozilla;
|
||||
@ -148,7 +148,7 @@ static bool MustBeAccessible(nsIContent* aContent, DocAccessible* aDocument) {
|
||||
*/
|
||||
#ifdef MOZ_XUL
|
||||
Accessible* CreateMenupopupAccessible(Element* aElement, Accessible* aContext) {
|
||||
#ifdef MOZ_ACCESSIBILITY_ATK
|
||||
# ifdef MOZ_ACCESSIBILITY_ATK
|
||||
// ATK considers this node to be redundant when within menubars, and it makes
|
||||
// menu navigation with assistive technologies more difficult
|
||||
// XXX In the future we will should this for consistency across the
|
||||
@ -157,7 +157,7 @@ Accessible* CreateMenupopupAccessible(Element* aElement, Accessible* aContext) {
|
||||
// class for each platform.
|
||||
nsIContent* parent = aElement->GetParent();
|
||||
if (parent && parent->IsXULElement(nsGkAtoms::menu)) return nullptr;
|
||||
#endif
|
||||
# endif
|
||||
|
||||
return new XULMenupopupAccessible(aElement, aContext->Document());
|
||||
}
|
||||
@ -212,19 +212,19 @@ static const HTMLMarkupMapInfo sHTMLMarkupMapList[] = {
|
||||
#undef MARKUPMAP
|
||||
|
||||
#ifdef MOZ_XUL
|
||||
#define XULMAP(atom, ...) {nsGkAtoms::atom, __VA_ARGS__},
|
||||
# define XULMAP(atom, ...) {nsGkAtoms::atom, __VA_ARGS__},
|
||||
|
||||
#define XULMAP_TYPE(atom, new_type) \
|
||||
XULMAP(atom, [](Element* aElement, Accessible* aContext) -> Accessible* { \
|
||||
return new new_type(aElement, aContext->Document()); \
|
||||
})
|
||||
# define XULMAP_TYPE(atom, new_type) \
|
||||
XULMAP(atom, [](Element* aElement, Accessible* aContext) -> Accessible* { \
|
||||
return new new_type(aElement, aContext->Document()); \
|
||||
})
|
||||
|
||||
static const XULMarkupMapInfo sXULMarkupMapList[] = {
|
||||
#include "XULMap.h"
|
||||
# include "XULMap.h"
|
||||
};
|
||||
|
||||
#undef XULMAP_TYPE
|
||||
#undef XULMAP
|
||||
# undef XULMAP_TYPE
|
||||
# undef XULMAP
|
||||
#endif
|
||||
|
||||
#undef Attr
|
||||
@ -406,7 +406,7 @@ already_AddRefed<Accessible> nsAccessibilityService::CreatePluginAccessible(
|
||||
#if defined(XP_WIN) || defined(MOZ_ACCESSIBILITY_ATK)
|
||||
RefPtr<nsNPAPIPluginInstance> pluginInstance = aFrame->GetPluginInstance();
|
||||
if (pluginInstance) {
|
||||
#ifdef XP_WIN
|
||||
# ifdef XP_WIN
|
||||
if (!sPendingPlugins->Contains(aContent) &&
|
||||
(Preferences::GetBool("accessibility.delay_plugins") ||
|
||||
Compatibility::IsJAWS() || Compatibility::IsWE())) {
|
||||
@ -434,7 +434,7 @@ already_AddRefed<Accessible> nsAccessibilityService::CreatePluginAccessible(
|
||||
aContent, aContext->Document(), pluginPort);
|
||||
return accessible.forget();
|
||||
|
||||
#elif MOZ_ACCESSIBILITY_ATK
|
||||
# elif MOZ_ACCESSIBILITY_ATK
|
||||
if (!AtkSocketAccessible::gCanEmbed) return nullptr;
|
||||
|
||||
// Note this calls into the plugin, so crazy things may happen and aFrame
|
||||
@ -448,7 +448,7 @@ already_AddRefed<Accessible> nsAccessibilityService::CreatePluginAccessible(
|
||||
|
||||
return socketAccessible.forget();
|
||||
}
|
||||
#endif
|
||||
# endif
|
||||
}
|
||||
#endif
|
||||
|
||||
|
@ -12,7 +12,7 @@
|
||||
#include "nsCoreUtils.h"
|
||||
|
||||
#ifdef A11Y_LOG
|
||||
#include "Logging.h"
|
||||
# include "Logging.h"
|
||||
#endif
|
||||
|
||||
namespace mozilla {
|
||||
|
@ -16,7 +16,7 @@
|
||||
#include "mozilla/dom/DocumentInlines.h"
|
||||
|
||||
#ifdef A11Y_LOG
|
||||
#include "Logging.h"
|
||||
# include "Logging.h"
|
||||
#endif
|
||||
|
||||
namespace mozilla {
|
||||
|
@ -14,7 +14,7 @@
|
||||
#include "States.h"
|
||||
|
||||
#ifdef A11Y_LOG
|
||||
#include "Logging.h"
|
||||
# include "Logging.h"
|
||||
#endif
|
||||
|
||||
using namespace mozilla;
|
||||
|
@ -19,7 +19,7 @@
|
||||
#include "Role.h"
|
||||
#include "States.h"
|
||||
#ifdef MOZ_XUL
|
||||
#include "XULTreeAccessible.h"
|
||||
# include "XULTreeAccessible.h"
|
||||
#endif
|
||||
|
||||
#include "mozilla/dom/BindingUtils.h"
|
||||
@ -43,7 +43,7 @@
|
||||
#include "nsGlobalWindow.h"
|
||||
|
||||
#ifdef MOZ_XUL
|
||||
#include "nsIXULWindow.h"
|
||||
# include "nsIXULWindow.h"
|
||||
#endif
|
||||
|
||||
using namespace mozilla;
|
||||
|
@ -27,16 +27,16 @@ bool TableAccessible::IsProbablyLayoutTable() {
|
||||
// the algorithm. Integrate it into Logging.
|
||||
// Change to |#define SHOW_LAYOUT_HEURISTIC DEBUG| before final release
|
||||
#ifdef SHOW_LAYOUT_HEURISTIC
|
||||
#define RETURN_LAYOUT_ANSWER(isLayout, heuristic) \
|
||||
{ \
|
||||
mLayoutHeuristic = isLayout \
|
||||
? NS_LITERAL_STRING("layout table: " heuristic) \
|
||||
: NS_LITERAL_STRING("data table: " heuristic); \
|
||||
return isLayout; \
|
||||
}
|
||||
# define RETURN_LAYOUT_ANSWER(isLayout, heuristic) \
|
||||
{ \
|
||||
mLayoutHeuristic = isLayout \
|
||||
? NS_LITERAL_STRING("layout table: " heuristic) \
|
||||
: NS_LITERAL_STRING("data table: " heuristic); \
|
||||
return isLayout; \
|
||||
}
|
||||
#else
|
||||
#define RETURN_LAYOUT_ANSWER(isLayout, heuristic) \
|
||||
{ return isLayout; }
|
||||
# define RETURN_LAYOUT_ANSWER(isLayout, heuristic) \
|
||||
{ return isLayout; }
|
||||
#endif
|
||||
|
||||
Accessible* thisacc = AsAccessible();
|
||||
|
@ -13,12 +13,12 @@
|
||||
#include "nsCoreUtils.h"
|
||||
|
||||
#if defined(XP_WIN)
|
||||
#include "AccessibleWrap.h"
|
||||
#include "Compatibility.h"
|
||||
#include "mozilla/mscom/PassthruProxy.h"
|
||||
#include "mozilla/mscom/Ptr.h"
|
||||
#include "nsWinUtils.h"
|
||||
#include "RootAccessible.h"
|
||||
# include "AccessibleWrap.h"
|
||||
# include "Compatibility.h"
|
||||
# include "mozilla/mscom/PassthruProxy.h"
|
||||
# include "mozilla/mscom/Ptr.h"
|
||||
# include "nsWinUtils.h"
|
||||
# include "RootAccessible.h"
|
||||
#endif
|
||||
|
||||
namespace mozilla {
|
||||
@ -702,9 +702,9 @@ void DocAccessibleParent::SendParentCOMProxy() {
|
||||
return;
|
||||
}
|
||||
|
||||
#if defined(MOZ_CONTENT_SANDBOX)
|
||||
# if defined(MOZ_CONTENT_SANDBOX)
|
||||
mParentProxyStream = holder.GetPreservedStream();
|
||||
#endif // defined(MOZ_CONTENT_SANDBOX)
|
||||
# endif // defined(MOZ_CONTENT_SANDBOX)
|
||||
}
|
||||
|
||||
void DocAccessibleParent::SetEmulatedWindowHandle(HWND aWindowHandle) {
|
||||
@ -716,7 +716,7 @@ void DocAccessibleParent::SetEmulatedWindowHandle(HWND aWindowHandle) {
|
||||
|
||||
mozilla::ipc::IPCResult DocAccessibleParent::RecvGetWindowedPluginIAccessible(
|
||||
const WindowsHandle& aHwnd, IAccessibleHolder* aPluginCOMProxy) {
|
||||
#if defined(MOZ_CONTENT_SANDBOX)
|
||||
# if defined(MOZ_CONTENT_SANDBOX)
|
||||
// We don't actually want the accessible object for aHwnd, but rather the
|
||||
// one that belongs to its child (see HTMLWin32ObjectAccessible).
|
||||
HWND childWnd = ::GetWindow(reinterpret_cast<HWND>(aHwnd), GW_CHILD);
|
||||
@ -738,9 +738,9 @@ mozilla::ipc::IPCResult DocAccessibleParent::RecvGetWindowedPluginIAccessible(
|
||||
aPluginCOMProxy->Set(IAccessibleHolder::COMPtrType(rawAccPlugin));
|
||||
|
||||
return IPC_OK();
|
||||
#else
|
||||
# else
|
||||
return IPC_FAIL(this, "Message unsupported in this build configuration");
|
||||
#endif
|
||||
# endif
|
||||
}
|
||||
|
||||
mozilla::ipc::IPCResult DocAccessibleParent::RecvFocusEvent(
|
||||
@ -779,7 +779,7 @@ mozilla::ipc::IPCResult DocAccessibleParent::RecvBatch(
|
||||
const uint64_t& aBatchType, nsTArray<BatchData>&& aData) {
|
||||
// Only do something in Android. We can't ifdef the entire protocol out in
|
||||
// the ipdl because it doesn't allow preprocessing.
|
||||
#if defined(ANDROID)
|
||||
# if defined(ANDROID)
|
||||
nsTArray<ProxyAccessible*> proxies(aData.Length());
|
||||
for (size_t i = 0; i < aData.Length(); i++) {
|
||||
DocAccessibleParent* doc = static_cast<DocAccessibleParent*>(
|
||||
@ -790,7 +790,7 @@ mozilla::ipc::IPCResult DocAccessibleParent::RecvBatch(
|
||||
proxies.AppendElement(proxy);
|
||||
}
|
||||
ProxyBatch(this, aBatchType, proxies, aData);
|
||||
#endif // defined(XP_WIN)
|
||||
# endif // defined(XP_WIN)
|
||||
return IPC_OK();
|
||||
}
|
||||
#endif // !defined(XP_WIN)
|
||||
|
@ -251,10 +251,10 @@ class DocAccessibleParent : public ProxyAccessible,
|
||||
// The handle associated with the emulated window that contains this document
|
||||
HWND mEmulatedWindowHandle;
|
||||
|
||||
#if defined(MOZ_CONTENT_SANDBOX)
|
||||
# if defined(MOZ_CONTENT_SANDBOX)
|
||||
mscom::PreservedStreamPtr mParentProxyStream;
|
||||
#endif // defined(MOZ_CONTENT_SANDBOX)
|
||||
#endif // defined(XP_WIN)
|
||||
# endif // defined(MOZ_CONTENT_SANDBOX)
|
||||
#endif // defined(XP_WIN)
|
||||
|
||||
/*
|
||||
* Conceptually this is a map from IDs to proxies, but we store the ID in the
|
||||
|
@ -8,7 +8,7 @@
|
||||
#define mozilla_a11y_IPCTypes_h
|
||||
|
||||
#ifdef ACCESSIBILITY
|
||||
#include "mozilla/a11y/Role.h"
|
||||
# include "mozilla/a11y/Role.h"
|
||||
|
||||
namespace IPC {
|
||||
|
||||
@ -36,25 +36,25 @@ typedef uint32_t role;
|
||||
#if defined(XP_WIN) && defined(ACCESSIBILITY)
|
||||
|
||||
// So that we don't include a bunch of other Windows junk.
|
||||
#if !defined(COM_NO_WINDOWS_H)
|
||||
#define COM_NO_WINDOWS_H
|
||||
#endif // !defined(COM_NO_WINDOWS_H)
|
||||
# if !defined(COM_NO_WINDOWS_H)
|
||||
# define COM_NO_WINDOWS_H
|
||||
# endif // !defined(COM_NO_WINDOWS_H)
|
||||
|
||||
// COM headers pull in MSXML which conflicts with our own XMLDocument class.
|
||||
// This define excludes those conflicting definitions.
|
||||
#if !defined(__XMLDocument_FWD_DEFINED__)
|
||||
#define __XMLDocument_FWD_DEFINED__
|
||||
#endif // !defined(__XMLDocument_FWD_DEFINED__)
|
||||
# if !defined(__XMLDocument_FWD_DEFINED__)
|
||||
# define __XMLDocument_FWD_DEFINED__
|
||||
# endif // !defined(__XMLDocument_FWD_DEFINED__)
|
||||
|
||||
#include <combaseapi.h>
|
||||
# include <combaseapi.h>
|
||||
|
||||
#include "mozilla/a11y/COMPtrTypes.h"
|
||||
# include "mozilla/a11y/COMPtrTypes.h"
|
||||
|
||||
// This define in rpcndr.h messes up our code, so we must undefine it after
|
||||
// COMPtrTypes.h has been included.
|
||||
#if defined(small)
|
||||
#undef small
|
||||
#endif // defined(small)
|
||||
# if defined(small)
|
||||
# undef small
|
||||
# endif // defined(small)
|
||||
|
||||
#else
|
||||
|
||||
|
@ -19,7 +19,7 @@
|
||||
#include "nsISimpleEnumerator.h"
|
||||
#include "nsAccUtils.h"
|
||||
#ifdef MOZ_ACCESSIBILITY_ATK
|
||||
#include "AccessibleWrap.h"
|
||||
# include "AccessibleWrap.h"
|
||||
#endif
|
||||
|
||||
namespace mozilla {
|
||||
|
@ -5,7 +5,7 @@
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#if defined(MOZILLA_INTERNAL_API)
|
||||
#error This code is NOT for internal Gecko use!
|
||||
# error This code is NOT for internal Gecko use!
|
||||
#endif // defined(MOZILLA_INTERNAL_API)
|
||||
|
||||
#include "AccessibleHandler.h"
|
||||
|
@ -28,22 +28,22 @@ import NEWEST_IA2_IDL;
|
||||
|
||||
#else
|
||||
|
||||
#include "HandlerData.h"
|
||||
# include "HandlerData.h"
|
||||
|
||||
#include <windows.h>
|
||||
# include <windows.h>
|
||||
|
||||
#if !defined(MOZILLA_INTERNAL_API)
|
||||
# if !defined(MOZILLA_INTERNAL_API)
|
||||
|
||||
#include "Accessible2_3.h"
|
||||
#include "AccessibleHyperlink.h"
|
||||
#include "AccessibleHypertext2.h"
|
||||
#include "AccessibleTableCell.h"
|
||||
#include "Handler.h"
|
||||
#include "mozilla/mscom/StructStream.h"
|
||||
#include "mozilla/UniquePtr.h"
|
||||
# include "Accessible2_3.h"
|
||||
# include "AccessibleHyperlink.h"
|
||||
# include "AccessibleHypertext2.h"
|
||||
# include "AccessibleTableCell.h"
|
||||
# include "Handler.h"
|
||||
# include "mozilla/mscom/StructStream.h"
|
||||
# include "mozilla/UniquePtr.h"
|
||||
|
||||
#include <ocidl.h>
|
||||
#include <servprov.h>
|
||||
# include <ocidl.h>
|
||||
# include <servprov.h>
|
||||
|
||||
namespace mozilla {
|
||||
namespace a11y {
|
||||
@ -306,7 +306,7 @@ inline static BSTR CopyBSTR(BSTR aSrc) {
|
||||
} // namespace a11y
|
||||
} // namespace mozilla
|
||||
|
||||
#endif // !defined(MOZILLA_INTERNAL_API)
|
||||
# endif // !defined(MOZILLA_INTERNAL_API)
|
||||
|
||||
#endif // defined(__midl)
|
||||
|
||||
|
@ -5,7 +5,7 @@
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#if defined(MOZILLA_INTERNAL_API)
|
||||
#error This code is NOT for internal Gecko use!
|
||||
# error This code is NOT for internal Gecko use!
|
||||
#endif // defined(MOZILLA_INTERNAL_API)
|
||||
|
||||
#include "AccessibleHandlerControl.h"
|
||||
|
@ -5,17 +5,17 @@
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#if defined(MOZILLA_INTERNAL_API)
|
||||
#error This code is NOT for internal Gecko use!
|
||||
# error This code is NOT for internal Gecko use!
|
||||
#endif // defined(MOZILLA_INTERNAL_API)
|
||||
|
||||
#ifndef mozilla_a11y_AccessibleHandlerControl_h
|
||||
#define mozilla_a11y_AccessibleHandlerControl_h
|
||||
# define mozilla_a11y_AccessibleHandlerControl_h
|
||||
|
||||
#include "Factory.h"
|
||||
#include "HandlerData.h"
|
||||
#include "IUnknownImpl.h"
|
||||
#include "mozilla/mscom/Registration.h"
|
||||
#include "mozilla/NotNull.h"
|
||||
# include "Factory.h"
|
||||
# include "HandlerData.h"
|
||||
# include "IUnknownImpl.h"
|
||||
# include "mozilla/mscom/Registration.h"
|
||||
# include "mozilla/NotNull.h"
|
||||
|
||||
namespace mozilla {
|
||||
namespace a11y {
|
||||
|
@ -5,7 +5,7 @@
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#if defined(MOZILLA_INTERNAL_API)
|
||||
#error This code is NOT for internal Gecko use!
|
||||
# error This code is NOT for internal Gecko use!
|
||||
#endif // defined(MOZILLA_INTERNAL_API)
|
||||
|
||||
#include "HandlerChildEnumerator.h"
|
||||
|
@ -5,15 +5,15 @@
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#if defined(MOZILLA_INTERNAL_API)
|
||||
#error This code is NOT for internal Gecko use!
|
||||
# error This code is NOT for internal Gecko use!
|
||||
#endif // defined(MOZILLA_INTERNAL_API)
|
||||
|
||||
#ifndef mozilla_a11y_HandlerChildEnumerator_h
|
||||
#define mozilla_a11y_HandlerChildEnumerator_h
|
||||
# define mozilla_a11y_HandlerChildEnumerator_h
|
||||
|
||||
#include "AccessibleHandler.h"
|
||||
#include "IUnknownImpl.h"
|
||||
#include "mozilla/RefPtr.h"
|
||||
# include "AccessibleHandler.h"
|
||||
# include "IUnknownImpl.h"
|
||||
# include "mozilla/RefPtr.h"
|
||||
|
||||
namespace mozilla {
|
||||
namespace a11y {
|
||||
|
@ -5,7 +5,7 @@
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#if defined(MOZILLA_INTERNAL_API)
|
||||
#error This code is NOT for internal Gecko use!
|
||||
# error This code is NOT for internal Gecko use!
|
||||
#endif // defined(MOZILLA_INTERNAL_API)
|
||||
|
||||
#include "HandlerRelation.h"
|
||||
|
@ -5,15 +5,15 @@
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#if defined(MOZILLA_INTERNAL_API)
|
||||
#error This code is NOT for internal Gecko use!
|
||||
# error This code is NOT for internal Gecko use!
|
||||
#endif // defined(MOZILLA_INTERNAL_API)
|
||||
|
||||
#ifndef mozilla_a11y_HandlerRelation_h
|
||||
#define mozilla_a11y_HandlerRelation_h
|
||||
# define mozilla_a11y_HandlerRelation_h
|
||||
|
||||
#include "AccessibleHandler.h"
|
||||
#include "IUnknownImpl.h"
|
||||
#include "mozilla/RefPtr.h"
|
||||
# include "AccessibleHandler.h"
|
||||
# include "IUnknownImpl.h"
|
||||
# include "mozilla/RefPtr.h"
|
||||
|
||||
namespace mozilla {
|
||||
namespace a11y {
|
||||
|
@ -5,7 +5,7 @@
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#if defined(MOZILLA_INTERNAL_API)
|
||||
#error This code is NOT for internal Gecko use!
|
||||
# error This code is NOT for internal Gecko use!
|
||||
#endif // defined(MOZILLA_INTERNAL_API)
|
||||
|
||||
#include "HandlerTextLeaf.h"
|
||||
|
@ -5,15 +5,15 @@
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#if defined(MOZILLA_INTERNAL_API)
|
||||
#error This code is NOT for internal Gecko use!
|
||||
# error This code is NOT for internal Gecko use!
|
||||
#endif // defined(MOZILLA_INTERNAL_API)
|
||||
|
||||
#ifndef mozilla_a11y_HandlerTextLeaf_h
|
||||
#define mozilla_a11y_HandlerTextLeaf_h
|
||||
# define mozilla_a11y_HandlerTextLeaf_h
|
||||
|
||||
#include "AccessibleHandler.h"
|
||||
#include "IUnknownImpl.h"
|
||||
#include "mozilla/RefPtr.h"
|
||||
# include "AccessibleHandler.h"
|
||||
# include "IUnknownImpl.h"
|
||||
# include "mozilla/RefPtr.h"
|
||||
|
||||
namespace mozilla {
|
||||
namespace a11y {
|
||||
|
@ -27,7 +27,7 @@
|
||||
#include "States.h"
|
||||
|
||||
#ifdef A11Y_LOG
|
||||
#include "Logging.h"
|
||||
# include "Logging.h"
|
||||
#endif
|
||||
|
||||
#include "nsIMutableArray.h"
|
||||
|
@ -24,7 +24,7 @@
|
||||
// Inheriting from both XPCOM and MSCOM interfaces causes a lot of warnings
|
||||
// about virtual functions being hidden by each other. This is done by
|
||||
// design, so silence the warning.
|
||||
#pragma GCC diagnostic ignored "-Woverloaded-virtual"
|
||||
# pragma GCC diagnostic ignored "-Woverloaded-virtual"
|
||||
#endif
|
||||
|
||||
namespace mozilla {
|
||||
@ -301,11 +301,11 @@ static inline AccessibleWrap *WrapperFor(const ProxyAccessible *aProxy) {
|
||||
|
||||
#ifdef XP_WIN
|
||||
// Undo the windows.h damage
|
||||
#undef GetMessage
|
||||
#undef CreateEvent
|
||||
#undef GetClassName
|
||||
#undef GetBinaryType
|
||||
#undef RemoveDirectory
|
||||
# undef GetMessage
|
||||
# undef CreateEvent
|
||||
# undef GetClassName
|
||||
# undef GetBinaryType
|
||||
# undef RemoveDirectory
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
@ -86,12 +86,12 @@ static bool sInSendMessageExHackEnabled = false;
|
||||
static PVOID sVectoredExceptionHandler = nullptr;
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
#include <intrin.h>
|
||||
#pragma intrinsic(_ReturnAddress)
|
||||
#define RETURN_ADDRESS() _ReturnAddress()
|
||||
# include <intrin.h>
|
||||
# pragma intrinsic(_ReturnAddress)
|
||||
# define RETURN_ADDRESS() _ReturnAddress()
|
||||
#elif defined(__GNUC__) || defined(__clang__)
|
||||
#define RETURN_ADDRESS() \
|
||||
__builtin_extract_return_addr(__builtin_return_address(0))
|
||||
# define RETURN_ADDRESS() \
|
||||
__builtin_extract_return_addr(__builtin_return_address(0))
|
||||
#endif
|
||||
|
||||
static inline bool IsCurrentThreadInBlockingMessageSend(
|
||||
|
@ -22,16 +22,16 @@
|
||||
|
||||
#if defined(UIA_LOGGING)
|
||||
|
||||
#define LOG_ERROR(FuncName) \
|
||||
{ \
|
||||
DWORD err = ::GetLastError(); \
|
||||
nsPrintfCString msg(#FuncName " failed with code %u\n", err); \
|
||||
::OutputDebugStringA(msg.get()); \
|
||||
}
|
||||
# define LOG_ERROR(FuncName) \
|
||||
{ \
|
||||
DWORD err = ::GetLastError(); \
|
||||
nsPrintfCString msg(#FuncName " failed with code %u\n", err); \
|
||||
::OutputDebugStringA(msg.get()); \
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
#define LOG_ERROR(FuncName)
|
||||
# define LOG_ERROR(FuncName)
|
||||
|
||||
#endif // defined(UIA_LOGGING)
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
||||
#include "BaseAccessibles.h"
|
||||
|
||||
#if defined(MOZ_CONTENT_SANDBOX)
|
||||
#include "mozilla/mscom/Ptr.h"
|
||||
# include "mozilla/mscom/Ptr.h"
|
||||
#endif
|
||||
|
||||
struct IAccessible;
|
||||
|
@ -17,13 +17,13 @@
|
||||
// At this point we're catching a crash which is of much greater
|
||||
// importance than the missing dereference for the nsCOMPtr<>
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(disable : 4509)
|
||||
# pragma warning(disable : 4509)
|
||||
#endif
|
||||
|
||||
#if defined(__GNUC__) || defined(__clang__)
|
||||
#define ATTRIBUTE_UNUSED __attribute__((unused))
|
||||
# define ATTRIBUTE_UNUSED __attribute__((unused))
|
||||
#else
|
||||
#define ATTRIBUTE_UNUSED
|
||||
# define ATTRIBUTE_UNUSED
|
||||
#endif
|
||||
|
||||
namespace mozilla {
|
||||
|
@ -25,7 +25,7 @@
|
||||
#include <oaidl.h>
|
||||
|
||||
#if !defined(STATE_SYSTEM_NORMAL)
|
||||
#define STATE_SYSTEM_NORMAL (0)
|
||||
# define STATE_SYSTEM_NORMAL (0)
|
||||
#endif // !defined(STATE_SYSTEM_NORMAL)
|
||||
|
||||
namespace mozilla {
|
||||
|
@ -14,15 +14,15 @@ extern "C" {
|
||||
#endif
|
||||
|
||||
#ifndef STATUS_INFO_LENGTH_MISMATCH
|
||||
#define STATUS_INFO_LENGTH_MISMATCH ((NTSTATUS)0xC0000004L)
|
||||
# define STATUS_INFO_LENGTH_MISMATCH ((NTSTATUS)0xC0000004L)
|
||||
#endif
|
||||
|
||||
#ifndef STATUS_BUFFER_TOO_SMALL
|
||||
#define STATUS_BUFFER_TOO_SMALL ((NTSTATUS)0xC0000023L)
|
||||
# define STATUS_BUFFER_TOO_SMALL ((NTSTATUS)0xC0000023L)
|
||||
#endif
|
||||
|
||||
#ifndef STATUS_MORE_ENTRIES
|
||||
#define STATUS_MORE_ENTRIES ((NTSTATUS)0x00000105L)
|
||||
# define STATUS_MORE_ENTRIES ((NTSTATUS)0x00000105L)
|
||||
#endif
|
||||
|
||||
enum UndocSystemInformationClass { SystemExtendedHandleInformation = 64 };
|
||||
|
@ -25,7 +25,7 @@
|
||||
#include "ProxyWrappers.h"
|
||||
|
||||
#if defined(MOZ_TELEMETRY_REPORTING)
|
||||
#include "mozilla/Telemetry.h"
|
||||
# include "mozilla/Telemetry.h"
|
||||
#endif // defined(MOZ_TELEMETRY_REPORTING)
|
||||
|
||||
using namespace mozilla;
|
||||
@ -322,14 +322,14 @@ static void AccumulateInstantiatorTelemetry(const nsAString& aValue) {
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
if (!aValue.IsEmpty()) {
|
||||
#if defined(MOZ_TELEMETRY_REPORTING)
|
||||
# if defined(MOZ_TELEMETRY_REPORTING)
|
||||
Telemetry::ScalarSet(Telemetry::ScalarID::A11Y_INSTANTIATORS, aValue);
|
||||
#endif // defined(MOZ_TELEMETRY_REPORTING)
|
||||
#if defined(MOZ_CRASHREPORTER)
|
||||
# endif // defined(MOZ_TELEMETRY_REPORTING)
|
||||
# if defined(MOZ_CRASHREPORTER)
|
||||
CrashReporter::AnnotateCrashReport(
|
||||
CrashReporter::Annotation::AccessibilityClient,
|
||||
NS_ConvertUTF16toUTF8(aValue));
|
||||
#endif // defined(MOZ_CRASHREPORTER)
|
||||
# endif // defined(MOZ_CRASHREPORTER)
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
||||
#include "Platform.h"
|
||||
|
||||
#ifdef A11Y_LOG
|
||||
#include "Logging.h"
|
||||
# include "Logging.h"
|
||||
#endif
|
||||
|
||||
using namespace mozilla;
|
||||
|
@ -17,7 +17,7 @@
|
||||
#include "TextUpdater.h"
|
||||
|
||||
#ifdef A11Y_LOG
|
||||
#include "Logging.h"
|
||||
# include "Logging.h"
|
||||
#endif
|
||||
|
||||
#include "nsNameSpaceManager.h"
|
||||
|
@ -8,11 +8,11 @@
|
||||
#include "application.ini.h"
|
||||
#include "mozilla/Bootstrap.h"
|
||||
#if defined(XP_WIN)
|
||||
#include <windows.h>
|
||||
#include <stdlib.h>
|
||||
# include <windows.h>
|
||||
# include <stdlib.h>
|
||||
#elif defined(XP_UNIX)
|
||||
#include <sys/resource.h>
|
||||
#include <unistd.h>
|
||||
# include <sys/resource.h>
|
||||
# include <unistd.h>
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
@ -23,13 +23,13 @@
|
||||
#include "nsIFile.h"
|
||||
|
||||
#ifdef XP_WIN
|
||||
#include "LauncherProcessWin.h"
|
||||
# include "LauncherProcessWin.h"
|
||||
|
||||
#define XRE_WANT_ENVIRON
|
||||
#define strcasecmp _stricmp
|
||||
#ifdef MOZ_SANDBOX
|
||||
#include "mozilla/sandboxing/SandboxInitialization.h"
|
||||
#endif
|
||||
# define XRE_WANT_ENVIRON
|
||||
# define strcasecmp _stricmp
|
||||
# ifdef MOZ_SANDBOX
|
||||
# include "mozilla/sandboxing/SandboxInitialization.h"
|
||||
# endif
|
||||
#endif
|
||||
#include "BinaryPath.h"
|
||||
|
||||
@ -40,12 +40,12 @@
|
||||
#include "mozilla/WindowsDllBlocklist.h"
|
||||
|
||||
#ifdef LIBFUZZER
|
||||
#include "FuzzerDefs.h"
|
||||
# include "FuzzerDefs.h"
|
||||
#endif
|
||||
|
||||
#ifdef MOZ_LINUX_32_SSE2_STARTUP_ERROR
|
||||
#include <cpuid.h>
|
||||
#include "mozilla/Unused.h"
|
||||
# include <cpuid.h>
|
||||
# include "mozilla/Unused.h"
|
||||
|
||||
static bool IsSSE2Available() {
|
||||
// The rest of the app has been compiled to assume that SSE2 is present
|
||||
@ -84,14 +84,14 @@ __attribute__((constructor)) static void SSE2Check() {
|
||||
#endif
|
||||
|
||||
#if !defined(MOZ_WIDGET_COCOA) && !defined(MOZ_WIDGET_ANDROID)
|
||||
#define MOZ_BROWSER_CAN_BE_CONTENTPROC
|
||||
#include "../../ipc/contentproc/plugin-container.cpp"
|
||||
# define MOZ_BROWSER_CAN_BE_CONTENTPROC
|
||||
# include "../../ipc/contentproc/plugin-container.cpp"
|
||||
#endif
|
||||
|
||||
using namespace mozilla;
|
||||
|
||||
#ifdef XP_MACOSX
|
||||
#define kOSXResourcesFolder "Resources"
|
||||
# define kOSXResourcesFolder "Resources"
|
||||
#endif
|
||||
#define kDesktopFolder "browser"
|
||||
|
||||
@ -107,9 +107,9 @@ static MOZ_FORMAT_PRINTF(1, 2) void Output(const char* fmt, ...) {
|
||||
|
||||
wchar_t wide_msg[2048];
|
||||
MultiByteToWideChar(CP_UTF8, 0, msg, -1, wide_msg, _countof(wide_msg));
|
||||
#if MOZ_WINCONSOLE
|
||||
# if MOZ_WINCONSOLE
|
||||
fwprintf_s(stderr, wide_msg);
|
||||
#else
|
||||
# else
|
||||
// Linking user32 at load-time interferes with the DLL blocklist (bug 932100).
|
||||
// This is a rare codepath, so we can load user32 at run-time instead.
|
||||
HMODULE user32 = LoadLibraryW(L"user32.dll");
|
||||
@ -122,7 +122,7 @@ static MOZ_FORMAT_PRINTF(1, 2) void Output(const char* fmt, ...) {
|
||||
}
|
||||
FreeLibrary(user32);
|
||||
}
|
||||
#endif
|
||||
# endif
|
||||
#endif
|
||||
|
||||
va_end(ap);
|
||||
@ -196,12 +196,12 @@ static int do_main(int argc, char* argv[], char* envp[]) {
|
||||
sandboxing::GetInitializedBrokerServices();
|
||||
sandboxing::PermissionsService* permissionsService =
|
||||
sandboxing::GetPermissionsService();
|
||||
#if defined(MOZ_CONTENT_SANDBOX)
|
||||
# if defined(MOZ_CONTENT_SANDBOX)
|
||||
if (!brokerServices) {
|
||||
Output("Couldn't initialize the broker services.\n");
|
||||
return 255;
|
||||
}
|
||||
#endif
|
||||
# endif
|
||||
config.sandboxBrokerServices = brokerServices;
|
||||
config.sandboxPermissionsService = permissionsService;
|
||||
#endif
|
||||
@ -245,17 +245,17 @@ int main(int argc, char* argv[], char* envp[]) {
|
||||
// We are launching as a content process, delegate to the appropriate
|
||||
// main
|
||||
if (argc > 1 && IsArg(argv[1], "contentproc")) {
|
||||
#ifdef HAS_DLL_BLOCKLIST
|
||||
# ifdef HAS_DLL_BLOCKLIST
|
||||
DllBlocklist_Initialize(eDllBlocklistInitFlagIsChildProcess);
|
||||
#endif
|
||||
#if defined(XP_WIN) && defined(MOZ_SANDBOX)
|
||||
# endif
|
||||
# if defined(XP_WIN) && defined(MOZ_SANDBOX)
|
||||
// We need to initialize the sandbox TargetServices before InitXPCOMGlue
|
||||
// because we might need the sandbox broker to give access to some files.
|
||||
if (IsSandboxedProcess() && !sandboxing::GetInitializedTargetServices()) {
|
||||
Output("Failed to initialize the sandbox target services.");
|
||||
return 255;
|
||||
}
|
||||
#endif
|
||||
# endif
|
||||
|
||||
nsresult rv = InitXPCOMGlue();
|
||||
if (NS_FAILED(rv)) {
|
||||
@ -264,9 +264,9 @@ int main(int argc, char* argv[], char* envp[]) {
|
||||
|
||||
int result = content_process_main(gBootstrap.get(), argc, argv);
|
||||
|
||||
#if defined(DEBUG) && defined(HAS_DLL_BLOCKLIST)
|
||||
# if defined(DEBUG) && defined(HAS_DLL_BLOCKLIST)
|
||||
DllBlocklist_Shutdown();
|
||||
#endif
|
||||
# endif
|
||||
|
||||
// InitXPCOMGlue calls NS_LogInit, so we need to balance it here.
|
||||
gBootstrap->NS_LogTerm();
|
||||
|
@ -26,9 +26,9 @@
|
||||
#define DLL_BLOCKLIST_STRING_TYPE UNICODE_STRING
|
||||
|
||||
#if defined(MOZ_LAUNCHER_PROCESS) || defined(NIGHTLY_BUILD)
|
||||
#include "mozilla/WindowsDllBlocklistDefs.h"
|
||||
# include "mozilla/WindowsDllBlocklistDefs.h"
|
||||
#else
|
||||
#include "mozilla/WindowsDllBlocklistCommon.h"
|
||||
# include "mozilla/WindowsDllBlocklistCommon.h"
|
||||
DLL_BLOCKLIST_DEFINITIONS_BEGIN
|
||||
DLL_BLOCKLIST_DEFINITIONS_END
|
||||
#endif
|
||||
|
@ -32,7 +32,7 @@
|
||||
#include "ProcThreadAttributes.h"
|
||||
|
||||
#if defined(MOZ_LAUNCHER_PROCESS)
|
||||
#include "SameBinary.h"
|
||||
# include "SameBinary.h"
|
||||
#endif // defined(MOZ_LAUNCHER_PROCESS)
|
||||
|
||||
/**
|
||||
@ -56,8 +56,8 @@ static mozilla::LauncherVoidResult PostCreationSetup(HANDLE aChildProcess,
|
||||
|
||||
#if !defined( \
|
||||
PROCESS_CREATION_MITIGATION_POLICY_IMAGE_LOAD_PREFER_SYSTEM32_ALWAYS_ON)
|
||||
#define PROCESS_CREATION_MITIGATION_POLICY_IMAGE_LOAD_PREFER_SYSTEM32_ALWAYS_ON \
|
||||
(0x00000001ULL << 60)
|
||||
# define PROCESS_CREATION_MITIGATION_POLICY_IMAGE_LOAD_PREFER_SYSTEM32_ALWAYS_ON \
|
||||
(0x00000001ULL << 60)
|
||||
#endif // !defined(PROCESS_CREATION_MITIGATION_POLICY_IMAGE_LOAD_PREFER_SYSTEM32_ALWAYS_ON)
|
||||
|
||||
#if (_WIN32_WINNT < 0x0602)
|
||||
|
@ -5,15 +5,15 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifdef XP_WIN
|
||||
#define NS_WINIEHISTORYENUMERATOR_CID \
|
||||
{ \
|
||||
0x93480624, 0x806e, 0x4756, { \
|
||||
0xb7, 0xcb, 0x0f, 0xb7, 0xdd, 0x74, 0x6a, 0x8f \
|
||||
} \
|
||||
}
|
||||
# define NS_WINIEHISTORYENUMERATOR_CID \
|
||||
{ \
|
||||
0x93480624, 0x806e, 0x4756, { \
|
||||
0xb7, 0xcb, 0x0f, 0xb7, 0xdd, 0x74, 0x6a, 0x8f \
|
||||
} \
|
||||
}
|
||||
|
||||
#define NS_IEHISTORYENUMERATOR_CONTRACTID \
|
||||
"@mozilla.org/profile/migrator/iehistoryenumerator;1"
|
||||
# define NS_IEHISTORYENUMERATOR_CONTRACTID \
|
||||
"@mozilla.org/profile/migrator/iehistoryenumerator;1"
|
||||
#endif
|
||||
|
||||
#define NS_SHELLSERVICE_CID \
|
||||
@ -57,12 +57,12 @@
|
||||
}
|
||||
|
||||
#if defined(MOZ_WIDGET_COCOA)
|
||||
#define NS_MACATTRIBUTIONSERVICE_CONTRACTID "@mozilla.org/mac-attribution;1"
|
||||
# define NS_MACATTRIBUTIONSERVICE_CONTRACTID "@mozilla.org/mac-attribution;1"
|
||||
|
||||
#define NS_MACATTRIBUTIONSERVICE_CID \
|
||||
{ \
|
||||
0x6FC66A78, 0x6CBC, 0x4B3F, { \
|
||||
0xB7, 0xBA, 0x37, 0x92, 0x89, 0xB2, 0x92, 0x76 \
|
||||
} \
|
||||
}
|
||||
# define NS_MACATTRIBUTIONSERVICE_CID \
|
||||
{ \
|
||||
0x6FC66A78, 0x6CBC, 0x4B3F, { \
|
||||
0xB7, 0xBA, 0x37, 0x92, 0x89, 0xB2, 0x92, 0x76 \
|
||||
} \
|
||||
}
|
||||
#endif
|
||||
|
@ -9,19 +9,19 @@
|
||||
#include "DirectoryProvider.h"
|
||||
|
||||
#if defined(XP_WIN)
|
||||
#include "nsWindowsShellService.h"
|
||||
# include "nsWindowsShellService.h"
|
||||
#elif defined(XP_MACOSX)
|
||||
#include "nsMacShellService.h"
|
||||
# include "nsMacShellService.h"
|
||||
#elif defined(MOZ_WIDGET_GTK)
|
||||
#include "nsGNOMEShellService.h"
|
||||
# include "nsGNOMEShellService.h"
|
||||
#endif
|
||||
|
||||
#if defined(MOZ_WIDGET_COCOA)
|
||||
#include "nsMacAttribution.h"
|
||||
# include "nsMacAttribution.h"
|
||||
#endif
|
||||
|
||||
#if defined(XP_WIN)
|
||||
#include "nsIEHistoryEnumerator.h"
|
||||
# include "nsIEHistoryEnumerator.h"
|
||||
#endif
|
||||
|
||||
#include "AboutRedirector.h"
|
||||
|
@ -29,7 +29,7 @@
|
||||
#include "mozilla/Sprintf.h"
|
||||
#include "mozilla/dom/Element.h"
|
||||
#if defined(MOZ_WIDGET_GTK)
|
||||
#include "nsIImageToPixbuf.h"
|
||||
# include "nsIImageToPixbuf.h"
|
||||
#endif
|
||||
#include "nsXULAppAPI.h"
|
||||
#include "gfxPlatform.h"
|
||||
|
@ -36,7 +36,7 @@
|
||||
#include "shellapi.h"
|
||||
|
||||
#ifdef _WIN32_WINNT
|
||||
#undef _WIN32_WINNT
|
||||
# undef _WIN32_WINNT
|
||||
#endif
|
||||
#define _WIN32_WINNT 0x0600
|
||||
#define INITGUID
|
||||
@ -53,7 +53,7 @@
|
||||
#undef ACCESS_READ
|
||||
|
||||
#ifndef MAX_BUF
|
||||
#define MAX_BUF 4096
|
||||
# define MAX_BUF 4096
|
||||
#endif
|
||||
|
||||
#define REG_SUCCEEDED(val) (val == ERROR_SUCCESS)
|
||||
|
@ -15,16 +15,16 @@
|
||||
#define elfhack_text ".elfhack.text.v" ver
|
||||
|
||||
#ifndef R_ARM_V4BX
|
||||
#define R_ARM_V4BX 0x28
|
||||
# define R_ARM_V4BX 0x28
|
||||
#endif
|
||||
#ifndef R_ARM_CALL
|
||||
#define R_ARM_CALL 0x1c
|
||||
# define R_ARM_CALL 0x1c
|
||||
#endif
|
||||
#ifndef R_ARM_JUMP24
|
||||
#define R_ARM_JUMP24 0x1d
|
||||
# define R_ARM_JUMP24 0x1d
|
||||
#endif
|
||||
#ifndef R_ARM_THM_JUMP24
|
||||
#define R_ARM_THM_JUMP24 0x1e
|
||||
# define R_ARM_THM_JUMP24 0x1e
|
||||
#endif
|
||||
|
||||
char *rundir = nullptr;
|
||||
|
@ -13,11 +13,11 @@
|
||||
#undef Elf_Addr
|
||||
|
||||
#if defined(__LP64__)
|
||||
#define Elf_Ehdr Elf64_Ehdr
|
||||
#define Elf_Addr Elf64_Addr
|
||||
# define Elf_Ehdr Elf64_Ehdr
|
||||
# define Elf_Addr Elf64_Addr
|
||||
#else
|
||||
#define Elf_Ehdr Elf32_Ehdr
|
||||
#define Elf_Addr Elf32_Addr
|
||||
# define Elf_Ehdr Elf32_Ehdr
|
||||
# define Elf_Addr Elf32_Addr
|
||||
#endif
|
||||
|
||||
extern __attribute__((visibility("hidden"))) void original_init(int argc,
|
||||
|
@ -83,31 +83,31 @@ DEF(several)
|
||||
DEF(times)
|
||||
|
||||
#else
|
||||
#pragma GCC visibility push(default)
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
# pragma GCC visibility push(default)
|
||||
# include <stdlib.h>
|
||||
# include <stdio.h>
|
||||
|
||||
#define DEF(w) static const char str_##w[] = #w;
|
||||
#include "test.c"
|
||||
#undef DEF
|
||||
# define DEF(w) static const char str_##w[] = # w;
|
||||
# include "test.c"
|
||||
# undef DEF
|
||||
|
||||
const char *strings[] = {
|
||||
#define DEF(w) str_##w,
|
||||
#include "test.c"
|
||||
#include "test.c"
|
||||
#include "test.c"
|
||||
# define DEF(w) str_##w,
|
||||
# include "test.c"
|
||||
# include "test.c"
|
||||
# include "test.c"
|
||||
};
|
||||
|
||||
/* Create a hole between two zones of relative relocations */
|
||||
const int hole[] = {42, 42, 42, 42};
|
||||
|
||||
const char *strings2[] = {
|
||||
#include "test.c"
|
||||
#include "test.c"
|
||||
#include "test.c"
|
||||
#include "test.c"
|
||||
#include "test.c"
|
||||
#undef DEF
|
||||
# include "test.c"
|
||||
# include "test.c"
|
||||
# include "test.c"
|
||||
# include "test.c"
|
||||
# include "test.c"
|
||||
# undef DEF
|
||||
};
|
||||
|
||||
static int ret = 1;
|
||||
@ -144,25 +144,25 @@ void end_test() {
|
||||
|
||||
void test() {
|
||||
int i = 0, j = 0;
|
||||
#define DEF_(a, i, w) \
|
||||
if (a[i++] != str_##w) return;
|
||||
#define DEF(w) DEF_(strings, i, w)
|
||||
#include "test.c"
|
||||
#include "test.c"
|
||||
#include "test.c"
|
||||
#undef DEF
|
||||
#define DEF(w) DEF_(strings2, j, w)
|
||||
#include "test.c"
|
||||
#include "test.c"
|
||||
#include "test.c"
|
||||
#include "test.c"
|
||||
#include "test.c"
|
||||
#undef DEF
|
||||
# define DEF_(a, i, w) \
|
||||
if (a[i++] != str_##w) return;
|
||||
# define DEF(w) DEF_(strings, i, w)
|
||||
# include "test.c"
|
||||
# include "test.c"
|
||||
# include "test.c"
|
||||
# undef DEF
|
||||
# define DEF(w) DEF_(strings2, j, w)
|
||||
# include "test.c"
|
||||
# include "test.c"
|
||||
# include "test.c"
|
||||
# include "test.c"
|
||||
# include "test.c"
|
||||
# undef DEF
|
||||
if (i != sizeof(strings) / sizeof(strings[0]) &&
|
||||
j != sizeof(strings2) / sizeof(strings2[0]))
|
||||
fprintf(stderr, "WARNING: Test doesn't cover the whole array\n");
|
||||
end_test();
|
||||
}
|
||||
|
||||
#pragma GCC visibility pop
|
||||
# pragma GCC visibility pop
|
||||
#endif
|
||||
|
@ -38,8 +38,8 @@ overlap with libstdc++.
|
||||
#if MOZ_LIBSTDCXX_VERSION >= GLIBCXX_VERSION(3, 4, 18)
|
||||
// Implementation of utility functions for the prime rehash policy used in
|
||||
// unordered_map and unordered_set.
|
||||
#include <unordered_map>
|
||||
#include <tr1/unordered_map>
|
||||
# include <unordered_map>
|
||||
# include <tr1/unordered_map>
|
||||
namespace std {
|
||||
size_t __attribute__((weak))
|
||||
__detail::_Prime_rehash_policy::_M_next_bkt(size_t __n) const {
|
||||
@ -103,8 +103,8 @@ __attribute__((weak)) runtime_error::runtime_error(char const* s)
|
||||
|
||||
#if MOZ_LIBSTDCXX_VERSION >= GLIBCXX_VERSION(3, 4, 21)
|
||||
/* Expose the definitions for the old ABI, allowing us to call its functions */
|
||||
#define _GLIBCXX_THREAD_ABI_COMPAT 1
|
||||
#include <thread>
|
||||
# define _GLIBCXX_THREAD_ABI_COMPAT 1
|
||||
# include <thread>
|
||||
|
||||
namespace std {
|
||||
/* The old ABI has a thread::_M_start_thread(shared_ptr<_Impl_base>),
|
||||
@ -121,7 +121,7 @@ __attribute__((weak)) void thread::_M_start_thread(shared_ptr<_Impl_base> impl,
|
||||
_M_start_thread(std::move(impl));
|
||||
}
|
||||
|
||||
#if MOZ_LIBSTDCXX_VERSION >= GLIBCXX_VERSION(3, 4, 22)
|
||||
# if MOZ_LIBSTDCXX_VERSION >= GLIBCXX_VERSION(3, 4, 22)
|
||||
/* We need a _Impl_base-derived class wrapping a _State to call the old ABI
|
||||
* from what we got by diverting the new API */
|
||||
struct StateWrapper : public thread::_Impl_base {
|
||||
@ -141,7 +141,7 @@ __attribute__((weak)) void thread::_M_start_thread(unique_ptr<_State> aState,
|
||||
/* For some reason this is a symbol exported by new versions of libstdc++,
|
||||
* even though the destructor is default there too */
|
||||
__attribute__((weak)) thread::_State::~_State() = default;
|
||||
#endif
|
||||
# endif
|
||||
} // namespace std
|
||||
#endif
|
||||
|
||||
|
@ -11,9 +11,9 @@
|
||||
#include "nsChromeRegistryChrome.h"
|
||||
|
||||
#if defined(XP_WIN)
|
||||
#include <windows.h>
|
||||
# include <windows.h>
|
||||
#elif defined(XP_MACOSX)
|
||||
#include <CoreServices/CoreServices.h>
|
||||
# include <CoreServices/CoreServices.h>
|
||||
#endif
|
||||
|
||||
#include "nsArrayEnumerator.h"
|
||||
|
16
config/external/nspr/prcpucfg.h
vendored
16
config/external/nspr/prcpucfg.h
vendored
@ -11,21 +11,21 @@
|
||||
* system as well as NSS' build system for now.
|
||||
*/
|
||||
#if defined(XP_DARWIN) || defined(DARWIN)
|
||||
#include "md/_darwin.cfg"
|
||||
# include "md/_darwin.cfg"
|
||||
#elif defined(XP_WIN) || defined(_WINDOWS)
|
||||
#include "md/_win95.cfg"
|
||||
# include "md/_win95.cfg"
|
||||
#elif defined(__FreeBSD__)
|
||||
#include "md/_freebsd.cfg"
|
||||
# include "md/_freebsd.cfg"
|
||||
#elif defined(__NetBSD__)
|
||||
#include "md/_netbsd.cfg"
|
||||
# include "md/_netbsd.cfg"
|
||||
#elif defined(__OpenBSD__)
|
||||
#include "md/_openbsd.cfg"
|
||||
# include "md/_openbsd.cfg"
|
||||
#elif defined(__linux__)
|
||||
#include "md/_linux.cfg"
|
||||
# include "md/_linux.cfg"
|
||||
#elif defined(__sun__)
|
||||
#include "md/_solaris.cfg"
|
||||
# include "md/_solaris.cfg"
|
||||
#else
|
||||
#error "Unsupported platform!"
|
||||
# error "Unsupported platform!"
|
||||
#endif
|
||||
|
||||
#endif /* NSPR_PRCPUCFG_H_ */
|
||||
|
@ -25,29 +25,29 @@
|
||||
#include "pathsub.h"
|
||||
|
||||
#ifdef HAVE_GETOPT_H
|
||||
#include <getopt.h>
|
||||
# include <getopt.h>
|
||||
#endif
|
||||
|
||||
#ifdef SUNOS4
|
||||
#include "sunos4.h"
|
||||
# include "sunos4.h"
|
||||
#endif
|
||||
|
||||
#ifdef NEXTSTEP
|
||||
#include <bsd/libc.h>
|
||||
# include <bsd/libc.h>
|
||||
#endif
|
||||
|
||||
#ifdef __QNX__
|
||||
#include <unix.h>
|
||||
# include <unix.h>
|
||||
#endif
|
||||
|
||||
#ifdef NEED_S_ISLNK
|
||||
#if !defined(S_ISLNK) && defined(S_IFLNK)
|
||||
#define S_ISLNK(a) (((a)&S_IFMT) == S_IFLNK)
|
||||
#endif
|
||||
# if !defined(S_ISLNK) && defined(S_IFLNK)
|
||||
# define S_ISLNK(a) (((a)&S_IFMT) == S_IFLNK)
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifndef _DIRECTORY_SEPARATOR
|
||||
#define _DIRECTORY_SEPARATOR "/"
|
||||
# define _DIRECTORY_SEPARATOR "/"
|
||||
#endif /* _DIRECTORY_SEPARATOR */
|
||||
|
||||
#ifdef NEED_FCHMOD_PROTO
|
||||
@ -157,11 +157,11 @@ static void copyfile(char *name, char *toname, mode_t mode, char *group,
|
||||
utb.modtime = sb.st_mtime;
|
||||
if (utime(toname, &utb) < 0) fail("cannot set times of %s", toname);
|
||||
}
|
||||
#ifdef HAVE_FCHMOD
|
||||
# ifdef HAVE_FCHMOD
|
||||
if (fchmod(tofd, mode) < 0)
|
||||
#else
|
||||
# else
|
||||
if (chmod(toname, mode) < 0)
|
||||
#endif
|
||||
# endif
|
||||
fail("cannot change mode of %s", toname);
|
||||
#endif
|
||||
if ((owner || group) && fchown(tofd, uid, gid) < 0)
|
||||
@ -290,12 +290,12 @@ int main(int argc, char **argv) {
|
||||
|
||||
if (!cwd) {
|
||||
#ifndef NEEDS_GETCWD
|
||||
#ifndef GETCWD_CANT_MALLOC
|
||||
# ifndef GETCWD_CANT_MALLOC
|
||||
cwd = getcwd(0, PATH_MAX);
|
||||
#else
|
||||
# else
|
||||
cwd = malloc(PATH_MAX + 1);
|
||||
cwd = getcwd(cwd, PATH_MAX);
|
||||
#endif
|
||||
# endif
|
||||
#else
|
||||
cwd = malloc(PATH_MAX + 1);
|
||||
cwd = getwd(cwd);
|
||||
@ -304,12 +304,12 @@ int main(int argc, char **argv) {
|
||||
|
||||
xchdir(todir);
|
||||
#ifndef NEEDS_GETCWD
|
||||
#ifndef GETCWD_CANT_MALLOC
|
||||
# ifndef GETCWD_CANT_MALLOC
|
||||
todir = getcwd(0, PATH_MAX);
|
||||
#else
|
||||
# else
|
||||
todir = malloc(PATH_MAX + 1);
|
||||
todir = getcwd(todir, PATH_MAX);
|
||||
#endif
|
||||
# endif
|
||||
#else
|
||||
todir = malloc(PATH_MAX + 1);
|
||||
todir = getwd(todir);
|
||||
|
@ -20,11 +20,11 @@
|
||||
#include "pathsub.h"
|
||||
|
||||
#ifdef USE_REENTRANT_LIBC
|
||||
#include <libc_r.h>
|
||||
# include <libc_r.h>
|
||||
#endif
|
||||
|
||||
#ifdef SUNOS4
|
||||
#include "sunos4.h"
|
||||
# include "sunos4.h"
|
||||
#endif
|
||||
|
||||
char *program;
|
||||
@ -70,7 +70,7 @@ char *getcomponent(char *path, char *name) {
|
||||
}
|
||||
|
||||
#ifdef LAME_READDIR
|
||||
#include <sys/param.h>
|
||||
# include <sys/param.h>
|
||||
/*
|
||||
** The static buffer in Unixware's readdir is too small.
|
||||
*/
|
||||
|
@ -14,7 +14,7 @@
|
||||
#include <sys/types.h>
|
||||
|
||||
#ifndef PATH_MAX
|
||||
#define PATH_MAX 1024
|
||||
# define PATH_MAX 1024
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
@ -12,11 +12,11 @@
|
||||
#include "nsIProtocolHandler.h"
|
||||
|
||||
#if defined(MOZ_WIDGET_ANDROID) && defined(RELEASE_OR_BETA)
|
||||
#define ABOUT_CONFIG_BLOCKED_GV
|
||||
# define ABOUT_CONFIG_BLOCKED_GV
|
||||
#endif
|
||||
|
||||
#ifdef ABOUT_CONFIG_BLOCKED_GV
|
||||
#include "mozilla/jni/Utils.h" // for mozilla::jni::IsFennec()
|
||||
# include "mozilla/jni/Utils.h" // for mozilla::jni::IsFennec()
|
||||
#endif
|
||||
|
||||
NS_IMPL_ISUPPORTS(nsAboutRedirector, nsIAboutModule)
|
||||
|
@ -12,7 +12,7 @@
|
||||
#include <algorithm>
|
||||
|
||||
#ifdef MOZ_TOOLKIT_SEARCH
|
||||
#include "nsIBrowserSearchService.h"
|
||||
# include "nsIBrowserSearchService.h"
|
||||
#endif
|
||||
|
||||
#include "nsIURIFixup.h"
|
||||
|
@ -9,10 +9,10 @@
|
||||
#include <algorithm>
|
||||
|
||||
#ifdef XP_WIN
|
||||
#include <process.h>
|
||||
#define getpid _getpid
|
||||
# include <process.h>
|
||||
# define getpid _getpid
|
||||
#else
|
||||
#include <unistd.h> // for getpid()
|
||||
# include <unistd.h> // for getpid()
|
||||
#endif
|
||||
|
||||
#include "mozilla/ArrayUtils.h"
|
||||
@ -209,17 +209,17 @@
|
||||
#include "timeline/JavascriptTimelineMarker.h"
|
||||
|
||||
#ifdef MOZ_PLACES
|
||||
#include "nsIFaviconService.h"
|
||||
#include "mozIPlacesPendingOperation.h"
|
||||
# include "nsIFaviconService.h"
|
||||
# include "mozIPlacesPendingOperation.h"
|
||||
#endif
|
||||
|
||||
#if NS_PRINT_PREVIEW
|
||||
#include "nsIDocumentViewerPrint.h"
|
||||
#include "nsIWebBrowserPrint.h"
|
||||
# include "nsIDocumentViewerPrint.h"
|
||||
# include "nsIWebBrowserPrint.h"
|
||||
#endif
|
||||
|
||||
#ifdef MOZ_TOOLKIT_SEARCH
|
||||
#include "nsIBrowserSearchService.h"
|
||||
# include "nsIBrowserSearchService.h"
|
||||
#endif
|
||||
|
||||
using namespace mozilla;
|
||||
|
@ -7,7 +7,7 @@
|
||||
#define nsDocShellEditorData_h__
|
||||
|
||||
#ifndef nsCOMPtr_h___
|
||||
#include "nsCOMPtr.h"
|
||||
# include "nsCOMPtr.h"
|
||||
#endif
|
||||
|
||||
#include "mozilla/HTMLEditor.h"
|
||||
|
@ -9,18 +9,18 @@
|
||||
|
||||
#ifdef MOZILLA_INTERNAL_API
|
||||
|
||||
#include "nsDOMNavigationTiming.h"
|
||||
#include "nsIDocShell.h"
|
||||
#include "nsIWebNavigation.h"
|
||||
# include "nsDOMNavigationTiming.h"
|
||||
# include "nsIDocShell.h"
|
||||
# include "nsIWebNavigation.h"
|
||||
|
||||
/**
|
||||
* Load flag for error pages. This uses one of the reserved flag
|
||||
* values from nsIWebNavigation.
|
||||
*/
|
||||
#define LOAD_FLAGS_ERROR_PAGE 0x0001U
|
||||
# define LOAD_FLAGS_ERROR_PAGE 0x0001U
|
||||
|
||||
#define MAKE_LOAD_TYPE(type, flags) ((type) | ((flags) << 16))
|
||||
#define LOAD_TYPE_HAS_FLAGS(type, flags) ((type) & ((flags) << 16))
|
||||
# define MAKE_LOAD_TYPE(type, flags) ((type) | ((flags) << 16))
|
||||
# define LOAD_TYPE_HAS_FLAGS(type, flags) ((type) & ((flags) << 16))
|
||||
|
||||
/**
|
||||
* These are flags that confuse ConvertLoadTypeToDocShellLoadInfo and should
|
||||
@ -28,8 +28,8 @@
|
||||
* above 0xffff (e.g. LOAD_FLAGS_BYPASS_CLASSIFIER), since MAKE_LOAD_TYPE would
|
||||
* just shift them out anyway.
|
||||
*/
|
||||
#define EXTRA_LOAD_FLAGS \
|
||||
(LOAD_FLAGS_FIRST_LOAD | LOAD_FLAGS_ALLOW_POPUPS | 0xffff0000)
|
||||
# define EXTRA_LOAD_FLAGS \
|
||||
(LOAD_FLAGS_FIRST_LOAD | LOAD_FLAGS_ALLOW_POPUPS | 0xffff0000)
|
||||
|
||||
/* load types are legal combinations of load commands and flags
|
||||
*
|
||||
|
@ -26,10 +26,10 @@
|
||||
#include "nsLocalHandlerApp.h"
|
||||
#include "ContentHandlerService.h"
|
||||
#ifdef MOZ_ENABLE_DBUS
|
||||
#include "nsDBusHandlerApp.h"
|
||||
# include "nsDBusHandlerApp.h"
|
||||
#endif
|
||||
#if defined(MOZ_WIDGET_ANDROID)
|
||||
#include "nsExternalURLHandlerService.h"
|
||||
# include "nsExternalURLHandlerService.h"
|
||||
#endif
|
||||
|
||||
// session history
|
||||
|
@ -225,9 +225,9 @@ uint32_t nsSHistory::CalcMaxTotalViewers() {
|
||||
// This value allows tweaking how fast the allowed amount of content viewers
|
||||
// grows with increasing amounts of memory. Larger values mean slower growth.
|
||||
#ifdef ANDROID
|
||||
#define MAX_TOTAL_VIEWERS_BIAS 15.9
|
||||
# define MAX_TOTAL_VIEWERS_BIAS 15.9
|
||||
#else
|
||||
#define MAX_TOTAL_VIEWERS_BIAS 14
|
||||
# define MAX_TOTAL_VIEWERS_BIAS 14
|
||||
#endif
|
||||
|
||||
// Calculate an estimate of how many ContentViewers we should cache based
|
||||
@ -660,7 +660,7 @@ nsresult nsSHistory::PrintHistory() {
|
||||
nsString title;
|
||||
entry->GetTitle(title);
|
||||
|
||||
#if 0
|
||||
# if 0
|
||||
nsAutoCString url;
|
||||
if (uri) {
|
||||
uri->GetSpec(url);
|
||||
@ -671,7 +671,7 @@ nsresult nsSHistory::PrintHistory() {
|
||||
|
||||
printf("\t\t Title = %s\n", NS_LossyConvertUTF16toASCII(title).get());
|
||||
printf("\t\t layout History Data = %x\n", layoutHistoryState.get());
|
||||
#endif
|
||||
# endif
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
|
@ -25,7 +25,7 @@
|
||||
|
||||
// X11 has a #define for CurrentTime.
|
||||
#ifdef CurrentTime
|
||||
#undef CurrentTime
|
||||
# undef CurrentTime
|
||||
#endif
|
||||
|
||||
struct JSContext;
|
||||
|
@ -169,8 +169,8 @@ class AttrArray {
|
||||
#ifdef _MSC_VER
|
||||
// Disable MSVC warning 'nonstandard extension used: zero-sized array in
|
||||
// struct/union'
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable : 4200)
|
||||
# pragma warning(push)
|
||||
# pragma warning(disable : 4200)
|
||||
#endif
|
||||
class Impl {
|
||||
public:
|
||||
@ -201,7 +201,7 @@ class AttrArray {
|
||||
InternalAttr mBuffer[0];
|
||||
};
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(pop)
|
||||
# pragma warning(pop)
|
||||
#endif
|
||||
|
||||
mozilla::Span<InternalAttr> NonMappedAttrs() {
|
||||
|
@ -9,8 +9,8 @@
|
||||
|
||||
// We intentionally shadow non-virtual methods, but gcc gets confused.
|
||||
#ifdef __GNUC__
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Woverloaded-virtual"
|
||||
# pragma GCC diagnostic push
|
||||
# pragma GCC diagnostic ignored "-Woverloaded-virtual"
|
||||
#endif
|
||||
|
||||
#include <stdint.h>
|
||||
@ -177,7 +177,7 @@ class DOMException : public Exception {
|
||||
} // namespace mozilla
|
||||
|
||||
#ifdef __GNUC__
|
||||
#pragma GCC diagnostic pop
|
||||
# pragma GCC diagnostic pop
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
@ -13,10 +13,10 @@
|
||||
#include "nsIDocShell.h"
|
||||
#include "nsDOMMutationObserver.h"
|
||||
#if defined(XP_WIN)
|
||||
#include <processthreadsapi.h> // for GetCurrentProcessId()
|
||||
# include <processthreadsapi.h> // for GetCurrentProcessId()
|
||||
#else
|
||||
#include <unistd.h> // for getpid()
|
||||
#endif // defined(XP_WIN)
|
||||
# include <unistd.h> // for getpid()
|
||||
#endif // defined(XP_WIN)
|
||||
|
||||
namespace mozilla {
|
||||
namespace dom {
|
||||
|
@ -266,12 +266,12 @@
|
||||
#include "mozilla/dom/DocGroup.h"
|
||||
#include "mozilla/dom/TabGroup.h"
|
||||
#ifdef MOZ_XUL
|
||||
#include "mozilla/dom/XULBroadcastManager.h"
|
||||
#include "mozilla/dom/XULPersist.h"
|
||||
#include "nsIXULWindow.h"
|
||||
#include "nsXULCommandDispatcher.h"
|
||||
#include "nsXULPopupManager.h"
|
||||
#include "nsIDocShellTreeOwner.h"
|
||||
# include "mozilla/dom/XULBroadcastManager.h"
|
||||
# include "mozilla/dom/XULPersist.h"
|
||||
# include "nsIXULWindow.h"
|
||||
# include "nsXULCommandDispatcher.h"
|
||||
# include "nsXULPopupManager.h"
|
||||
# include "nsIDocShellTreeOwner.h"
|
||||
#endif
|
||||
#include "nsIPresShellInlines.h"
|
||||
#include "mozilla/dom/BoxObject.h"
|
||||
@ -7337,7 +7337,7 @@ void Document::CollectDescendantDocuments(
|
||||
}
|
||||
|
||||
#ifdef DEBUG_bryner
|
||||
#define DEBUG_PAGE_CACHE
|
||||
# define DEBUG_PAGE_CACHE
|
||||
#endif
|
||||
|
||||
bool Document::CanSavePresentation(nsIRequest* aNewRequest) {
|
||||
|
@ -63,11 +63,11 @@
|
||||
|
||||
// windows.h #defines CreateEvent
|
||||
#ifdef CreateEvent
|
||||
#undef CreateEvent
|
||||
# undef CreateEvent
|
||||
#endif
|
||||
|
||||
#ifdef MOZILLA_INTERNAL_API
|
||||
#include "mozilla/dom/DocumentBinding.h"
|
||||
# include "mozilla/dom/DocumentBinding.h"
|
||||
#else
|
||||
namespace mozilla {
|
||||
namespace dom {
|
||||
|
@ -81,12 +81,12 @@
|
||||
#include "nsCSSPseudoElements.h"
|
||||
#include "nsWindowSizes.h"
|
||||
#ifdef MOZ_XUL
|
||||
#include "nsXULElement.h"
|
||||
# include "nsXULElement.h"
|
||||
#endif /* MOZ_XUL */
|
||||
#include "SVGElement.h"
|
||||
#include "nsFrameSelection.h"
|
||||
#ifdef DEBUG
|
||||
#include "nsRange.h"
|
||||
# include "nsRange.h"
|
||||
#endif
|
||||
|
||||
#include "nsBindingManager.h"
|
||||
@ -179,9 +179,9 @@ namespace dom {
|
||||
// thread pointer that comes with the non-threadsafe refcount on
|
||||
// nsIContent.
|
||||
#ifdef MOZ_THREAD_SAFETY_OWNERSHIP_CHECKS_SUPPORTED
|
||||
#define EXTRA_DOM_NODE_BYTES 8
|
||||
# define EXTRA_DOM_NODE_BYTES 8
|
||||
#else
|
||||
#define EXTRA_DOM_NODE_BYTES 0
|
||||
# define EXTRA_DOM_NODE_BYTES 0
|
||||
#endif
|
||||
|
||||
#define ASSERT_NODE_SIZE(type, opt_size_64, opt_size_32) \
|
||||
|
@ -64,11 +64,11 @@
|
||||
#include "nsAttrValueOrString.h"
|
||||
#include "nsQueryObject.h"
|
||||
#ifdef MOZ_XUL
|
||||
#include "nsXULElement.h"
|
||||
# include "nsXULElement.h"
|
||||
#endif /* MOZ_XUL */
|
||||
#include "nsFrameSelection.h"
|
||||
#ifdef DEBUG
|
||||
#include "nsRange.h"
|
||||
# include "nsRange.h"
|
||||
#endif
|
||||
|
||||
#include "nsBindingManager.h"
|
||||
|
@ -16,7 +16,7 @@ namespace mozilla {
|
||||
namespace dom {
|
||||
|
||||
#ifdef XP_WIN
|
||||
#undef GetLocaleInfo
|
||||
# undef GetLocaleInfo
|
||||
#endif
|
||||
|
||||
class IntlUtils final : public nsISupports, public nsWrapperCache {
|
||||
|
@ -10,9 +10,9 @@
|
||||
#include "mozilla/MemoryReporting.h"
|
||||
#include "mozilla/dom/Element.h"
|
||||
#if defined(MOZ_PLACES)
|
||||
#include "mozilla/places/History.h"
|
||||
# include "mozilla/places/History.h"
|
||||
#else
|
||||
#include "mozilla/IHistory.h"
|
||||
# include "mozilla/IHistory.h"
|
||||
#endif
|
||||
#include "nsIURL.h"
|
||||
#include "nsIURIMutator.h"
|
||||
|
@ -10,10 +10,10 @@
|
||||
#include "nsContentUtils.h"
|
||||
|
||||
#ifdef ANDROID
|
||||
#include <android/log.h>
|
||||
# include <android/log.h>
|
||||
#endif
|
||||
#ifdef XP_WIN
|
||||
#include <windows.h>
|
||||
# include <windows.h>
|
||||
#endif
|
||||
|
||||
namespace mozilla {
|
||||
|
@ -95,7 +95,7 @@
|
||||
#include "mozilla/dom/WorkerRunnable.h"
|
||||
|
||||
#if defined(XP_LINUX)
|
||||
#include "mozilla/Hal.h"
|
||||
# include "mozilla/Hal.h"
|
||||
#endif
|
||||
|
||||
#include "mozilla/EMEUtils.h"
|
||||
|
@ -61,9 +61,9 @@ class PopupBlocker final {
|
||||
} // namespace mozilla
|
||||
|
||||
#ifdef MOZILLA_INTERNAL_API
|
||||
#define NS_AUTO_POPUP_STATE_PUSHER nsAutoPopupStatePusherInternal
|
||||
# define NS_AUTO_POPUP_STATE_PUSHER nsAutoPopupStatePusherInternal
|
||||
#else
|
||||
#define NS_AUTO_POPUP_STATE_PUSHER nsAutoPopupStatePusherExternal
|
||||
# define NS_AUTO_POPUP_STATE_PUSHER nsAutoPopupStatePusherExternal
|
||||
#endif
|
||||
|
||||
// Helper class that helps with pushing and popping popup control
|
||||
|
@ -81,9 +81,9 @@ static bool IsValidSelectionPoint(nsFrameSelection* aFrameSel, nsINode* aNode);
|
||||
|
||||
#ifdef PRINT_RANGE
|
||||
static void printRange(nsRange* aDomRange);
|
||||
#define DEBUG_OUT_RANGE(x) printRange(x)
|
||||
# define DEBUG_OUT_RANGE(x) printRange(x)
|
||||
#else
|
||||
#define DEBUG_OUT_RANGE(x)
|
||||
# define DEBUG_OUT_RANGE(x)
|
||||
#endif // PRINT_RANGE
|
||||
|
||||
/******************************************************************************
|
||||
|
@ -44,8 +44,8 @@
|
||||
#include "nsQueryObject.h"
|
||||
|
||||
#ifdef MOZ_WEBRTC
|
||||
#include "mozilla/dom/RTCCertificate.h"
|
||||
#include "mozilla/dom/RTCCertificateBinding.h"
|
||||
# include "mozilla/dom/RTCCertificate.h"
|
||||
# include "mozilla/dom/RTCCertificateBinding.h"
|
||||
#endif
|
||||
|
||||
using namespace mozilla::ipc;
|
||||
|
@ -17,7 +17,7 @@
|
||||
#include "nsTArray.h"
|
||||
|
||||
#ifdef DEBUG
|
||||
#include "nsIThread.h"
|
||||
# include "nsIThread.h"
|
||||
#endif
|
||||
|
||||
class nsIInputStream;
|
||||
|
@ -51,7 +51,7 @@ static bool sInited = 0;
|
||||
// to dom::TraceBlackJS().
|
||||
uint32_t nsCCUncollectableMarker::sGeneration = 1;
|
||||
#ifdef MOZ_XUL
|
||||
#include "nsXULPrototypeCache.h"
|
||||
# include "nsXULPrototypeCache.h"
|
||||
#endif
|
||||
|
||||
NS_IMPL_ISUPPORTS(nsCCUncollectableMarker, nsIObserver)
|
||||
|
@ -31,9 +31,9 @@
|
||||
#include "PLDHashTable.h"
|
||||
|
||||
#ifdef DEBUG_CONTENT_LIST
|
||||
#define ASSERT_IN_SYNC AssertInSync()
|
||||
# define ASSERT_IN_SYNC AssertInSync()
|
||||
#else
|
||||
#define ASSERT_IN_SYNC PR_BEGIN_MACRO PR_END_MACRO
|
||||
# define ASSERT_IN_SYNC PR_BEGIN_MACRO PR_END_MACRO
|
||||
#endif
|
||||
|
||||
using namespace mozilla;
|
||||
|
@ -46,20 +46,20 @@ nsContentPolicy::nsContentPolicy() : mPolicies(NS_CONTENTPOLICY_CATEGORY) {}
|
||||
nsContentPolicy::~nsContentPolicy() {}
|
||||
|
||||
#ifdef DEBUG
|
||||
#define WARN_IF_URI_UNINITIALIZED(uri, name) \
|
||||
PR_BEGIN_MACRO \
|
||||
if ((uri)) { \
|
||||
nsAutoCString spec; \
|
||||
(uri)->GetAsciiSpec(spec); \
|
||||
if (spec.IsEmpty()) { \
|
||||
NS_WARNING(name " is uninitialized, fix caller"); \
|
||||
} \
|
||||
} \
|
||||
PR_END_MACRO
|
||||
# define WARN_IF_URI_UNINITIALIZED(uri, name) \
|
||||
PR_BEGIN_MACRO \
|
||||
if ((uri)) { \
|
||||
nsAutoCString spec; \
|
||||
(uri)->GetAsciiSpec(spec); \
|
||||
if (spec.IsEmpty()) { \
|
||||
NS_WARNING(name " is uninitialized, fix caller"); \
|
||||
} \
|
||||
} \
|
||||
PR_END_MACRO
|
||||
|
||||
#else // ! defined(DEBUG)
|
||||
|
||||
#define WARN_IF_URI_UNINITIALIZED(uri, name)
|
||||
# define WARN_IF_URI_UNINITIALIZED(uri, name)
|
||||
|
||||
#endif // defined(DEBUG)
|
||||
|
||||
|
@ -52,21 +52,21 @@ class ScriptLoader;
|
||||
|
||||
extern mozilla::LazyLogModule gContentSinkLogModuleInfo;
|
||||
|
||||
#define SINK_TRACE_CALLS 0x1
|
||||
#define SINK_TRACE_REFLOW 0x2
|
||||
#define SINK_ALWAYS_REFLOW 0x4
|
||||
# define SINK_TRACE_CALLS 0x1
|
||||
# define SINK_TRACE_REFLOW 0x2
|
||||
# define SINK_ALWAYS_REFLOW 0x4
|
||||
|
||||
#define SINK_LOG_TEST(_lm, _bit) (int((_lm)->Level()) & (_bit))
|
||||
# define SINK_LOG_TEST(_lm, _bit) (int((_lm)->Level()) & (_bit))
|
||||
|
||||
#define SINK_TRACE(_lm, _bit, _args) \
|
||||
do { \
|
||||
if (SINK_LOG_TEST(_lm, _bit)) { \
|
||||
printf_stderr _args; \
|
||||
} \
|
||||
} while (0)
|
||||
# define SINK_TRACE(_lm, _bit, _args) \
|
||||
do { \
|
||||
if (SINK_LOG_TEST(_lm, _bit)) { \
|
||||
printf_stderr _args; \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
#else
|
||||
#define SINK_TRACE(_lm, _bit, _args)
|
||||
# define SINK_TRACE(_lm, _bit, _args)
|
||||
#endif
|
||||
|
||||
#undef SINK_NO_INCREMENTAL
|
||||
|
@ -242,7 +242,7 @@
|
||||
|
||||
#if defined(XP_WIN)
|
||||
// Undefine LoadImage to prevent naming conflict with Windows.
|
||||
#undef LoadImage
|
||||
# undef LoadImage
|
||||
#endif
|
||||
|
||||
extern "C" int MOZ_XMLTranslateEntity(const char* ptr, const char* end,
|
||||
|
@ -10,11 +10,11 @@
|
||||
#define nsContentUtils_h___
|
||||
|
||||
#if defined(XP_WIN)
|
||||
#include <float.h>
|
||||
# include <float.h>
|
||||
#endif
|
||||
|
||||
#if defined(SOLARIS)
|
||||
#include <ieeefp.h>
|
||||
# include <ieeefp.h>
|
||||
#endif
|
||||
|
||||
#include "js/TypeDecls.h"
|
||||
@ -50,7 +50,7 @@
|
||||
|
||||
#if defined(XP_WIN)
|
||||
// Undefine LoadImage to prevent naming conflict with Windows.
|
||||
#undef LoadImage
|
||||
# undef LoadImage
|
||||
#endif
|
||||
|
||||
class imgICache;
|
||||
|
@ -43,13 +43,13 @@
|
||||
#include "nsContentCID.h"
|
||||
|
||||
#ifdef XP_WIN
|
||||
#include "nsCExternalHandlerService.h"
|
||||
#include "nsEscape.h"
|
||||
#include "nsIMIMEInfo.h"
|
||||
#include "nsIMIMEService.h"
|
||||
#include "nsIURL.h"
|
||||
#include "nsReadableUtils.h"
|
||||
#include "nsXULAppAPI.h"
|
||||
# include "nsCExternalHandlerService.h"
|
||||
# include "nsEscape.h"
|
||||
# include "nsIMIMEInfo.h"
|
||||
# include "nsIMIMEService.h"
|
||||
# include "nsIURL.h"
|
||||
# include "nsReadableUtils.h"
|
||||
# include "nsXULAppAPI.h"
|
||||
#endif
|
||||
|
||||
#include "mozilla/ContentEvents.h"
|
||||
|
@ -33,7 +33,7 @@
|
||||
// Since we've moved the windows.h include down here, we have to explicitly
|
||||
// undef GetBinaryType, otherwise we'll get really odd conflicts
|
||||
#ifdef GetBinaryType
|
||||
#undef GetBinaryType
|
||||
# undef GetBinaryType
|
||||
#endif
|
||||
|
||||
using namespace mozilla;
|
||||
|
@ -20,7 +20,7 @@
|
||||
#include "mozilla/TimeStamp.h"
|
||||
#include "mozilla/Telemetry.h"
|
||||
#ifdef MOZ_GECKO_PROFILER
|
||||
#include "ProfilerMarkerPayload.h"
|
||||
# include "ProfilerMarkerPayload.h"
|
||||
#endif
|
||||
|
||||
using namespace mozilla;
|
||||
|
@ -64,8 +64,8 @@
|
||||
#include <algorithm>
|
||||
|
||||
#if defined(MOZ_X11) && defined(MOZ_WIDGET_GTK)
|
||||
#include <gdk/gdk.h>
|
||||
#include <gdk/gdkx.h>
|
||||
# include <gdk/gdk.h>
|
||||
# include <gdk/gdkx.h>
|
||||
#endif
|
||||
|
||||
#include "Layers.h"
|
||||
@ -117,7 +117,7 @@
|
||||
#include "mozilla/layers/WebRenderLayerManager.h"
|
||||
|
||||
#ifdef XP_WIN
|
||||
#undef GetClassName
|
||||
# undef GetClassName
|
||||
#endif
|
||||
|
||||
using namespace mozilla;
|
||||
|
@ -64,15 +64,15 @@
|
||||
#include <algorithm>
|
||||
|
||||
#ifdef MOZ_XUL
|
||||
#include "nsIDOMXULMenuListElement.h"
|
||||
# include "nsIDOMXULMenuListElement.h"
|
||||
#endif
|
||||
|
||||
#ifdef ACCESSIBILITY
|
||||
#include "nsAccessibilityService.h"
|
||||
# include "nsAccessibilityService.h"
|
||||
#endif
|
||||
|
||||
#ifndef XP_MACOSX
|
||||
#include "nsIScriptError.h"
|
||||
# include "nsIScriptError.h"
|
||||
#endif
|
||||
|
||||
using namespace mozilla;
|
||||
|
@ -107,17 +107,17 @@
|
||||
#include "mozilla/ContentPrincipal.h"
|
||||
|
||||
#ifdef XP_WIN
|
||||
#include "mozilla/plugins/PPluginWidgetParent.h"
|
||||
#include "../plugins/ipc/PluginWidgetParent.h"
|
||||
# include "mozilla/plugins/PPluginWidgetParent.h"
|
||||
# include "../plugins/ipc/PluginWidgetParent.h"
|
||||
#endif
|
||||
|
||||
#ifdef MOZ_XUL
|
||||
#include "nsXULPopupManager.h"
|
||||
# include "nsXULPopupManager.h"
|
||||
#endif
|
||||
|
||||
#ifdef NS_PRINTING
|
||||
#include "mozilla/embedding/printingui/PrintingParent.h"
|
||||
#include "nsIWebBrowserPrint.h"
|
||||
# include "mozilla/embedding/printingui/PrintingParent.h"
|
||||
# include "nsIWebBrowserPrint.h"
|
||||
#endif
|
||||
|
||||
using namespace mozilla;
|
||||
|
@ -63,13 +63,13 @@
|
||||
#include "chrome/common/ipc_channel.h" // for IPC::Channel::kMaximumMessageSize
|
||||
|
||||
#ifdef XP_WIN
|
||||
#if defined(SendMessage)
|
||||
#undef SendMessage
|
||||
#endif
|
||||
# if defined(SendMessage)
|
||||
# undef SendMessage
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifdef FUZZING
|
||||
#include "MessageManagerFuzzer.h"
|
||||
# include "MessageManagerFuzzer.h"
|
||||
#endif
|
||||
|
||||
using namespace mozilla;
|
||||
|
@ -107,7 +107,7 @@ constexpr const char *sSelectUp2String = "cmd_selectUp2";
|
||||
constexpr const char *sSelectDown2String = "cmd_selectDown2";
|
||||
|
||||
#if 0
|
||||
#pragma mark -
|
||||
# pragma mark -
|
||||
#endif
|
||||
|
||||
// a base class for selection-related commands, for code sharing
|
||||
@ -173,7 +173,7 @@ class nsPhysicalSelectCommand : public nsSelectionCommandsBase {
|
||||
};
|
||||
|
||||
#if 0
|
||||
#pragma mark -
|
||||
# pragma mark -
|
||||
#endif
|
||||
|
||||
NS_IMPL_ISUPPORTS(nsSelectionCommandsBase, nsIControllerCommand)
|
||||
@ -229,7 +229,7 @@ nsresult nsSelectionCommandsBase::GetSelectionControllerFromWindow(
|
||||
}
|
||||
|
||||
#if 0
|
||||
#pragma mark -
|
||||
# pragma mark -
|
||||
#endif
|
||||
|
||||
// Helpers for nsSelectMoveScrollCommand and nsPhysicalSelectMoveScrollCommand
|
||||
@ -384,7 +384,7 @@ nsresult nsPhysicalSelectMoveScrollCommand::DoCommand(
|
||||
}
|
||||
|
||||
#if 0
|
||||
#pragma mark -
|
||||
# pragma mark -
|
||||
#endif
|
||||
|
||||
static const struct SelectCommand {
|
||||
@ -422,7 +422,7 @@ nsresult nsSelectCommand::DoCommand(const char *aCommandName,
|
||||
}
|
||||
|
||||
#if 0
|
||||
#pragma mark -
|
||||
# pragma mark -
|
||||
#endif
|
||||
|
||||
static const struct PhysicalSelectCommand {
|
||||
@ -456,7 +456,7 @@ nsresult nsPhysicalSelectCommand::DoCommand(const char *aCommandName,
|
||||
}
|
||||
|
||||
#if 0
|
||||
#pragma mark -
|
||||
# pragma mark -
|
||||
#endif
|
||||
|
||||
class nsClipboardCommand final : public nsIControllerCommand {
|
||||
@ -550,7 +550,7 @@ nsresult nsClipboardCommand::DoCommandParams(const char *aCommandName,
|
||||
}
|
||||
|
||||
#if 0
|
||||
#pragma mark -
|
||||
# pragma mark -
|
||||
#endif
|
||||
|
||||
class nsSelectionCommand : public nsIControllerCommand {
|
||||
@ -645,7 +645,7 @@ nsresult nsSelectionCommand::GetContentViewerEditFromContext(
|
||||
}
|
||||
|
||||
#if 0
|
||||
#pragma mark -
|
||||
# pragma mark -
|
||||
#endif
|
||||
|
||||
#define NS_DECL_CLIPBOARD_COMMAND(_cmd) \
|
||||
@ -678,7 +678,7 @@ nsresult nsClipboardCopyLinkCommand::DoClipboardCommand(
|
||||
}
|
||||
|
||||
#if 0
|
||||
#pragma mark -
|
||||
# pragma mark -
|
||||
#endif
|
||||
|
||||
nsresult nsClipboardImageCommands::IsClipboardCommandEnabled(
|
||||
@ -703,7 +703,7 @@ nsresult nsClipboardImageCommands::DoClipboardCommand(
|
||||
}
|
||||
|
||||
#if 0
|
||||
#pragma mark -
|
||||
# pragma mark -
|
||||
#endif
|
||||
|
||||
nsresult nsClipboardSelectAllNoneCommands::IsClipboardCommandEnabled(
|
||||
@ -722,7 +722,7 @@ nsresult nsClipboardSelectAllNoneCommands::DoClipboardCommand(
|
||||
}
|
||||
|
||||
#if 0
|
||||
#pragma mark -
|
||||
# pragma mark -
|
||||
#endif
|
||||
|
||||
nsresult nsClipboardGetContentsCommand::IsClipboardCommandEnabled(
|
||||
|
@ -39,7 +39,7 @@
|
||||
#include "mozilla/dom/WindowProxyHolder.h"
|
||||
#include "mozilla/IntegerPrintfMacros.h"
|
||||
#if defined(MOZ_WIDGET_ANDROID)
|
||||
#include "mozilla/dom/WindowOrientationObserver.h"
|
||||
# include "mozilla/dom/WindowOrientationObserver.h"
|
||||
#endif
|
||||
#include "nsDOMOfflineResourceList.h"
|
||||
#include "nsError.h"
|
||||
@ -150,8 +150,8 @@
|
||||
#include "nsCSSProps.h"
|
||||
#include "nsIURIFixup.h"
|
||||
#ifndef DEBUG
|
||||
#include "nsIAppStartup.h"
|
||||
#include "nsToolkitCompsCID.h"
|
||||
# include "nsIAppStartup.h"
|
||||
# include "nsToolkitCompsCID.h"
|
||||
#endif
|
||||
#include "nsCDefaultURIFixup.h"
|
||||
#include "mozilla/EventDispatcher.h"
|
||||
@ -162,8 +162,8 @@
|
||||
#include "nsITimedChannel.h"
|
||||
#include "nsServiceManagerUtils.h"
|
||||
#ifdef MOZ_XUL
|
||||
#include "nsIDOMXULControlElement.h"
|
||||
#include "nsMenuPopupFrame.h"
|
||||
# include "nsIDOMXULControlElement.h"
|
||||
# include "nsMenuPopupFrame.h"
|
||||
#endif
|
||||
#include "mozilla/dom/CustomEvent.h"
|
||||
#include "nsIJARChannel.h"
|
||||
@ -174,9 +174,9 @@
|
||||
#include "xpcprivate.h"
|
||||
|
||||
#ifdef NS_PRINTING
|
||||
#include "nsIPrintSettings.h"
|
||||
#include "nsIPrintSettingsService.h"
|
||||
#include "nsIWebBrowserPrint.h"
|
||||
# include "nsIPrintSettings.h"
|
||||
# include "nsIPrintSettingsService.h"
|
||||
# include "nsIWebBrowserPrint.h"
|
||||
#endif
|
||||
|
||||
#include "nsWindowRoot.h"
|
||||
@ -251,11 +251,11 @@
|
||||
#include "mozilla/dom/WebIDLGlobalNameHash.h"
|
||||
#include "mozilla/dom/Worklet.h"
|
||||
#ifdef HAVE_SIDEBAR
|
||||
#include "mozilla/dom/ExternalBinding.h"
|
||||
# include "mozilla/dom/ExternalBinding.h"
|
||||
#endif
|
||||
|
||||
#ifdef MOZ_WEBSPEECH
|
||||
#include "mozilla/dom/SpeechSynthesis.h"
|
||||
# include "mozilla/dom/SpeechSynthesis.h"
|
||||
#endif
|
||||
|
||||
#include "mozilla/dom/ClientManager.h"
|
||||
@ -267,19 +267,19 @@
|
||||
// Apple system headers seem to have a check() macro. <sigh>
|
||||
#ifdef check
|
||||
class nsIScriptTimeoutHandler;
|
||||
#undef check
|
||||
# undef check
|
||||
#endif // check
|
||||
#include "AccessCheck.h"
|
||||
|
||||
#ifdef ANDROID
|
||||
#include <android/log.h>
|
||||
# include <android/log.h>
|
||||
#endif
|
||||
|
||||
#ifdef XP_WIN
|
||||
#include <process.h>
|
||||
#define getpid _getpid
|
||||
# include <process.h>
|
||||
# define getpid _getpid
|
||||
#else
|
||||
#include <unistd.h> // for getpid()
|
||||
# include <unistd.h> // for getpid()
|
||||
#endif
|
||||
|
||||
using namespace mozilla;
|
||||
@ -2750,7 +2750,7 @@ bool nsGlobalWindowInner::ResolveComponentsShim(
|
||||
}
|
||||
|
||||
#ifdef RELEASE_OR_BETA
|
||||
#define USE_CONTROLLERS_SHIM
|
||||
# define USE_CONTROLLERS_SHIM
|
||||
#endif
|
||||
|
||||
#ifdef USE_CONTROLLERS_SHIM
|
||||
@ -7106,8 +7106,9 @@ void nsGlobalWindowInner::FireOnNewGlobalObject() {
|
||||
}
|
||||
|
||||
#if defined(_WINDOWS_) && !defined(MOZ_WRAPPED_WINDOWS_H)
|
||||
#pragma message("wrapper failure reason: " MOZ_WINDOWS_WRAPPER_DISABLED_REASON)
|
||||
#error "Never include unwrapped windows.h in this file!"
|
||||
# pragma message( \
|
||||
"wrapper failure reason: " MOZ_WINDOWS_WRAPPER_DISABLED_REASON)
|
||||
# error "Never include unwrapped windows.h in this file!"
|
||||
#endif
|
||||
|
||||
already_AddRefed<Promise> nsGlobalWindowInner::CreateImageBitmap(
|
||||
|
@ -41,7 +41,7 @@
|
||||
#include "mozilla/dom/WindowProxyHolder.h"
|
||||
#include "mozilla/IntegerPrintfMacros.h"
|
||||
#if defined(MOZ_WIDGET_ANDROID)
|
||||
#include "mozilla/dom/WindowOrientationObserver.h"
|
||||
# include "mozilla/dom/WindowOrientationObserver.h"
|
||||
#endif
|
||||
#include "nsError.h"
|
||||
#include "nsIIdleService.h"
|
||||
@ -153,8 +153,8 @@
|
||||
#include "nsIURIFixup.h"
|
||||
#include "nsIURIMutator.h"
|
||||
#ifndef DEBUG
|
||||
#include "nsIAppStartup.h"
|
||||
#include "nsToolkitCompsCID.h"
|
||||
# include "nsIAppStartup.h"
|
||||
# include "nsToolkitCompsCID.h"
|
||||
#endif
|
||||
#include "nsCDefaultURIFixup.h"
|
||||
#include "mozilla/EventDispatcher.h"
|
||||
@ -172,9 +172,9 @@
|
||||
#include "xpcprivate.h"
|
||||
|
||||
#ifdef NS_PRINTING
|
||||
#include "nsIPrintSettings.h"
|
||||
#include "nsIPrintSettingsService.h"
|
||||
#include "nsIWebBrowserPrint.h"
|
||||
# include "nsIPrintSettings.h"
|
||||
# include "nsIPrintSettingsService.h"
|
||||
# include "nsIWebBrowserPrint.h"
|
||||
#endif
|
||||
|
||||
#include "nsWindowRoot.h"
|
||||
@ -246,29 +246,29 @@
|
||||
#include "mozilla/dom/WebIDLGlobalNameHash.h"
|
||||
#include "mozilla/dom/Worklet.h"
|
||||
#ifdef HAVE_SIDEBAR
|
||||
#include "mozilla/dom/ExternalBinding.h"
|
||||
# include "mozilla/dom/ExternalBinding.h"
|
||||
#endif
|
||||
|
||||
#ifdef MOZ_WEBSPEECH
|
||||
#include "mozilla/dom/SpeechSynthesis.h"
|
||||
# include "mozilla/dom/SpeechSynthesis.h"
|
||||
#endif
|
||||
|
||||
// Apple system headers seem to have a check() macro. <sigh>
|
||||
#ifdef check
|
||||
class nsIScriptTimeoutHandler;
|
||||
#undef check
|
||||
# undef check
|
||||
#endif // check
|
||||
#include "AccessCheck.h"
|
||||
|
||||
#ifdef ANDROID
|
||||
#include <android/log.h>
|
||||
# include <android/log.h>
|
||||
#endif
|
||||
|
||||
#ifdef XP_WIN
|
||||
#include <process.h>
|
||||
#define getpid _getpid
|
||||
# include <process.h>
|
||||
# define getpid _getpid
|
||||
#else
|
||||
#include <unistd.h> // for getpid()
|
||||
# include <unistd.h> // for getpid()
|
||||
#endif
|
||||
|
||||
using namespace mozilla;
|
||||
@ -4702,7 +4702,7 @@ void nsGlobalWindowOuter::PrintOuter(ErrorResult& aError) {
|
||||
printSettings->GetPrinterName(printerName);
|
||||
|
||||
bool shouldGetDefaultPrinterName = printerName.IsEmpty();
|
||||
#ifdef MOZ_X11
|
||||
# ifdef MOZ_X11
|
||||
// In Linux, GTK backend does not support per printer settings.
|
||||
// Calling GetDefaultPrinterName causes a sandbox violation (see Bug
|
||||
// 1329216). The printer name is not needed anywhere else on Linux
|
||||
@ -4712,7 +4712,7 @@ void nsGlobalWindowOuter::PrintOuter(ErrorResult& aError) {
|
||||
if (!XRE_IsParentProcess()) {
|
||||
shouldGetDefaultPrinterName = false;
|
||||
}
|
||||
#endif
|
||||
# endif
|
||||
if (shouldGetDefaultPrinterName) {
|
||||
printSettingsService->GetDefaultPrinterName(printerName);
|
||||
printSettings->SetPrinterName(printerName);
|
||||
@ -7244,8 +7244,9 @@ void nsGlobalWindowOuter::ReportLargeAllocStatus() {
|
||||
}
|
||||
|
||||
#if defined(_WINDOWS_) && !defined(MOZ_WRAPPED_WINDOWS_H)
|
||||
#pragma message("wrapper failure reason: " MOZ_WINDOWS_WRAPPER_DISABLED_REASON)
|
||||
#error "Never include unwrapped windows.h in this file!"
|
||||
# pragma message( \
|
||||
"wrapper failure reason: " MOZ_WINDOWS_WRAPPER_DISABLED_REASON)
|
||||
# error "Never include unwrapped windows.h in this file!"
|
||||
#endif
|
||||
|
||||
// Helper called by methods that move/resize the window,
|
||||
|
@ -110,7 +110,7 @@
|
||||
#include "XPathGenerator.h"
|
||||
|
||||
#ifdef ACCESSIBILITY
|
||||
#include "mozilla/dom/AccessibleNode.h"
|
||||
# include "mozilla/dom/AccessibleNode.h"
|
||||
#endif
|
||||
|
||||
using namespace mozilla;
|
||||
@ -145,10 +145,10 @@ void nsINode::nsSlots::Unlink() {
|
||||
nsINode::nsINode(already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo)
|
||||
: mNodeInfo(std::move(aNodeInfo)),
|
||||
mParent(nullptr)
|
||||
#ifndef BOOL_FLAGS_ON_WRAPPER_CACHE
|
||||
# ifndef BOOL_FLAGS_ON_WRAPPER_CACHE
|
||||
,
|
||||
mBoolFlags(0)
|
||||
#endif
|
||||
# endif
|
||||
,
|
||||
mChildCount(0),
|
||||
mPreviousOrLastSibling(nullptr),
|
||||
|
@ -30,9 +30,9 @@
|
||||
|
||||
// Including 'windows.h' will #define GetClassInfo to something else.
|
||||
#ifdef XP_WIN
|
||||
#ifdef GetClassInfo
|
||||
#undef GetClassInfo
|
||||
#endif
|
||||
# ifdef GetClassInfo
|
||||
# undef GetClassInfo
|
||||
# endif
|
||||
#endif
|
||||
|
||||
class AttrArray;
|
||||
|
@ -55,7 +55,7 @@
|
||||
|
||||
#ifdef LoadImage
|
||||
// Undefine LoadImage to prevent naming conflict with Windows.
|
||||
#undef LoadImage
|
||||
# undef LoadImage
|
||||
#endif
|
||||
|
||||
using namespace mozilla;
|
||||
|
@ -41,7 +41,7 @@ class Element;
|
||||
|
||||
#ifdef LoadImage
|
||||
// Undefine LoadImage to prevent naming conflict with Windows.
|
||||
#undef LoadImage
|
||||
# undef LoadImage
|
||||
#endif
|
||||
|
||||
class nsImageLoadingContent : public nsIImageLoadingContent {
|
||||
|
@ -38,10 +38,10 @@
|
||||
#include "nsIXULRuntime.h"
|
||||
#include "nsTextFormatter.h"
|
||||
#ifdef XP_WIN
|
||||
#include <process.h>
|
||||
#define getpid _getpid
|
||||
# include <process.h>
|
||||
# define getpid _getpid
|
||||
#else
|
||||
#include <unistd.h> // for getpid()
|
||||
# include <unistd.h> // for getpid()
|
||||
#endif
|
||||
#include "xpcpublic.h"
|
||||
|
||||
@ -71,7 +71,7 @@
|
||||
|
||||
#ifdef XP_MACOSX
|
||||
// AssertMacros.h defines 'check' and conflicts with AccessCheck.h
|
||||
#undef check
|
||||
# undef check
|
||||
#endif
|
||||
#include "AccessCheck.h"
|
||||
|
||||
@ -101,7 +101,7 @@ const size_t gStackSize = 8192;
|
||||
|
||||
// Thank you Microsoft!
|
||||
#ifdef CompareString
|
||||
#undef CompareString
|
||||
# undef CompareString
|
||||
#endif
|
||||
|
||||
#define NS_SHRINK_GC_BUFFERS_DELAY 4000 // ms
|
||||
@ -961,7 +961,7 @@ nsresult nsJSContext::AddSupportsPrimitiveTojsvals(nsISupports* aArg,
|
||||
|
||||
#ifdef MOZ_JPROF
|
||||
|
||||
#include <signal.h>
|
||||
# include <signal.h>
|
||||
|
||||
inline bool IsJProfAction(struct sigaction* action) {
|
||||
return (action->sa_sigaction &&
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user