Skip to content

Commit f3e974d

Browse files
author
Mike Russin
committed
Update to 116.0.27+gd8c85ac+chromium-116.0.5845.190
1 parent 8582ac6 commit f3e974d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+2274
-477
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,106 +1,106 @@
1-
namespace Xilium.CefGlue.Demo
2-
{
3-
using System;
4-
using System.Collections.Generic;
5-
using System.Collections.Specialized;
6-
using System.IO;
7-
using System.Text;
8-
using System.Threading;
9-
10-
internal sealed class DumpRequestResourceHandler : CefResourceHandler
11-
{
12-
private static int _requestNo;
13-
14-
private byte[] responseData;
15-
private int pos;
16-
17-
protected override bool Open(CefRequest request, out bool handleRequest, CefCallback callback)
18-
{
19-
// Backwards compatibility. ProcessRequest will be called.
20-
callback.Dispose();
21-
handleRequest = false;
22-
return false;
23-
}
24-
25-
protected override bool ProcessRequest(CefRequest request, CefCallback callback)
26-
{
27-
var requestNo = Interlocked.Increment(ref _requestNo);
28-
29-
var response = new StringBuilder();
30-
31-
response.AppendFormat("<pre>\n");
32-
response.AppendFormat("Requests processed by DemoAppResourceHandler: {0}\n", requestNo);
33-
34-
response.AppendFormat("Method: {0}\n", request.Method);
35-
response.AppendFormat("URL: {0}\n", request.Url);
36-
37-
response.AppendLine();
38-
response.AppendLine("Headers:");
39-
var headers = request.GetHeaderMap();
40-
foreach (string key in headers)
41-
{
42-
foreach (var value in headers.GetValues(key))
43-
{
44-
response.AppendFormat("{0}: {1}\n", key, value);
45-
}
46-
}
47-
response.AppendLine();
48-
49-
response.AppendFormat("</pre>\n");
50-
51-
responseData = Encoding.UTF8.GetBytes(response.ToString());
52-
53-
callback.Continue();
54-
return true;
55-
}
56-
57-
protected override void GetResponseHeaders(CefResponse response, out long responseLength, out string redirectUrl)
58-
{
59-
response.MimeType = "text/html";
60-
response.Status = 200;
61-
response.StatusText = "OK, hello from handler!";
62-
63-
var headers = new NameValueCollection(StringComparer.InvariantCultureIgnoreCase);
64-
headers.Add("Cache-Control", "private");
65-
response.SetHeaderMap(headers);
66-
67-
responseLength = responseData.LongLength;
68-
redirectUrl = null;
69-
}
70-
71-
protected override bool Skip(long bytesToSkip, out long bytesSkipped, CefResourceSkipCallback callback)
72-
{
73-
bytesSkipped = (long)CefErrorCode.Failed;
74-
return false;
75-
}
76-
1+
namespace Xilium.CefGlue.Demo
2+
{
3+
using System;
4+
using System.Collections.Generic;
5+
using System.Collections.Specialized;
6+
using System.IO;
7+
using System.Text;
8+
using System.Threading;
9+
10+
internal sealed class DumpRequestResourceHandler : CefResourceHandler
11+
{
12+
private static int _requestNo;
13+
14+
private byte[] responseData;
15+
private int pos;
16+
17+
protected override bool Open(CefRequest request, out bool handleRequest, CefCallback callback)
18+
{
19+
// Backwards compatibility. ProcessRequest will be called.
20+
callback.Dispose();
21+
handleRequest = false;
22+
return false;
23+
}
24+
25+
protected override bool ProcessRequest(CefRequest request, CefCallback callback)
26+
{
27+
var requestNo = Interlocked.Increment(ref _requestNo);
28+
29+
var response = new StringBuilder();
30+
31+
response.AppendFormat("<pre>\n");
32+
response.AppendFormat("Requests processed by DemoAppResourceHandler: {0}\n", requestNo);
33+
34+
response.AppendFormat("Method: {0}\n", request.Method);
35+
response.AppendFormat("URL: {0}\n", request.Url);
36+
37+
response.AppendLine();
38+
response.AppendLine("Headers:");
39+
var headers = request.GetHeaderMap();
40+
foreach (string key in headers)
41+
{
42+
foreach (var value in headers.GetValues(key))
43+
{
44+
response.AppendFormat("{0}: {1}\n", key, value);
45+
}
46+
}
47+
response.AppendLine();
48+
49+
response.AppendFormat("</pre>\n");
50+
51+
responseData = Encoding.UTF8.GetBytes(response.ToString());
52+
53+
callback.Continue();
54+
return true;
55+
}
56+
57+
protected override void GetResponseHeaders(CefResponse response, out long responseLength, out string redirectUrl)
58+
{
59+
response.MimeType = "text/html";
60+
response.Status = 200;
61+
response.StatusText = "OK, hello from handler!";
62+
63+
var headers = new NameValueCollection(StringComparer.InvariantCultureIgnoreCase);
64+
headers.Add("Cache-Control", "private");
65+
response.SetHeaderMap(headers);
66+
67+
responseLength = responseData.LongLength;
68+
redirectUrl = null;
69+
}
70+
71+
protected override bool Skip(long bytesToSkip, out long bytesSkipped, CefResourceSkipCallback callback)
72+
{
73+
bytesSkipped = (long)CefErrorCode.Failed;
74+
return false;
75+
}
76+
7777
protected override bool Read(Stream response, int bytesToRead, out int bytesRead, CefResourceReadCallback callback)
7878
{
79-
// Backwards compatibility. ReadResponse will be called.
80-
callback.Dispose();
81-
bytesRead = -1;
79+
// Backwards compatibility. ReadResponse will be called.
80+
callback.Dispose();
81+
bytesRead = -1;
8282
return false;
83-
}
84-
85-
protected override bool ReadResponse(Stream response, int bytesToRead, out int bytesRead, CefCallback callback)
86-
{
87-
if (bytesToRead == 0 || pos >= responseData.Length)
88-
{
89-
bytesRead = 0;
90-
return false;
91-
}
92-
else
93-
{
94-
var br = Math.Min(responseData.Length - pos, bytesToRead);
95-
response.Write(responseData, pos, br);
96-
pos += br;
97-
bytesRead = br;
98-
return true;
99-
}
100-
}
101-
102-
protected override void Cancel()
103-
{
104-
}
105-
}
106-
}
83+
}
84+
85+
protected override bool ReadResponse(Stream response, int bytesToRead, out int bytesRead, CefCallback callback)
86+
{
87+
if (bytesToRead == 0 || pos >= responseData.Length)
88+
{
89+
bytesRead = 0;
90+
return false;
91+
}
92+
else
93+
{
94+
var br = Math.Min(responseData.Length - pos, bytesToRead);
95+
response.Write(responseData, pos, br);
96+
pos += br;
97+
bytesRead = br;
98+
return true;
99+
}
100+
}
101+
102+
protected override void Cancel()
103+
{
104+
}
105+
}
106+
}

