Merge WebKit at r78450: Initial merge by git.

Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1

2 files changed, 10 insertions, 5 deletions

diff --git a/Source/WebCore/platform/brew/MIMETypeRegistryBrew.cpp b/Source/WebCore/platform/brew/MIMETypeRegistryBrew.cpp
index 0a538c2..eae4e3b 100644
--- a/Source/WebCore/platform/brew/MIMETypeRegistryBrew.cpp
+++ b/Source/WebCore/platform/brew/MIMETypeRegistryBrew.cpp
@@ -30,6 +30,8 @@
 #include "MIMETypeRegistry.h"
 
 #include "PlatformString.h"
+#include <wtf/Assertions.h>
+#include <wtf/MainThread.h>
 
 namespace WebCore {
 
@@ -63,6 +65,8 @@ static const ExtensionMap extensionMap[] = {
 
 String MIMETypeRegistry::getMIMETypeForExtension(const String &ext)
 {
+    ASSERT(isMainThread());
+
     String str = ext.lower();
 
     const ExtensionMap* e = extensionMap;
diff --git a/Source/WebCore/platform/brew/SystemTimeBrew.cpp b/Source/WebCore/platform/brew/SystemTimeBrew.cpp
index c1e39fb..6e2fe7e 100644
--- a/Source/WebCore/platform/brew/SystemTimeBrew.cpp
+++ b/Source/WebCore/platform/brew/SystemTimeBrew.cpp
@@ -26,15 +26,16 @@
 #include "config.h"
 #include "SystemTime.h"
 
-#include <float.h>
+#include "NotImplemented.h"
+#include <limits>
 
 namespace WebCore {
 
 float userIdleTime()
 {
-    // return an arbitrarily high userIdleTime so that releasing pages from the page cache isn't postponed
-    return FLT_MAX;
-}
-
+    notImplemented();
+    // Return an arbitrarily high userIdleTime so that releasing pages from the page cache isn't postponed.
+    return std::numeric_limits<float>::max();
 }
 
+} // namespace WebCore