Skip to content

Commit 466fa67

Browse files
committed
Change origin from string to Uri as that's what the code is expecting - so github.com wasn't working, http://www.github.com does
Improved the documentation a little
1 parent 8e817b3 commit 466fa67

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

CefSharp.Core/RequestContext.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -286,15 +286,15 @@ namespace CefSharp
286286
// |callback| will be executed on the UI thread after completion.
287287
///
288288
/*--cef()--*/
289-
virtual Task<ResolveCallbackResult>^ ResolveHostAsync(String^ origin)
289+
virtual Task<ResolveCallbackResult>^ ResolveHostAsync(Uri^ origin)
290290
{
291291
ThrowIfDisposed();
292292

293293
auto callback = gcnew TaskResolveCallbackHandler();
294294

295295
CefRefPtr<CefResolveCallback> callbackWrapper = new CefResolveCallbackAdapter(callback);
296296

297-
_requestContext->ResolveHost(StringUtils::ToNative(origin), callbackWrapper);
297+
_requestContext->ResolveHost(StringUtils::ToNative(origin->AbsoluteUri), callbackWrapper);
298298

299299
return callback->Task;
300300
}
@@ -306,13 +306,13 @@ namespace CefSharp
306306
// success. This method must be called on the browser process IO thread.
307307
///
308308
/*--cef(default_retval=ERR_FAILED)--*/
309-
virtual CefErrorCode ResolveHostCached(String^ origin, [Out] IList<String^>^ %resolvedIpAddresses)
309+
virtual CefErrorCode ResolveHostCached(Uri^ origin, [Out] IList<String^>^ %resolvedIpAddresses)
310310
{
311311
ThrowIfDisposed();
312312

313313
std::vector<CefString> addresses;
314314

315-
auto errorCode =_requestContext->ResolveHostCached(StringUtils::ToNative(origin), addresses);
315+
auto errorCode = _requestContext->ResolveHostCached(StringUtils::ToNative(origin->AbsoluteUri), addresses);
316316

317317
resolvedIpAddresses = StringUtils::ToClr(addresses);
318318

CefSharp/IRequestContext.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public interface IRequestContext : IDisposable
158158
/// </summary>
159159
/// <param name="origin">host name to resolve</param>
160160
/// <return>A task that represents the Resoolve Host operation. The value of the TResult parameter contains ResolveCallbackResult.</return>
161-
Task<ResolveCallbackResult> ResolveHostAsync(string origin);
161+
Task<ResolveCallbackResult> ResolveHostAsync(Uri origin);
162162

163163
/// <summary>
164164
/// Attempts to resolve origin to a list of associated IP addresses using
@@ -168,6 +168,6 @@ public interface IRequestContext : IDisposable
168168
/// <param name="resolvedIpAddresses">list of resolved IP
169169
/// addresses or empty list if no cached data is available.</param>
170170
/// <returns> Returns <see cref="CefErrorCode.None"/> on success</returns>
171-
CefErrorCode ResolveHostCached(string origin, out IList<string> resolvedIpAddresses);
171+
CefErrorCode ResolveHostCached(Uri origin, out IList<string> resolvedIpAddresses);
172172
}
173173
}

CefSharp/IResolveCallback.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public interface IResolveCallback
1313
/// </summary>
1414
/// <param name="result">The result code</param>
1515
/// <param name="resolvedIpAddresses">will be the list of resolved IP addresses or
16-
/// null if the resolution failed.</param>
16+
/// empty if the resolution failed.</param>
1717
void OnResolveCompleted(CefErrorCode result, IList<string> resolvedIpAddresses);
1818
}
1919
}

CefSharp/ResolveCallbackResult.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,14 @@ namespace CefSharp
88
{
99
public struct ResolveCallbackResult
1010
{
11+
/// <summary>
12+
/// The result code - <see cref="CefErrorCode.None"/> on success
13+
/// </summary>
1114
public CefErrorCode Result { get; private set; }
15+
16+
/// <summary>
17+
/// List of resolved IP addresses or empty if the resolution failed.
18+
/// </summary>
1219
public IList<string> ResolvedIpAddresses { get; private set; }
1320

1421
public ResolveCallbackResult(CefErrorCode result, IList<string> resolvedIpAddresses) : this()

0 commit comments

Comments
 (0)