Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Calling browser close in managedcefbrowseradapter destructor #304

Merged
merged 3 commits into from
Apr 1, 2014
Merged

Calling browser close in managedcefbrowseradapter destructor #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b6248b
Small formatting fix
brock8503 Apr 1, 2014
cae957a
Adding more granularity when cookies are accessed through the View AP…
brock8503 Apr 1, 2014
39742b6
On cleanup the browser close api should be called to close the child
brock8503 Apr 1, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions CefSharp.Core/Internals/ClientAdapter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ namespace CefSharp
virtual CefRefPtr<CefKeyboardHandler> GetKeyboardHandler() OVERRIDE{ return this; }
virtual CefRefPtr<CefJSDialogHandler> GetJSDialogHandler() OVERRIDE{ return this; }

// CefLifeSpanHandler
virtual DECL bool OnBeforePopup(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame,
// CefLifeSpanHandler
virtual DECL bool OnBeforePopup(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame,
const CefString& target_url, const CefString& target_frame_name, const CefPopupFeatures& popupFeatures,
CefWindowInfo& windowInfo, CefRefPtr<CefClient>& client, CefBrowserSettings& settings, bool* no_javascript_access) OVERRIDE;
virtual DECL void OnAfterCreated(CefRefPtr<CefBrowser> browser) OVERRIDE;
Expand Down
10 changes: 8 additions & 2 deletions CefSharp.Core/Internals/CookieVisitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,14 @@ namespace CefSharp

if (cefCookie.has_expires)
{
cookie->Expires = DateTime(cefCookie.expires.year,
cefCookie.expires.month, cefCookie.expires.day_of_month);
cookie->Expires = DateTime(
cefCookie.expires.year,
cefCookie.expires.month,
cefCookie.expires.day_of_month,
cefCookie.expires.hour,
cefCookie.expires.minute,
cefCookie.expires.second,
cefCookie.expires.millisecond);
}

return _visitor->Visit(cookie, count, total, deleteCookie);
Expand Down
1 change: 1 addition & 0 deletions CefSharp.Core/ManagedCefBrowserAdapter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ namespace CefSharp

~ManagedCefBrowserAdapter()
{
this->Close();
_renderClientAdapter = nullptr;
}

Expand Down