From aab669a05f943c587f6acccd94d53a8544170c1c Mon Sep 17 00:00:00 2001
From: Konstantin Tokarev <annulen@yandex.ru>
Date: Thu, 15 Jun 2017 12:13:20 +0300
Subject: Import WebKit commit 6d0ad27b6bc4209fb8d8cee2692dc0c6a5462051

Change-Id: Ifdedb7bc3162434686201813dc1d994cf5ae7e70
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
---
 Source/JavaScriptCore/runtime/DateConversion.cpp              | 3 ++-
 Source/JavaScriptCore/runtime/JSArrayBufferView.h             | 2 +-
 Source/JavaScriptCore/runtime/JSTypedArrayViewConstructor.cpp | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'Source/JavaScriptCore/runtime')

diff --git a/Source/JavaScriptCore/runtime/DateConversion.cpp b/Source/JavaScriptCore/runtime/DateConversion.cpp
index 05e27338b..8a87cc62a 100644
--- a/Source/JavaScriptCore/runtime/DateConversion.cpp
+++ b/Source/JavaScriptCore/runtime/DateConversion.cpp
@@ -32,6 +32,7 @@
 
 #if OS(WINDOWS)
 #include <windows.h>
+#include <wtf/text/win/WCharStringExtras.h>
 #endif
 
 using namespace WTF;
@@ -108,7 +109,7 @@ String formatDateTime(const GregorianDateTime& t, DateTimeFormat format, bool as
             TIME_ZONE_INFORMATION timeZoneInformation;
             GetTimeZoneInformation(&timeZoneInformation);
             const WCHAR* winTimeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName;
-            String timeZoneName(reinterpret_cast<const UChar*>(winTimeZoneName));
+            String timeZoneName = nullTerminatedWCharToString(winTimeZoneName);
 #else
             struct tm gtm = t;
             char timeZoneName[70];
diff --git a/Source/JavaScriptCore/runtime/JSArrayBufferView.h b/Source/JavaScriptCore/runtime/JSArrayBufferView.h
index 769150b36..a5afdb9ef 100644
--- a/Source/JavaScriptCore/runtime/JSArrayBufferView.h
+++ b/Source/JavaScriptCore/runtime/JSArrayBufferView.h
@@ -162,7 +162,7 @@ public:
     bool isNeutered() { return hasArrayBuffer() && !vector(); }
     void neuter();
     
-    void* vector()
+    void* vector() const
     {
         return m_vector.getPredicated(
             this,
diff --git a/Source/JavaScriptCore/runtime/JSTypedArrayViewConstructor.cpp b/Source/JavaScriptCore/runtime/JSTypedArrayViewConstructor.cpp
index bf99dbc87..5c038c502 100644
--- a/Source/JavaScriptCore/runtime/JSTypedArrayViewConstructor.cpp
+++ b/Source/JavaScriptCore/runtime/JSTypedArrayViewConstructor.cpp
@@ -35,6 +35,7 @@
 #include "JSObject.h"
 #include "JSTypedArrayViewPrototype.h"
 #include "JSTypedArrays.h"
+#include "TypedArrayInlines.h"
 
 namespace JSC {
 
-- 
cgit v1.2.1