Bug 1431030 - Ignore the automatic formatting of the NS_NPAPIPLUGIN_CALLBACK definitions r=jimm
☠☠ backed out by 668b67f1c900 ☠ ☠
authorSylvestre Ledru <sledru@mozilla.com>
Wed, 17 Jan 2018 11:02:35 +0100
changeset 454095 2fdccaab2e7c887b55455384c27f8c6344f01e4f
parent 454094 c1f3acb9f5cce22e14f0639669058d4baa80d074
child 454096 668b67f1c900d6c1a1ca19006fb4cf340b30a436
push id1648
push usermtabara@mozilla.com
push dateThu, 01 Mar 2018 12:45:47 +0000
treeherdermozilla-release@cbb9688c2eeb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjimm
bugs1431030
milestone59.0a1
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
Bug 1431030 - Ignore the automatic formatting of the NS_NPAPIPLUGIN_CALLBACK definitions r=jimm MozReview-Commit-ID: 2oTHhb2VBWX
dom/plugins/base/nsNPAPIPlugin.h
dom/xslt/xpath/moz.build
dom/xslt/xpath/txExpr.h
--- a/dom/plugins/base/nsNPAPIPlugin.h
+++ b/dom/plugins/base/nsNPAPIPlugin.h
@@ -9,21 +9,24 @@
 #include "prlink.h"
 #include "npfunctions.h"
 #include "nsPluginHost.h"
 
 #include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/PluginLibrary.h"
 #include "mozilla/RefCounted.h"
 
+// clang-format off
+// See bug 1431030
 #if defined(XP_WIN)
 #define NS_NPAPIPLUGIN_CALLBACK(_type, _name) _type (__stdcall * _name)
 #else
 #define NS_NPAPIPLUGIN_CALLBACK(_type, _name) _type (* _name)
 #endif
+// clang-format on
 
 typedef NS_NPAPIPLUGIN_CALLBACK(NPError, NP_GETENTRYPOINTS) (NPPluginFuncs* pCallbacks);
 typedef NS_NPAPIPLUGIN_CALLBACK(NPError, NP_PLUGININIT) (const NPNetscapeFuncs* pCallbacks);
 typedef NS_NPAPIPLUGIN_CALLBACK(NPError, NP_PLUGINUNIXINIT) (const NPNetscapeFuncs* pCallbacks, NPPluginFuncs* fCallbacks);
 typedef NS_NPAPIPLUGIN_CALLBACK(NPError, NP_PLUGINSHUTDOWN) ();
 
 // nsNPAPIPlugin is held alive both by active nsPluginTag instances and
 // by active nsNPAPIPluginInstance.
--- a/dom/xslt/xpath/moz.build
+++ b/dom/xslt/xpath/moz.build
@@ -9,17 +9,16 @@ EXPORTS.mozilla.dom += [
     'XPathExpression.h',
     'XPathResult.h',
 ]
 
 UNIFIED_SOURCES += [
     'txBooleanExpr.cpp',
     'txBooleanResult.cpp',
     'txCoreFunctionCall.cpp',
-    'txErrorExpr.cpp',
     'txExpr.cpp',
     'txExprLexer.cpp',
     'txExprParser.cpp',
     'txFilterExpr.cpp',
     'txForwardContext.cpp',
     'txFunctionCall.cpp',
     'txLiteralExpr.cpp',
     'txLocationStep.cpp',
--- a/dom/xslt/xpath/txExpr.h
+++ b/dom/xslt/xpath/txExpr.h
@@ -997,32 +997,11 @@ public:
     }
 
     TX_DECL_NODE_TEST
 
 private:
     txOwningArray<txNodeTest> mNodeTests;
 };
 
-/**
- *  Expression that failed to parse
- */
-class txErrorExpr : public Expr
-{
-public:
-#ifdef TX_TO_STRING
-    explicit txErrorExpr(const nsAString& aStr)
-      : mStr(aStr)
-    {
-    }
-#endif
-
-    TX_DECL_EXPR
-
-#ifdef TX_TO_STRING
-private:
-    nsString mStr;
-#endif
-};
-
 #endif