CefGlue.Interop.Gen/cef_parser.py

+6
Original file line numberDiff line numberDiff line change
@@ -364,11 +364,17 @@ def dict_to_str(dict):
364364
'void*': ['void*', 'NULL'],
365365
'int': ['int', '0'],
366366
'int16': ['int16', '0'],
367+
'int16_t': ['int16', '0'],
367368
'uint16': ['uint16', '0'],
369+
'uint16_t': ['uint16', '0'],
368370
'int32': ['int32', '0'],
371+
'int32_t': ['int32', '0'],
369372
'uint32': ['uint32', '0'],
373+
'uint32_t': ['uint32', '0'],
370374
'int64': ['int64', '0'],
375+
'int64_t': ['int64', '0'],
371376
'uint64': ['uint64', '0'],
377+
'uint64_t': ['uint64', '0'],
372378
'double': ['double', '0'],
373379
'float': ['float', '0'],
374380
'float*': ['float*', 'NULL'],

CefGlue.Interop.Gen/include/base/internal/cef_net_error_list.h

+8-3
Original file line numberDiff line numberDiff line change
@@ -768,10 +768,12 @@ NET_ERROR(CONTENT_DECODING_INIT_FAILED, -371)
768768
NET_ERROR(HTTP2_RST_STREAM_NO_ERROR_RECEIVED, -372)
769769

770770
// The pushed stream claimed by the request is no longer available.
771+
// TODO(https://crbug.com/1426477): Remove.
771772
NET_ERROR(HTTP2_PUSHED_STREAM_NOT_AVAILABLE, -373)
772773

773774
// A pushed stream was claimed and later reset by the server. When this happens,
774775
// the request should be retried.
776+
// TODO(https://crbug.com/1426477): Remove.
775777
NET_ERROR(HTTP2_CLAIMED_PUSHED_STREAM_RESET_BY_SERVER, -374)
776778

777779
// An HTTP transaction was retried too many times due for authentication or
@@ -788,6 +790,7 @@ NET_ERROR(HTTP2_CLIENT_REFUSED_STREAM, -377)
788790

789791
// A pushed HTTP/2 stream was claimed by a request based on matching URL and
790792
// request headers, but the pushed response headers do not match the request.
793+
// TODO(https://crbug.com/1426477): Remove.
791794
NET_ERROR(HTTP2_PUSHED_RESPONSE_DOES_NOT_MATCH, -378)
792795

793796
// The server returned a non-2xx HTTP response code.
@@ -814,10 +817,9 @@ NET_ERROR(TOO_MANY_ACCEPT_CH_RESTARTS, -382)
814817
// request should be invalidated.
815818
NET_ERROR(INCONSISTENT_IP_ADDRESS_SPACE, -383)
816819

