corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1521000 - Part 2: Adjust our clang-format rules to include spaces after the hash for nested preprocessor directives r=sylvestre

Browse Source 
# ignore-this-changeset
This commit is contained in:
Ehsan Akhgari
2019-01-18 10:16:18 +01:00
parent 53c197e13a
commit 498e2df734
1736 changed files with 15112 additions and 15029 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
dom/plugins/base/nsNPAPIPlugin.cpp
View File

@@ -49,17 +49,17 @@
#include <prinrval.h>
#ifdef MOZ_WIDGET_COCOA
#include <Carbon/Carbon.h>
#include <ApplicationServices/ApplicationServices.h>
#include <OpenGL/OpenGL.h>
#include "nsCocoaFeatures.h"
#include "PluginUtilsOSX.h"
# include <Carbon/Carbon.h>
# include <ApplicationServices/ApplicationServices.h>
# include <OpenGL/OpenGL.h>
# include "nsCocoaFeatures.h"
# include "PluginUtilsOSX.h"
#endif
// needed for nppdf plugin
#if (MOZ_WIDGET_GTK)
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
# include <gdk/gdk.h>
# include <gdk/gdkx.h>
#endif
#include "nsJSUtils.h"
@@ -81,15 +81,15 @@ using mozilla::plugins::PluginModuleChromeParent;
using mozilla::plugins::PluginModuleContentParent;
#ifdef MOZ_X11
#include "mozilla/X11Util.h"
# include "mozilla/X11Util.h"
#endif
#ifdef XP_WIN
#include <windows.h>
#include "mozilla/WindowsVersion.h"
#ifdef ACCESSIBILITY
#include "mozilla/a11y/Compatibility.h"
#endif
# include <windows.h>
# include "mozilla/WindowsVersion.h"
# ifdef ACCESSIBILITY
# include "mozilla/a11y/Compatibility.h"
# endif
#endif
#include "nsIAudioChannelAgent.h"
@@ -1243,7 +1243,7 @@ NPError _getvalue(NPP npp, NPNVariable variable, void *result) {
switch (static_cast<int>(variable)) {
#if defined(XP_UNIX) && !defined(XP_MACOSX)
case NPNVxDisplay: {
#if defined(MOZ_X11)
# if defined(MOZ_X11)
if (npp) {
nsNPAPIPluginInstance *inst = (nsNPAPIPluginInstance *)npp->ndata;
bool windowless = false;
@@ -1269,7 +1269,7 @@ NPError _getvalue(NPP npp, NPNVariable variable, void *result) {
return NPERR_NO_ERROR;
}
}
#endif
# endif
return NPERR_GENERIC_ERROR;
}
@@ -1428,13 +1428,13 @@ NPError _getvalue(NPP npp, NPNVariable variable, void *result) {
return NPERR_GENERIC_ERROR;
}
#ifndef NP_NO_QUICKDRAW
# ifndef NP_NO_QUICKDRAW
case NPNVsupportsQuickDrawBool: {
*(NPBool *)result = false;
return NPERR_NO_ERROR;
}
#endif
# endif
case NPNVsupportsCoreGraphicsBool: {
*(NPBool *)result = true;
@@ -1460,13 +1460,13 @@ NPError _getvalue(NPP npp, NPNVariable variable, void *result) {
return NPERR_NO_ERROR;
}
#ifndef NP_NO_CARBON
# ifndef NP_NO_CARBON
case NPNVsupportsCarbonBool: {
*(NPBool *)result = false;
return NPERR_NO_ERROR;
}
#endif
# endif
case NPNVsupportsCocoaBool: {
*(NPBool *)result = true;