Remove CSSAssertSetFailFunc

Summary: Remove CSSAssertSetFailFunc and use CSSLogLevelError for throwing managed exception.

Reviewed By: emilsjolander

Differential Revision: D4155452

fbshipit-source-id: 5a19c79a212f204d13064527fd6e5843bab76e6b

csharp/Facebook.CSSLayout/CSSAssert.cs

@@ -1,35 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-using System;
-using System.Runtime.InteropServices;
-
-namespace Facebook.CSSLayout
-{
-    internal static class CSSAssert
-    {
-        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-        public delegate void FailFunc(string message);
-
-        private static bool _assertInitialized;
-        private static FailFunc _failFunc;
-
-        public static void Initialize()
-        {
-            if (!_assertInitialized)
-            {
-                _failFunc = (message) => {
-                    throw new InvalidOperationException(message);
-                };
-                Native.CSSAssertSetFailFunc(_failFunc);
-                _assertInitialized = true;
-            }
-        }
-    }
-}

csharp/Facebook.CSSLayout/CSSLogger.cs

@@ -31,6 +31,11 @@ namespace Facebook.CSSLayout
                     {
                         Logger(level, message);
                     }
+
+                    if (level == CSSLogLevel.Error)
+                    {
+                        throw new InvalidOperationException(message);
+                    }
                 };
                 Native.CSSInteropSetLogger(_managedLogger);
                 _initialized = true;

csharp/Facebook.CSSLayout/CSSNode.cs

@@ -26,7 +26,6 @@ namespace Facebook.CSSLayout
 
         public CSSNode()
         {
-            CSSAssert.Initialize();
             CSSLogger.Initialize();
 
             _cssNode = Native.CSSNodeNew();

csharp/Facebook.CSSLayout/Native.cs

@@ -24,10 +24,6 @@ namespace Facebook.CSSLayout
         public static extern void CSSInteropSetLogger(
             [MarshalAs(UnmanagedType.FunctionPtr)] CSSLogger.Func func);
 
-        [DllImport(DllName)]
-        public static extern void CSSAssertSetFailFunc(
-            [MarshalAs(UnmanagedType.FunctionPtr)] CSSAssert.FailFunc func);
-
         [DllImport(DllName)]
         public static extern IntPtr CSSNodeNew();
 

csharp/tests/Facebook.CSSLayout/test_macos.sh

@@ -27,6 +27,6 @@ if [ -d $NUNIT \
 fi
 
 cd "$( dirname "$0" )"
-clang -g -DCSS_ASSERT_FAIL_ENABLED -Wall -Wextra -dynamiclib -o libCSSLayout.dylib -I../../.. ../../../CSSLayout/*.c ../../CSSLayout/CSSInterop.cpp
+clang -g -Wall -Wextra -dynamiclib -o libCSSLayout.dylib -I../../.. ../../../CSSLayout/*.c ../../CSSLayout/CSSInterop.cpp
 mcs -debug -t:library -r:$NUNIT/nunit.framework.dll -out:CSSLayoutTest.dll *.cs ../../../csharp/Facebook.CSSLayout/*cs
 MONO_PATH=$NUNIT mono64 --debug $NUNIT/nunit-console.exe CSSLayoutTest.dll