From b805b78b03d58efb353c725390cef10562652021 Mon Sep 17 00:00:00 2001
From: Sean Lilley <lilleyse@gmail.com>
Date: Mon, 7 Nov 2016 10:04:34 -0500
Subject: [PATCH] Update checks

---
 Source/Core/FeatureDetection.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Source/Core/FeatureDetection.js b/Source/Core/FeatureDetection.js
index 8e7643f07beb..a018118b7369 100644
--- a/Source/Core/FeatureDetection.js
+++ b/Source/Core/FeatureDetection.js
@@ -29,7 +29,8 @@ define([
     function isChrome() {
         if (!defined(isChromeResult)) {
             isChromeResult = false;
-            if (/Google Inc/.test(theNavigator.vendor)) {
+            // Edge contains Chrome in the user agent too
+            if (!isEdge()) {
                 var fields = (/ Chrome\/([\.0-9]+)/).exec(theNavigator.userAgent);
                 if (fields !== null) {
                     isChromeResult = true;
@@ -51,8 +52,8 @@ define([
         if (!defined(isSafariResult)) {
             isSafariResult = false;
 
-            // Chrome contains Safari in the user agent too
-            if (!isChrome() && (/ Safari\/[\.0-9]+/).test(theNavigator.userAgent)) {
+            // Chrome and Edge contain Safari in the user agent too
+            if (!isChrome() && !isEdge() && (/ Safari\/[\.0-9]+/).test(theNavigator.userAgent)) {
                 var fields = (/ Version\/([\.0-9]+)/).exec(theNavigator.userAgent);
                 if (fields !== null) {
                     isSafariResult = true;