Backed out changeset 2fdccaab2e7c (bug 1431030) for build bustages on a CLOSED TREE

--HG--
extra : amend_source : 4b243382b2a63958021222c739db5e1ae2739b88

dom/plugins/base/nsNPAPIPlugin.h

@@ -14,14 +14,11 @@
 #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);

dom/xslt/xpath/moz.build

@@ -14,6 +14,7 @@ UNIFIED_SOURCES += [
     'txBooleanExpr.cpp',
     'txBooleanResult.cpp',
     'txCoreFunctionCall.cpp',
+    'txErrorExpr.cpp',
     'txExpr.cpp',
     'txExprLexer.cpp',
     'txExprParser.cpp',

dom/xslt/xpath/txExpr.h

@@ -1002,6 +1002,27 @@ 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