Core - Change from cef type defs to C++11 defs

amaitland · amaitland · commit 2a9b50640f14 · 2023-07-16T09:31:55.000+10:00
https://bitbucket.org/chromiumembedded/cef/commits/5042d7140822cd13b80990f61ce2d3865864a3d8
diff --git a/CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncMethodHandler.h b/CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncMethodHandler.h
@@ -18,11 +18,11 @@ namespace CefSharp
             {
             private:
                 gcroot<JavascriptCallbackRegistry^> _callbackRegistry;
-                gcroot<Func<JavascriptAsyncMethodCallback^, int64>^> _methodCallbackSave;
-                int64 _objectId;
+                gcroot<Func<JavascriptAsyncMethodCallback^, int64_t>^> _methodCallbackSave;
+                int64_t _objectId;
 
             public:
-                JavascriptAsyncMethodHandler(int64 objectId, JavascriptCallbackRegistry^ callbackRegistry, Func<JavascriptAsyncMethodCallback^, int64>^ methodCallbackSave)
+                JavascriptAsyncMethodHandler(int64_t objectId, JavascriptCallbackRegistry^ callbackRegistry, Func<JavascriptAsyncMethodCallback^, int64_t>^ methodCallbackSave)
                     :_callbackRegistry(callbackRegistry), _objectId(objectId), _methodCallbackSave(methodCallbackSave)
                 {
 
diff --git a/CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncMethodWrapper.h b/CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncMethodWrapper.h
@@ -19,7 +19,7 @@ namespace CefSharp
                 MCefRefPtr<JavascriptAsyncMethodHandler> _javascriptMethodHandler;
 
             public:
-                JavascriptAsyncMethodWrapper(int64 ownerId, JavascriptCallbackRegistry^ callbackRegistry, Func<JavascriptAsyncMethodCallback^, int64>^ methodCallbackSave)
+                JavascriptAsyncMethodWrapper(int64_t ownerId, JavascriptCallbackRegistry^ callbackRegistry, Func<JavascriptAsyncMethodCallback^, int64_t>^ methodCallbackSave)
                     : _javascriptMethodHandler(new JavascriptAsyncMethodHandler(ownerId, callbackRegistry, methodCallbackSave))
                 {
 
diff --git a/CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncObjectWrapper.h b/CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncObjectWrapper.h
@@ -18,11 +18,11 @@ namespace CefSharp
             {
             private:
                 initonly List<JavascriptAsyncMethodWrapper^>^ _wrappedMethods;
-                Func<JavascriptAsyncMethodCallback^, int64>^ _methodCallbackSave;
+                Func<JavascriptAsyncMethodCallback^, int64_t>^ _methodCallbackSave;
                 JavascriptCallbackRegistry^ _callbackRegistry;
 
             public:
-                JavascriptAsyncObjectWrapper(JavascriptCallbackRegistry^ callbackRegistry, Func<JavascriptAsyncMethodCallback^, int64>^ saveMethod)
+                JavascriptAsyncObjectWrapper(JavascriptCallbackRegistry^ callbackRegistry, Func<JavascriptAsyncMethodCallback^, int64_t>^ saveMethod)
                     : _wrappedMethods(gcnew List<JavascriptAsyncMethodWrapper^>()), _methodCallbackSave(saveMethod), _callbackRegistry(callbackRegistry)
                 {
 
diff --git a/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.cpp b/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.cpp
@@ -292,7 +292,7 @@ namespace CefSharp
             frame->SendProcessMessage(CefProcessId::PID_BROWSER, uncaughtExceptionMessage);
         }
 
-        JavascriptRootObjectWrapper^ CefAppUnmanagedWrapper::GetJsRootObjectWrapper(int browserId, int64 frameId)
+        JavascriptRootObjectWrapper^ CefAppUnmanagedWrapper::GetJsRootObjectWrapper(int browserId, int64_t frameId)
         {
             auto browserWrapper = FindBrowserWrapper(browserId);
 
@@ -401,7 +401,7 @@ namespace CefSharp
 
                 //both messages have callbackId stored at index 0
                 auto frameId = frame->GetIdentifier();
-                int64 callbackId = GetInt64(argList, 0);
+                int64_t callbackId = GetInt64(argList, 0);
 
                 if (name == kEvaluateJavascriptRequest)
                 {
diff --git a/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.h b/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.h
@@ -72,7 +72,7 @@ namespace CefSharp
             }
 
             CefBrowserWrapper^ FindBrowserWrapper(int browserId);
-            JavascriptRootObjectWrapper^ GetJsRootObjectWrapper(int browserId, int64 frameId);
+            JavascriptRootObjectWrapper^ GetJsRootObjectWrapper(int browserId, int64_t frameId);
 
             virtual DECL CefRefPtr<CefRenderProcessHandler> GetRenderProcessHandler() override;
             virtual DECL void OnBrowserCreated(CefRefPtr<CefBrowser> browser, CefRefPtr<CefDictionaryValue> extraInfo) override;
diff --git a/CefSharp.BrowserSubprocess.Core/CefBrowserWrapper.h b/CefSharp.BrowserSubprocess.Core/CefBrowserWrapper.h
@@ -31,7 +31,7 @@ namespace CefSharp
 
         internal:
             //Frame Identifier is used as Key
-            property ConcurrentDictionary<int64, JavascriptRootObjectWrapper^>^ JavascriptRootObjectWrappers;
+            property ConcurrentDictionary<int64_t, JavascriptRootObjectWrapper^>^ JavascriptRootObjectWrappers;
 
         public:
             CefBrowserWrapper(CefRefPtr<CefBrowser> cefBrowser)
@@ -40,7 +40,7 @@ namespace CefSharp
                 BrowserId = cefBrowser->GetIdentifier();
                 IsPopup = cefBrowser->IsPopup();
 
-                JavascriptRootObjectWrappers = gcnew ConcurrentDictionary<int64, JavascriptRootObjectWrapper^>();
+                JavascriptRootObjectWrappers = gcnew ConcurrentDictionary<int64_t, JavascriptRootObjectWrapper^>();
             }
 
             !CefBrowserWrapper()
@@ -54,7 +54,7 @@ namespace CefSharp
 
                 if (JavascriptRootObjectWrappers != nullptr)
                 {
-                    for each (KeyValuePair<int64, JavascriptRootObjectWrapper^> entry in JavascriptRootObjectWrappers)
+                    for each (KeyValuePair<int64_t, JavascriptRootObjectWrapper^> entry in JavascriptRootObjectWrappers)
                     {
                         delete entry.Value;
                     }
diff --git a/CefSharp.BrowserSubprocess.Core/JavascriptCallbackRegistry.cpp b/CefSharp.BrowserSubprocess.Core/JavascriptCallbackRegistry.cpp
@@ -25,7 +25,7 @@ namespace CefSharp
             return result;
         }
 
-        JavascriptCallbackWrapper^ JavascriptCallbackRegistry::FindWrapper(int64 id)
+        JavascriptCallbackWrapper^ JavascriptCallbackRegistry::FindWrapper(int64_t id)
         {
             JavascriptCallbackWrapper^ callback;
             _callbacks->TryGetValue(id, callback);
diff --git a/CefSharp.BrowserSubprocess.Core/JavascriptCallbackRegistry.h b/CefSharp.BrowserSubprocess.Core/JavascriptCallbackRegistry.h
@@ -24,7 +24,7 @@ namespace CefSharp
             ConcurrentDictionary<Int64, JavascriptCallbackWrapper^>^ _callbacks;
 
         internal:
-            JavascriptCallbackWrapper^ FindWrapper(int64 id);
+            JavascriptCallbackWrapper^ FindWrapper(int64_t id);
 
         public:
             JavascriptCallbackRegistry(int browserId) : _browserId(browserId)
diff --git a/CefSharp.BrowserSubprocess.Core/JavascriptMethodWrapper.h b/CefSharp.BrowserSubprocess.Core/JavascriptMethodWrapper.h
@@ -20,12 +20,12 @@ namespace CefSharp
         {
         private:
             MCefRefPtr<JavascriptMethodHandler> _javascriptMethodHandler;
-            int64 _ownerId;
+            int64_t _ownerId;
             String^ _javascriptMethodName;
             IBrowserProcess^ _browserProcess;
 
         public:
-            JavascriptMethodWrapper(int64 ownerId, IBrowserProcess^ browserProcess, JavascriptCallbackRegistry^ callbackRegistry)
+            JavascriptMethodWrapper(int64_t ownerId, IBrowserProcess^ browserProcess, JavascriptCallbackRegistry^ callbackRegistry)
             {
                 _ownerId = ownerId;
                 _browserProcess = browserProcess;
diff --git a/CefSharp.BrowserSubprocess.Core/JavascriptObjectWrapper.h b/CefSharp.BrowserSubprocess.Core/JavascriptObjectWrapper.h
@@ -26,7 +26,7 @@ namespace CefSharp
             List<JavascriptPropertyWrapper^>^ _wrappedProperties;
             IBrowserProcess^ _browserProcess;
             MCefRefPtr<JavascriptPropertyHandler> _jsPropertyHandler;
-            int64 _objectId;
+            int64_t _objectId;
 
         public:
             JavascriptObjectWrapper(IBrowserProcess^ browserProcess)
diff --git a/CefSharp.BrowserSubprocess.Core/JavascriptPromiseResolverCatch.h b/CefSharp.BrowserSubprocess.Core/JavascriptPromiseResolverCatch.h
@@ -14,11 +14,11 @@ namespace CefSharp
     {
         private class JavascriptPromiseResolverCatch : public CefV8Handler
         {
-            int64 _callbackId;
+            int64_t _callbackId;
             bool _isJsCallback;
 
         public:
-            JavascriptPromiseResolverCatch(int64 callbackId, bool isJsCallback) : _callbackId(callbackId), _isJsCallback(isJsCallback)
+            JavascriptPromiseResolverCatch(int64_t callbackId, bool isJsCallback) : _callbackId(callbackId), _isJsCallback(isJsCallback)
             {
 
             }
diff --git a/CefSharp.BrowserSubprocess.Core/JavascriptPromiseResolverThen.h b/CefSharp.BrowserSubprocess.Core/JavascriptPromiseResolverThen.h
@@ -19,11 +19,11 @@ namespace CefSharp
     {
         private class JavascriptPromiseResolverThen : public CefV8Handler
         {
-            int64 _callbackId;
+            int64_t _callbackId;
             bool _isJsCallback;
 
         public:
-            JavascriptPromiseResolverThen(int64 callbackId, bool isJsCallback) : _callbackId(callbackId), _isJsCallback(isJsCallback)
+            JavascriptPromiseResolverThen(int64_t callbackId, bool isJsCallback) : _callbackId(callbackId), _isJsCallback(isJsCallback)
             {
 
             }
diff --git a/CefSharp.BrowserSubprocess.Core/JavascriptPropertyWrapper.h b/CefSharp.BrowserSubprocess.Core/JavascriptPropertyWrapper.h
@@ -17,13 +17,13 @@ namespace CefSharp
         private ref class JavascriptPropertyWrapper
         {
         private:
-            int64 _ownerId;
+            int64_t _ownerId;
             IBrowserProcess^ _browserProcess;
             //TODO: Strongly type this variable - currently trying to include JavascriptObjectWrapper.h creates a circular reference, so won't compile
             Object^ _javascriptObjectWrapper;
 
         public:
-            JavascriptPropertyWrapper(int64 ownerId, IBrowserProcess^ browserProcess)
+            JavascriptPropertyWrapper(int64_t ownerId, IBrowserProcess^ browserProcess)
             {
                 _ownerId = ownerId;
                 _browserProcess = browserProcess;
diff --git a/CefSharp.BrowserSubprocess.Core/JavascriptRootObjectWrapper.cpp b/CefSharp.BrowserSubprocess.Core/JavascriptRootObjectWrapper.cpp
@@ -18,7 +18,7 @@ namespace CefSharp
         {
             if (objects->Count > 0)
             {
-                auto saveMethod = gcnew Func<JavascriptAsyncMethodCallback^, int64>(this, &JavascriptRootObjectWrapper::SaveMethodCallback);
+                auto saveMethod = gcnew Func<JavascriptAsyncMethodCallback^, int64_t>(this, &JavascriptRootObjectWrapper::SaveMethodCallback);
 
                 for each (JavascriptObject ^ obj in Enumerable::OfType<JavascriptObject^>(objects))
                 {
@@ -54,14 +54,14 @@ namespace CefSharp
             return _callbackRegistry;
         }
 
-        int64 JavascriptRootObjectWrapper::SaveMethodCallback(JavascriptAsyncMethodCallback^ callback)
+        int64_t JavascriptRootObjectWrapper::SaveMethodCallback(JavascriptAsyncMethodCallback^ callback)
         {
             auto callbackId = Interlocked::Increment(_lastCallback);
             _methodCallbacks->Add(callbackId, callback);
             return callbackId;
         }
 
-        bool JavascriptRootObjectWrapper::TryGetAndRemoveMethodCallback(int64 id, JavascriptAsyncMethodCallback^% callback)
+        bool JavascriptRootObjectWrapper::TryGetAndRemoveMethodCallback(int64_t id, JavascriptAsyncMethodCallback^% callback)
         {
             bool result = false;
             if (result = _methodCallbacks->TryGetValue(id, callback))
diff --git a/CefSharp.BrowserSubprocess.Core/JavascriptRootObjectWrapper.h b/CefSharp.BrowserSubprocess.Core/JavascriptRootObjectWrapper.h
@@ -33,21 +33,21 @@ namespace CefSharp
         private:
             //Only access through Interlocked::Increment - used to generate unique callback Id's
             //Is static so ids are unique to this process https://github.com/cefsharp/CefSharp/issues/2792
-            static int64 _lastCallback;
+            static int64_t _lastCallback;
 
 #ifndef NETCOREAPP
             initonly List<JavascriptObjectWrapper^>^ _wrappedObjects;
 #endif
             initonly List<JavascriptAsyncObjectWrapper^>^ _wrappedAsyncObjects;
-            initonly Dictionary<int64, JavascriptAsyncMethodCallback^>^ _methodCallbacks;
+            initonly Dictionary<int64_t, JavascriptAsyncMethodCallback^>^ _methodCallbacks;
 #ifndef NETCOREAPP
             IBrowserProcess^ _browserProcess;
 #endif
             // The entire set of possible JavaScript functions to
             // call directly into.
             JavascriptCallbackRegistry^ _callbackRegistry;
 
-            int64 SaveMethodCallback(JavascriptAsyncMethodCallback^ callback);
+            int64_t SaveMethodCallback(JavascriptAsyncMethodCallback^ callback);
 
         internal:
             property JavascriptCallbackRegistry^ CallbackRegistry
@@ -68,7 +68,7 @@ namespace CefSharp
 #endif
                 _wrappedAsyncObjects = gcnew List<JavascriptAsyncObjectWrapper^>();
                 _callbackRegistry = gcnew JavascriptCallbackRegistry(browserId);
-                _methodCallbacks = gcnew Dictionary<int64, JavascriptAsyncMethodCallback^>();
+                _methodCallbacks = gcnew Dictionary<int64_t, JavascriptAsyncMethodCallback^>();
             }
 
             ~JavascriptRootObjectWrapper()
@@ -101,7 +101,7 @@ namespace CefSharp
                 _methodCallbacks->Clear();
             }
 
-            bool TryGetAndRemoveMethodCallback(int64 id, JavascriptAsyncMethodCallback^% callback);
+            bool TryGetAndRemoveMethodCallback(int64_t id, JavascriptAsyncMethodCallback^% callback);
 
             void Bind(ICollection<JavascriptObject^>^ objects, const CefRefPtr<CefV8Value>& v8Value);
         };
diff --git a/CefSharp.BrowserSubprocess.Core/RegisterBoundObjectRegistry.h b/CefSharp.BrowserSubprocess.Core/RegisterBoundObjectRegistry.h
@@ -24,14 +24,14 @@ namespace CefSharp
         private:
             //Only access through Interlocked::Increment - used to generate unique callback Id's
             //Is static so ids are unique to this process https://github.com/cefsharp/CefSharp/issues/2792
-            static int64 _lastCallback;
+            static int64_t _lastCallback;
 
-            initonly Dictionary<int64, JavascriptAsyncMethodCallback^>^ _methodCallbacks;
+            initonly Dictionary<int64_t, JavascriptAsyncMethodCallback^>^ _methodCallbacks;
 
         public:
             RegisterBoundObjectRegistry()
             {
-                _methodCallbacks = gcnew Dictionary<int64, JavascriptAsyncMethodCallback^>();
+                _methodCallbacks = gcnew Dictionary<int64_t, JavascriptAsyncMethodCallback^>();
             }
 
             ~RegisterBoundObjectRegistry()
@@ -43,14 +43,14 @@ namespace CefSharp
                 _methodCallbacks->Clear();
             }
 
-            int64 SaveMethodCallback(JavascriptAsyncMethodCallback^ callback)
+            int64_t SaveMethodCallback(JavascriptAsyncMethodCallback^ callback)
             {
                 auto callbackId = Interlocked::Increment(_lastCallback);
                 _methodCallbacks->Add(callbackId, callback);
                 return callbackId;
             }
 
-            bool TryGetAndRemoveMethodCallback(int64 id, JavascriptAsyncMethodCallback^% callback)
+            bool TryGetAndRemoveMethodCallback(int64_t id, JavascriptAsyncMethodCallback^% callback)
             {
                 bool result = false;
                 if (result = _methodCallbacks->TryGetValue(id, callback))
diff --git a/CefSharp.Core.Runtime/BrowserSettings.h b/CefSharp.Core.Runtime/BrowserSettings.h
@@ -308,10 +308,10 @@ namespace CefSharp
             /// CefSettings.BackgroundColor value will be used. If the alpha component is fully transparent
             /// for a windowless (WPF/OffScreen) browser then transparent painting will be enabled.
             /// </summary>
-            virtual property uint32 BackgroundColor
+            virtual property uint32_t BackgroundColor
             {
-                uint32 get() { return _browserSettings->background_color; }
-                void set(uint32 value) { _browserSettings->background_color = value; }
+                uint32_t get() { return _browserSettings->background_color; }
+                void set(uint32_t value) { _browserSettings->background_color = value; }
             }
 
             /// <summary>
diff --git a/CefSharp.Core.Runtime/Cef.h b/CefSharp.Core.Runtime/Cef.h
@@ -674,7 +674,7 @@ namespace CefSharp
             /// <param name="g">Green</param>
             /// <param name="b">Blue</param>
             /// <returns>Returns the color.</returns>
-            static uint32 ColorSetARGB(uint32 a, uint32 r, uint32 g, uint32 b)
+            static uint32_t ColorSetARGB(uint32_t a, uint32_t r, uint32_t g, uint32_t b)
             {
                 return CefColorSetARGB(a, r, g, b);
             }
diff --git a/CefSharp.Core.Runtime/CefSettingsBase.h b/CefSharp.Core.Runtime/CefSettingsBase.h
@@ -352,10 +352,10 @@ namespace CefSharp
             /// default value of opaque white be used. If the alpha component is fully transparent for a windowless (WPF/OffScreen) browser
             /// then transparent painting will be enabled.
             /// </summary>
-            property uint32 BackgroundColor
+            property uint32_t BackgroundColor
             {
-                uint32 get() { return _cefSettings->background_color; }
-                void set(uint32 value) { _cefSettings->background_color = value; }
+                uint32_t get() { return _cefSettings->background_color; }
+                void set(uint32_t value) { _cefSettings->background_color = value; }
             }
 
             /// <summary>
diff --git a/CefSharp.Core.Runtime/Internals/CefBrowserHostWrapper.cpp b/CefSharp.Core.Runtime/Internals/CefBrowserHostWrapper.cpp
@@ -347,7 +347,7 @@ void CefBrowserHostWrapper::SendKeyEvent(KeyEvent keyEvent)
     CefKeyEvent nativeKeyEvent;
     nativeKeyEvent.focus_on_editable_field = keyEvent.FocusOnEditableField == 1;
     nativeKeyEvent.is_system_key = keyEvent.IsSystemKey == 1;
-    nativeKeyEvent.modifiers = (uint32)keyEvent.Modifiers;
+    nativeKeyEvent.modifiers = (uint32_t)keyEvent.Modifiers;
     nativeKeyEvent.type = (cef_key_event_type_t)keyEvent.Type;
     nativeKeyEvent.native_key_code = keyEvent.NativeKeyCode;
     nativeKeyEvent.windows_key_code = keyEvent.WindowsKeyCode;
@@ -433,7 +433,7 @@ void CefBrowserHostWrapper::SendMouseWheelEvent(MouseEvent mouseEvent, int delta
         CefMouseEvent m;
         m.x = mouseEvent.X;
         m.y = mouseEvent.Y;
-        m.modifiers = (uint32)mouseEvent.Modifiers;
+        m.modifiers = (uint32_t)mouseEvent.Modifiers;
 
         _browserHost->SendMouseWheelEvent(m, deltaX, deltaY);
     }
@@ -447,7 +447,7 @@ void CefBrowserHostWrapper::SendTouchEvent(TouchEvent evt)
     {
         CefTouchEvent e;
         e.id = evt.Id;
-        e.modifiers = (uint32)evt.Modifiers;
+        e.modifiers = (uint32_t)evt.Modifiers;
         e.pointer_type = (cef_pointer_type_t)evt.PointerType;
         e.pressure = evt.Pressure;
         e.radius_x = evt.RadiusX;
@@ -559,7 +559,7 @@ void CefBrowserHostWrapper::SendMouseClickEvent(MouseEvent mouseEvent, MouseButt
     CefMouseEvent m;
     m.x = mouseEvent.X;
     m.y = mouseEvent.Y;
-    m.modifiers = (uint32)mouseEvent.Modifiers;
+    m.modifiers = (uint32_t)mouseEvent.Modifiers;
 
     _browserHost->SendMouseClickEvent(m, (CefBrowserHost::MouseButtonType) mouseButtonType, mouseUp, clickCount);
 }
@@ -571,7 +571,7 @@ void CefBrowserHostWrapper::SendMouseMoveEvent(MouseEvent mouseEvent, bool mouse
     CefMouseEvent m;
     m.x = mouseEvent.X;
     m.y = mouseEvent.Y;
-    m.modifiers = (uint32)mouseEvent.Modifiers;
+    m.modifiers = (uint32_t)mouseEvent.Modifiers;
 
     _browserHost->SendMouseMoveEvent(m, mouseLeave);
 }
@@ -695,7 +695,7 @@ CefMouseEvent CefBrowserHostWrapper::GetCefMouseEvent(MouseEvent mouseEvent)
     CefMouseEvent cefMouseEvent;
     cefMouseEvent.x = mouseEvent.X;
     cefMouseEvent.y = mouseEvent.Y;
-    cefMouseEvent.modifiers = (uint32)mouseEvent.Modifiers;
+    cefMouseEvent.modifiers = (uint32_t)mouseEvent.Modifiers;
     return cefMouseEvent;
 }
 
diff --git a/CefSharp.Core.Runtime/Internals/CefResourceHandlerAdapter.cpp b/CefSharp.Core.Runtime/Internals/CefResourceHandlerAdapter.cpp
@@ -29,7 +29,7 @@ namespace CefSharp
             return _handler->Open(_request, handleRequest, callbackWrapper);
         }
 
-        void CefResourceHandlerAdapter::GetResponseHeaders(CefRefPtr<CefResponse> response, int64& response_length, CefString& redirectUrl)
+        void CefResourceHandlerAdapter::GetResponseHeaders(CefRefPtr<CefResponse> response, int64_t& response_length, CefString& redirectUrl)
         {
             String^ newRedirectUrl;
 
@@ -40,7 +40,7 @@ namespace CefSharp
             redirectUrl = StringUtils::ToNative(newRedirectUrl);
         }
 
-        bool CefResourceHandlerAdapter::Skip(int64 bytesToSkip, int64& bytesSkipped, CefRefPtr<CefResourceSkipCallback> callback)
+        bool CefResourceHandlerAdapter::Skip(int64_t bytesToSkip, int64_t& bytesSkipped, CefRefPtr<CefResourceSkipCallback> callback)
         {
             auto callbackWrapper = gcnew CefResourceSkipCallbackWrapper(callback);
 
diff --git a/CefSharp.Core.Runtime/Internals/CefResourceHandlerAdapter.h b/CefSharp.Core.Runtime/Internals/CefResourceHandlerAdapter.h
diff --git a/CefSharp.Core.Runtime/Internals/CefResourceRequestHandlerAdapter.h b/CefSharp.Core.Runtime/Internals/CefResourceRequestHandlerAdapter.h
diff --git a/CefSharp.Core.Runtime/Internals/CefSharpApp.h b/CefSharp.Core.Runtime/Internals/CefSharpApp.h
diff --git a/CefSharp.Core.Runtime/Internals/CefUrlRequestClientAdapter.cpp b/CefSharp.Core.Runtime/Internals/CefUrlRequestClientAdapter.cpp
diff --git a/CefSharp.Core.Runtime/Internals/CefUrlRequestClientAdapter.h b/CefSharp.Core.Runtime/Internals/CefUrlRequestClientAdapter.h
diff --git a/CefSharp.Core.Runtime/Internals/CefWriteHandlerWrapper.h b/CefSharp.Core.Runtime/Internals/CefWriteHandlerWrapper.h
diff --git a/CefSharp.Core.Runtime/Internals/ClientAdapter.cpp b/CefSharp.Core.Runtime/Internals/ClientAdapter.cpp
diff --git a/CefSharp.Core.Runtime/Internals/ClientAdapter.h b/CefSharp.Core.Runtime/Internals/ClientAdapter.h
diff --git a/CefSharp.Core.Runtime/Internals/Serialization/Primitives.cpp b/CefSharp.Core.Runtime/Internals/Serialization/Primitives.cpp
diff --git a/CefSharp.Core.Runtime/Internals/Serialization/Primitives.h b/CefSharp.Core.Runtime/Internals/Serialization/Primitives.h

Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,11 @@ namespace CefSharp`
`18`	`18`	`{`
`19`	`19`	`private:`
`20`	`20`	`gcroot<JavascriptCallbackRegistry^> _callbackRegistry;`
`21`		`- gcroot<Func<JavascriptAsyncMethodCallback^, int64>^> _methodCallbackSave;`
`22`		`- int64 _objectId;`
	`21`	`+ gcroot<Func<JavascriptAsyncMethodCallback^, int64_t>^> _methodCallbackSave;`
	`22`	`+ int64_t _objectId;`
`23`	`23`
`24`	`24`	`public:`
`25`		`- JavascriptAsyncMethodHandler(int64 objectId, JavascriptCallbackRegistry^ callbackRegistry, Func<JavascriptAsyncMethodCallback^, int64>^ methodCallbackSave)`
	`25`	`+ JavascriptAsyncMethodHandler(int64_t objectId, JavascriptCallbackRegistry^ callbackRegistry, Func<JavascriptAsyncMethodCallback^, int64_t>^ methodCallbackSave)`
`26`	`26`	`:_callbackRegistry(callbackRegistry), _objectId(objectId), _methodCallbackSave(methodCallbackSave)`
`27`	`27`	`{`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ namespace CefSharp`
`19`	`19`	`MCefRefPtr<JavascriptAsyncMethodHandler> _javascriptMethodHandler;`
`20`	`20`
`21`	`21`	`public:`
`22`		`- JavascriptAsyncMethodWrapper(int64 ownerId, JavascriptCallbackRegistry^ callbackRegistry, Func<JavascriptAsyncMethodCallback^, int64>^ methodCallbackSave)`
	`22`	`+ JavascriptAsyncMethodWrapper(int64_t ownerId, JavascriptCallbackRegistry^ callbackRegistry, Func<JavascriptAsyncMethodCallback^, int64_t>^ methodCallbackSave)`
`23`	`23`	`: _javascriptMethodHandler(new JavascriptAsyncMethodHandler(ownerId, callbackRegistry, methodCallbackSave))`
`24`	`24`	`{`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ namespace CefSharp`
`292`	`292`	`frame->SendProcessMessage(CefProcessId::PID_BROWSER, uncaughtExceptionMessage);`
`293`	`293`	`}`
`294`	`294`
`295`		`- JavascriptRootObjectWrapper^ CefAppUnmanagedWrapper::GetJsRootObjectWrapper(int browserId, int64 frameId)`
	`295`	`+ JavascriptRootObjectWrapper^ CefAppUnmanagedWrapper::GetJsRootObjectWrapper(int browserId, int64_t frameId)`
`296`	`296`	`{`
`297`	`297`	`auto browserWrapper = FindBrowserWrapper(browserId);`
`298`	`298`
`@@ -401,7 +401,7 @@ namespace CefSharp`
`401`	`401`
`402`	`402`	`//both messages have callbackId stored at index 0`
`403`	`403`	`auto frameId = frame->GetIdentifier();`
`404`		`- int64 callbackId = GetInt64(argList, 0);`
	`404`	`+ int64_t callbackId = GetInt64(argList, 0);`
`405`	`405`
`406`	`406`	`if (name == kEvaluateJavascriptRequest)`
`407`	`407`	`{`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ namespace CefSharp`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`CefBrowserWrapper^ FindBrowserWrapper(int browserId);`
`75`		`- JavascriptRootObjectWrapper^ GetJsRootObjectWrapper(int browserId, int64 frameId);`
	`75`	`+ JavascriptRootObjectWrapper^ GetJsRootObjectWrapper(int browserId, int64_t frameId);`
`76`	`76`
`77`	`77`	`virtual DECL CefRefPtr<CefRenderProcessHandler> GetRenderProcessHandler() override;`
`78`	`78`	`virtual DECL void OnBrowserCreated(CefRefPtr<CefBrowser> browser, CefRefPtr<CefDictionaryValue> extraInfo) override;`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ namespace CefSharp`
`31`	`31`
`32`	`32`	`internal:`
`33`	`33`	`//Frame Identifier is used as Key`
`34`		`- property ConcurrentDictionary<int64, JavascriptRootObjectWrapper^>^ JavascriptRootObjectWrappers;`
	`34`	`+ property ConcurrentDictionary<int64_t, JavascriptRootObjectWrapper^>^ JavascriptRootObjectWrappers;`
`35`	`35`
`36`	`36`	`public:`
`37`	`37`	`CefBrowserWrapper(CefRefPtr<CefBrowser> cefBrowser)`
`@@ -40,7 +40,7 @@ namespace CefSharp`
`40`	`40`	`BrowserId = cefBrowser->GetIdentifier();`
`41`	`41`	`IsPopup = cefBrowser->IsPopup();`
`42`	`42`
`43`		`- JavascriptRootObjectWrappers = gcnew ConcurrentDictionary<int64, JavascriptRootObjectWrapper^>();`
	`43`	`+ JavascriptRootObjectWrappers = gcnew ConcurrentDictionary<int64_t, JavascriptRootObjectWrapper^>();`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`!CefBrowserWrapper()`
`@@ -54,7 +54,7 @@ namespace CefSharp`
`54`	`54`
`55`	`55`	`if (JavascriptRootObjectWrappers != nullptr)`
`56`	`56`	`{`
`57`		`- for each (KeyValuePair<int64, JavascriptRootObjectWrapper^> entry in JavascriptRootObjectWrappers)`
	`57`	`+ for each (KeyValuePair<int64_t, JavascriptRootObjectWrapper^> entry in JavascriptRootObjectWrappers)`
`58`	`58`	`{`
`59`	`59`	`delete entry.Value;`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ namespace CefSharp`
`25`	`25`	`return result;`
`26`	`26`	`}`
`27`	`27`
`28`		`- JavascriptCallbackWrapper^ JavascriptCallbackRegistry::FindWrapper(int64 id)`
	`28`	`+ JavascriptCallbackWrapper^ JavascriptCallbackRegistry::FindWrapper(int64_t id)`
`29`	`29`	`{`
`30`	`30`	`JavascriptCallbackWrapper^ callback;`
`31`	`31`	`_callbacks->TryGetValue(id, callback);`
Original file line number	Diff line number	Diff line change
`@@ -20,12 +20,12 @@ namespace CefSharp`
`20`	`20`	`{`
`21`	`21`	`private:`
`22`	`22`	`MCefRefPtr<JavascriptMethodHandler> _javascriptMethodHandler;`
`23`		`- int64 _ownerId;`
	`23`	`+ int64_t _ownerId;`
`24`	`24`	`String^ _javascriptMethodName;`
`25`	`25`	`IBrowserProcess^ _browserProcess;`
`26`	`26`
`27`	`27`	`public:`
`28`		`- JavascriptMethodWrapper(int64 ownerId, IBrowserProcess^ browserProcess, JavascriptCallbackRegistry^ callbackRegistry)`
	`28`	`+ JavascriptMethodWrapper(int64_t ownerId, IBrowserProcess^ browserProcess, JavascriptCallbackRegistry^ callbackRegistry)`
`29`	`29`	`{`
`30`	`30`	`_ownerId = ownerId;`
`31`	`31`	`_browserProcess = browserProcess;`
Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,11 @@ namespace CefSharp`
`14`	`14`	`{`
`15`	`15`	`private class JavascriptPromiseResolverCatch : public CefV8Handler`
`16`	`16`	`{`
`17`		`- int64 _callbackId;`
	`17`	`+ int64_t _callbackId;`
`18`	`18`	`bool _isJsCallback;`
`19`	`19`
`20`	`20`	`public:`
`21`		`- JavascriptPromiseResolverCatch(int64 callbackId, bool isJsCallback) : _callbackId(callbackId), _isJsCallback(isJsCallback)`
	`21`	`+ JavascriptPromiseResolverCatch(int64_t callbackId, bool isJsCallback) : _callbackId(callbackId), _isJsCallback(isJsCallback)`
`22`	`22`	`{`
`23`	`23`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,11 +19,11 @@ namespace CefSharp`
`19`	`19`	`{`
`20`	`20`	`private class JavascriptPromiseResolverThen : public CefV8Handler`
`21`	`21`	`{`
`22`		`- int64 _callbackId;`
	`22`	`+ int64_t _callbackId;`
`23`	`23`	`bool _isJsCallback;`
`24`	`24`
`25`	`25`	`public:`
`26`		`- JavascriptPromiseResolverThen(int64 callbackId, bool isJsCallback) : _callbackId(callbackId), _isJsCallback(isJsCallback)`
	`26`	`+ JavascriptPromiseResolverThen(int64_t callbackId, bool isJsCallback) : _callbackId(callbackId), _isJsCallback(isJsCallback)`
`27`	`27`	`{`
`28`	`28`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ namespace CefSharp`
`18`	`18`	`{`
`19`	`19`	`if (objects->Count > 0)`
`20`	`20`	`{`
`21`		`- auto saveMethod = gcnew Func<JavascriptAsyncMethodCallback^, int64>(this, &JavascriptRootObjectWrapper::SaveMethodCallback);`
	`21`	`+ auto saveMethod = gcnew Func<JavascriptAsyncMethodCallback^, int64_t>(this, &JavascriptRootObjectWrapper::SaveMethodCallback);`
`22`	`22`
`23`	`23`	`for each (JavascriptObject ^ obj in Enumerable::OfType<JavascriptObject^>(objects))`
`24`	`24`	`{`
`@@ -54,14 +54,14 @@ namespace CefSharp`
`54`	`54`	`return _callbackRegistry;`
`55`	`55`	`}`
`56`	`56`
`57`		`- int64 JavascriptRootObjectWrapper::SaveMethodCallback(JavascriptAsyncMethodCallback^ callback)`
	`57`	`+ int64_t JavascriptRootObjectWrapper::SaveMethodCallback(JavascriptAsyncMethodCallback^ callback)`
`58`	`58`	`{`
`59`	`59`	`auto callbackId = Interlocked::Increment(_lastCallback);`
`60`	`60`	`_methodCallbacks->Add(callbackId, callback);`
`61`	`61`	`return callbackId;`
`62`	`62`	`}`
`63`	`63`
`64`		`- bool JavascriptRootObjectWrapper::TryGetAndRemoveMethodCallback(int64 id, JavascriptAsyncMethodCallback^% callback)`
	`64`	`+ bool JavascriptRootObjectWrapper::TryGetAndRemoveMethodCallback(int64_t id, JavascriptAsyncMethodCallback^% callback)`
`65`	`65`	`{`
`66`	`66`	`bool result = false;`
`67`	`67`	`if (result = _methodCallbacks->TryGetValue(id, callback))`