Merge 504c551 into fd87988

Author: SLT-World

CefSharp.Core.Runtime/Internals/CefSharpApp.h

@@ -209,10 +209,30 @@ namespace CefSharp
 
                         if (kvp->Key == "disable-features" || kvp->Key == "enable-features")
                         {
-                            //Temp workaround so we can set the disable-features/enable-features command line argument
-                            // See https://github.com/cefsharp/CefSharp/issues/2408
-                            commandLine->AppendSwitchWithValue(name, value);
+                            if (CefSharpSettings::MergeFeaturesCommandLineArgs)
+                            {
+                                CefString existingValue = commandLine->GetSwitchValue(name);
+                                if (existingValue.empty())
+                                {
+                                    commandLine->AppendSwitchWithValue(name, value);
+                                }
+                                else
+                                {
+                                    String^ merged = CommandLineArgsMerger::MergeFeatures(StringUtils::ToClr(existingValue), kvp->Value);
+
+                                    commandLine->RemoveSwitch(name);
+                                    commandLine->AppendSwitchWithValue(name, StringUtils::ToNative(merged));
+                                }
+                            }
+                            else
+                            {
+                                //Temp workaround so we can set the disable-features/enable-features command line argument
+                                // See https://github.com/cefsharp/CefSharp/issues/2408
+                                commandLine->RemoveSwitch(name);
+                                commandLine->AppendSwitchWithValue(name, value);
+                            }
                         }
+
                         // Right now the command line args handed to the application (global command line) have higher
                         // precedence than command line args provided by the app
                         else if (!commandLine->HasSwitch(name))

CefSharp/CefSharpSettings.cs

@@ -21,6 +21,7 @@ static CefSharpSettings()
             WcfTimeout = TimeSpan.FromSeconds(2);
 #endif
             SubprocessExitIfParentProcessClosed = true;
+            MergeFeaturesCommandLineArgs = true;
         }
 
 #if !NETCOREAPP
@@ -82,6 +83,12 @@ static CefSharpSettings()
         /// </summary>
         public static bool FocusedNodeChangedEnabled { get; set; }
 
+        /// <summary>
+        /// Any enable-features/disable-features command line arguments will be automatically merged with existing values if supplied.
+        /// This currently defaults to true.
+        /// </summary>
+        public static bool MergeFeaturesCommandLineArgs { get; set; }
+
         /// <summary>
         /// CefSharp.WinForms and CefSharp.Wpf.HwndHost ONLY!
         /// The default is to create <see cref="CefRuntimeStyle.Alloy"/>

CefSharp/Internals/CommandLineArgsMerger.cs

@@ -0,0 +1,52 @@
+// Copyright © 2015 The CefSharp Authors. All rights reserved.
+//
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+using System;
+using System.Collections.Generic;
+
+namespace CefSharp.Internals
+{
+    /// <summary>
+    /// Use this static class to merge command line arguments.
+    /// </summary>
+    public sealed class CommandLineArgsMerger
+    {
+        /// <summary>
+        /// Returns the merged command line features.
+        /// </summary>
+        /// <param name="existing">The existing features.</param>
+        /// <param name="incoming">The features that should be merged.</param>
+        /// <returns> the merged command line features. </returns>
+        public static string MergeFeatures(string existing, string incoming)
+        {
+            var features = new List<string>();
+
+            if (!string.IsNullOrWhiteSpace(existing))
+            {
+                foreach (var item in existing.Split(','))
+                {
+                    var trimmed = item.Trim();
+                    if (!features.Contains(trimmed))
+                    {
+                        features.Add(trimmed);
+                    }
+                }
+            }
+
+            if (!string.IsNullOrWhiteSpace(incoming))
+            {
+                foreach (var item in incoming.Split(','))
+                {
+                    var trimmed = item.Trim();
+                    if (!features.Contains(trimmed))
+                    {
+                        features.Add(trimmed);
+                    }
+                }
+            }
+
+            return string.Join(",", features);
+        }
+    }
+}