817-
// The IP address space of the cached remote endpoint is blocked by private
820+
// The IP address space of the cached remote endpoint is blocked by local
818821
// network access check.
819-
NET_ERROR(CACHED_IP_ADDRESS_SPACE_BLOCKED_BY_PRIVATE_NETWORK_ACCESS_POLICY,
820-
-384)
822+
NET_ERROR(CACHED_IP_ADDRESS_SPACE_BLOCKED_BY_LOCAL_NETWORK_ACCESS_POLICY, -384)
821823

822824
// The cache does not have the requested entry.
823825
NET_ERROR(CACHE_MISS, -400)
@@ -977,6 +979,9 @@ NET_ERROR(CERT_DATABASE_CHANGED, -714)
977979

978980
// Error -715 was removed (CHANNEL_ID_IMPORT_FAILED)
979981

982+
// The certificate verifier configuration changed in some way.
983+
NET_ERROR(CERT_VERIFIER_CHANGED, -716)
984+
980985
// DNS error codes.
981986

982987
// DNS resolver received a malformed response.

CefGlue.Interop.Gen/include/cef_api_hash.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@
4242
// way that may cause binary incompatibility with other builds. The universal
4343
// hash value will change if any platform is affected whereas the platform hash
4444
// values will change only if that particular platform is affected.
45-
#define CEF_API_HASH_UNIVERSAL "7c7515822b869395898c705bcc350222c26e8734"
45+
#define CEF_API_HASH_UNIVERSAL "515045085896c9e45c1aaf734ee201efad822f6a"
4646
#if defined(OS_WIN)
47-
#define CEF_API_HASH_PLATFORM "54e2eed5aee11d5dbd88808a54f3e93a7bc17b0c"
47+
#define CEF_API_HASH_PLATFORM "1091d9b7f17abbbf86cbbf50db7106a2bad98ab5"
4848
#elif defined(OS_MAC)
49-
#define CEF_API_HASH_PLATFORM "0f491b440d7e9e318146ed06cdeca86972e801c5"
49+
#define CEF_API_HASH_PLATFORM "bfb5a9cb4551e80a0606531399e3244eac457a33"
5050
#elif defined(OS_LINUX)
51-
#define CEF_API_HASH_PLATFORM "b5a01a70d1d15078988ca7d694c355503d5b5ad6"
51+
#define CEF_API_HASH_PLATFORM "1ef1d39d8c95b1d6c93fa60a29e158a96f76ab9d"
5252
#endif
5353

5454
#ifdef __cplusplus

CefGlue.Interop.Gen/include/cef_audio_handler.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class CefAudioHandler : public virtual CefBaseRefCounted {
8787
virtual void OnAudioStreamPacket(CefRefPtr<CefBrowser> browser,
8888
const float** data,
8989
int frames,
90-
int64 pts) = 0;
90+
int64_t pts) = 0;
9191

9292
///
9393
/// Called on the UI thread when the stream has stopped. OnAudioSteamStopped

CefGlue.Interop.Gen/include/cef_browser.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ class CefBrowser : public virtual CefBaseRefCounted {
170170
/// Returns the frame with the specified identifier, or NULL if not found.
171171
///
172172
/*--cef(capi_name=get_frame_byident)--*/
173-
virtual CefRefPtr<CefFrame> GetFrame(int64 identifier) = 0;
173+
virtual CefRefPtr<CefFrame> GetFrame(int64_t identifier) = 0;
174174

175175
///
176176
/// Returns the frame with the specified name, or NULL if not found.
@@ -188,7 +188,7 @@ class CefBrowser : public virtual CefBaseRefCounted {
188188
/// Returns the identifiers of all existing frames.
189189
///
190190
/*--cef(count_func=identifiers:GetFrameCount)--*/
191-
virtual void GetFrameIdentifiers(std::vector<int64>& identifiers) = 0;
191+
virtual void GetFrameIdentifiers(std::vector<int64_t>& identifiers) = 0;
192192

193193
///
194194
/// Returns the names of all existing frames.
@@ -456,7 +456,7 @@ class CefBrowserHost : public virtual CefBaseRefCounted {
456456
/*--cef()--*/
457457
virtual void DownloadImage(const CefString& image_url,
458458
bool is_favicon,
459-
uint32 max_image_size,
459+
uint32_t max_image_size,
460460
bool bypass_cache,
461461
CefRefPtr<CefDownloadImageCallback> callback) = 0;
462462

CefGlue.Interop.Gen/include/cef_browser_process_handler.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ class CefBrowserProcessHandler : public virtual CefBaseRefCounted {
111111
/// pending scheduled call should be cancelled.
112112
///
113113
/*--cef()--*/
114-
virtual void OnScheduleMessagePumpWork(int64 delay_ms) {}
114+
virtual void OnScheduleMessagePumpWork(int64_t delay_ms) {}
115115

116116
///
117117
/// Return the default client for use with a newly created browser window. If

0 commit comments

Comments
 (0)