Permalink
Browse files

update to cef r585

  • Loading branch information...
1 parent d568c25 commit f6d6de88cd74df3e4aff297b37da16e81c575922 @ataranto committed Apr 10, 2012
Showing with 98 additions and 60 deletions.
  1. +3 −3 CefSharp/CefSharp.h
  2. BIN Release/avutil-51.dll
  3. BIN Release/chrome.pak
  4. BIN Release/libEGL.dll
  5. BIN Release/libGLESv2.dll
  6. BIN Release/libcef.dll
  7. BIN Release/locales/am.pak
  8. BIN Release/locales/ar.pak
  9. BIN Release/locales/bg.pak
  10. BIN Release/locales/bn.pak
  11. BIN Release/locales/ca.pak
  12. BIN Release/locales/cs.pak
  13. BIN Release/locales/da.pak
  14. BIN Release/locales/de.pak
  15. BIN Release/locales/el.pak
  16. BIN Release/locales/en-GB.pak
  17. BIN Release/locales/en-US.pak
  18. BIN Release/locales/es-419.pak
  19. BIN Release/locales/es.pak
  20. BIN Release/locales/et.pak
  21. BIN Release/locales/fa.pak
  22. BIN Release/locales/fi.pak
  23. BIN Release/locales/fil.pak
  24. BIN Release/locales/fr.pak
  25. BIN Release/locales/gu.pak
  26. BIN Release/locales/he.pak
  27. BIN Release/locales/hi.pak
  28. BIN Release/locales/hr.pak
  29. BIN Release/locales/hu.pak
  30. BIN Release/locales/id.pak
  31. BIN Release/locales/it.pak
  32. BIN Release/locales/ja.pak
  33. BIN Release/locales/kn.pak
  34. BIN Release/locales/ko.pak
  35. BIN Release/locales/lt.pak
  36. BIN Release/locales/lv.pak
  37. BIN Release/locales/ml.pak
  38. BIN Release/locales/mr.pak
  39. BIN Release/locales/ms.pak
  40. BIN Release/locales/nb.pak
  41. BIN Release/locales/nl.pak
  42. BIN Release/locales/pl.pak
  43. BIN Release/locales/pt-BR.pak
  44. BIN Release/locales/pt-PT.pak
  45. BIN Release/locales/ro.pak
  46. BIN Release/locales/ru.pak
  47. BIN Release/locales/sk.pak
  48. BIN Release/locales/sl.pak
  49. BIN Release/locales/sr.pak
  50. BIN Release/locales/sv.pak
  51. BIN Release/locales/sw.pak
  52. BIN Release/locales/ta.pak
  53. BIN Release/locales/te.pak
  54. BIN Release/locales/th.pak
  55. BIN Release/locales/tr.pak
  56. BIN Release/locales/uk.pak
  57. BIN Release/locales/vi.pak
  58. BIN Release/locales/zh-CN.pak
  59. BIN Release/locales/zh-TW.pak
  60. +76 −42 include/cef_cookie.h
  61. +2 −4 include/cef_frame.h
  62. +12 −0 include/cef_request_handler.h
  63. +2 −1 include/cef_scheme.h
  64. +3 −3 include/cef_version.h
  65. +0 −6 include/internal/cef_types.h
  66. +0 −1 include/internal/cef_types_wrappers.h
  67. BIN libs/Debug/libcef.lib
  68. BIN libs/Debug/libcef_dll_wrapper.lib
  69. BIN libs/Release/libcef.lib
  70. BIN libs/Release/libcef_dll_wrapper.lib
View
@@ -36,13 +36,13 @@ namespace CefSharp
static void IOT_SetCookie(const CefString& url, const CefCookie& cookie)
{
- _result = CefSetCookie(url, cookie);
+ _result = CefCookieManager::GetGlobalManager()->SetCookie(url, cookie);
SetEvent(_event);
}
static void IOT_DeleteCookies(const CefString& url, const CefString& name)
{
- _result = CefDeleteCookies(url, name);
+ _result = CefCookieManager::GetGlobalManager()->DeleteCookies(url, name);
SetEvent(_event);
}
@@ -170,7 +170,7 @@ namespace CefSharp
static bool SetCookiePath(String^ path)
{
- return CefSetCookiePath(toNative(path));
+ return CefCookieManager::GetGlobalManager()->SetStoragePath(toNative(path));
}
static void Shutdown()
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 Marshall A. Greenblatt. All rights reserved.
+// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
@@ -39,56 +39,90 @@
#pragma once
#include "include/cef_base.h"
+#include <vector>
class CefCookieVisitor;
-///
-// Visit all cookies. The returned cookies are ordered by longest path, then by
-// earliest creation date. Returns false if cookies cannot be accessed.
-///
-/*--cef()--*/
-bool CefVisitAllCookies(CefRefPtr<CefCookieVisitor> visitor);
///
-// Visit a subset of cookies. The results are filtered by the given url scheme,
-// host, domain and path. If |includeHttpOnly| is true HTTP-only cookies will
-// also be included in the results. The returned cookies are ordered by longest
-// path, then by earliest creation date. Returns false if cookies cannot be
-// accessed.
+// Class used for managing cookies. The methods of this class may be called on
+// any thread unless otherwise indicated.
///
-/*--cef()--*/
-bool CefVisitUrlCookies(const CefString& url, bool includeHttpOnly,
- CefRefPtr<CefCookieVisitor> visitor);
+/*--cef(source=library)--*/
+class CefCookieManager : public virtual CefBase {
+ public:
+ ///
+ // Returns the global cookie manager. By default data will be stored at
+ // CefSettings.cache_path if specified or in memory otherwise.
+ ///
+ /*--cef()--*/
+ static CefRefPtr<CefCookieManager> GetGlobalManager();
-///
-// Sets a cookie given a valid URL and explicit user-provided cookie attributes.
-// This function expects each attribute to be well-formed. It will check for
-// disallowed characters (e.g. the ';' character is disallowed within the cookie
-// value attribute) and will return false without setting the cookie if such
-// characters are found. This method must be called on the IO thread.
-///
-/*--cef()--*/
-bool CefSetCookie(const CefString& url, const CefCookie& cookie);
+ ///
+ // Creates a new cookie manager. If |path| is empty data will be stored in
+ // memory only. Returns NULL if creation fails.
+ ///
+ /*--cef(optional_param=path)--*/
+ static CefRefPtr<CefCookieManager> CreateManager(const CefString& path);
-///
-// Delete all cookies that match the specified parameters. If both |url| and
-// |cookie_name| are specified all host and domain cookies matching both values
-// will be deleted. If only |url| is specified all host cookies (but not domain
-// cookies) irrespective of path will be deleted. If |url| is empty all cookies
-// for all hosts and domains will be deleted. Returns false if a non-empty
-// invalid URL is specified or if cookies cannot be accessed. This method must
-// be called on the IO thread.
-///
-/*--cef(optional_param=url,optional_param=cookie_name)--*/
-bool CefDeleteCookies(const CefString& url, const CefString& cookie_name);
+ ///
+ // Set the schemes supported by this manager. By default only "http" and
+ // "https" schemes are supported. Must be called before any cookies are
+ // accessed.
+ ///
+ /*--cef()--*/
+ virtual void SetSupportedSchemes(const std::vector<CefString>& schemes) =0;
-///
-// Sets the directory path that will be used for storing cookie data. If |path|
-// is empty data will be stored in memory only. By default the cookie path is
-// the same as the cache path. Returns false if cookies cannot be accessed.
-///
-/*--cef(optional_param=path)--*/
-bool CefSetCookiePath(const CefString& path);
+ ///
+ // Visit all cookies. The returned cookies are ordered by longest path, then
+ // by earliest creation date. Returns false if cookies cannot be accessed.
+ ///
+ /*--cef()--*/
+ virtual bool VisitAllCookies(CefRefPtr<CefCookieVisitor> visitor) =0;
+
+ ///
+ // Visit a subset of cookies. The results are filtered by the given url
+ // scheme, host, domain and path. If |includeHttpOnly| is true HTTP-only
+ // cookies will also be included in the results. The returned cookies are
+ // ordered by longest path, then by earliest creation date. Returns false if
+ // cookies cannot be accessed.
+ ///
+ /*--cef()--*/
+ virtual bool VisitUrlCookies(const CefString& url, bool includeHttpOnly,
+ CefRefPtr<CefCookieVisitor> visitor) =0;
+
+ ///
+ // Sets a cookie given a valid URL and explicit user-provided cookie
+ // attributes. This function expects each attribute to be well-formed. It will
+ // check for disallowed characters (e.g. the ';' character is disallowed
+ // within the cookie value attribute) and will return false without setting
+ // the cookie if such characters are found. This method must be called on the
+ // IO thread.
+ ///
+ /*--cef()--*/
+ virtual bool SetCookie(const CefString& url, const CefCookie& cookie) =0;
+
+ ///
+ // Delete all cookies that match the specified parameters. If both |url| and
+ // values |cookie_name| are specified all host and domain cookies matching
+ // both will be deleted. If only |url| is specified all host cookies (but not
+ // domain cookies) irrespective of path will be deleted. If |url| is empty all
+ // cookies for all hosts and domains will be deleted. Returns false if a non-
+ // empty invalid URL is specified or if cookies cannot be accessed. This
+ // method must be called on the IO thread.
+ ///
+ /*--cef(optional_param=url,optional_param=cookie_name)--*/
+ virtual bool DeleteCookies(const CefString& url,
+ const CefString& cookie_name) =0;
+
+ ///
+ // Sets the directory path that will be used for storing cookie data. If
+ // |path| is empty data will be stored in memory only. Returns false if
+ // cookies cannot be accessed.
+ ///
+ /*--cef(optional_param=path)--*/
+ virtual bool SetStoragePath(const CefString& path) =0;
+};
///
View
@@ -179,8 +179,7 @@ class CefFrame : public virtual CefBase {
virtual CefString GetName() =0;
///
- // Returns the globally unique identifier for this frame. This method should
- // only be called on the UI thread.
+ // Returns the globally unique identifier for this frame.
///
/*--cef()--*/
virtual int64 GetIdentifier() =0;
@@ -193,8 +192,7 @@ class CefFrame : public virtual CefBase {
virtual CefRefPtr<CefFrame> GetParent() =0;
///
- // Returns the URL currently loaded in this frame. This method should only be
- // called on the UI thread.
+ // Returns the URL currently loaded in this frame.
///
/*--cef()--*/
virtual CefString GetURL() =0;
@@ -40,6 +40,7 @@
#include "include/cef_base.h"
#include "include/cef_browser.h"
+#include "include/cef_cookie.h"
#include "include/cef_download_handler.h"
#include "include/cef_frame.h"
#include "include/cef_content_filter.h"
@@ -154,6 +155,17 @@ class CefRequestHandler : public virtual CefBase {
const CefString& scheme,
CefString& username,
CefString& password) { return false; }
+
+ ///
+ // Called on the IO thread to retrieve the cookie manager. |main_url| is the
+ // URL of the top-level frame. Cookies managers can be unique per browser or
+ // shared across multiple browsers. The global cookie manager will be used if
+ // this method returns NULL.
+ ///
+ /*--cef()--*/
+ virtual CefRefPtr<CefCookieManager> GetCookieManager(
+ CefRefPtr<CefBrowser> browser,
+ const CefString& main_url) { return NULL; }
};
#endif // CEF_INCLUDE_CEF_REQUEST_HANDLER_H_
View
@@ -132,7 +132,8 @@ class CefSchemeHandlerFactory : public virtual CefBase {
///
// Return a new scheme handler instance to handle the request. |browser| will
// be the browser window that initiated the request. If the request was
- // initiated using the CefWebURLRequest API |browser| will be NULL.
+ // initiated using the CefWebURLRequest API |browser| will be NULL. The
+ // |request| object passed to this method will not contain cookie data.
///
/*--cef()--*/
virtual CefRefPtr<CefSchemeHandler> Create(CefRefPtr<CefBrowser> browser,
View
@@ -35,12 +35,12 @@
#ifndef CEF_INCLUDE_CEF_VERSION_H_
#define CEF_INCLUDE_CEF_VERSION_H_
-#define CEF_REVISION 541
+#define CEF_REVISION 585
#define COPYRIGHT_YEAR 2012
-#define CHROME_VERSION_MAJOR 19
+#define CHROME_VERSION_MAJOR 20
#define CHROME_VERSION_MINOR 0
-#define CHROME_VERSION_BUILD 1046
+#define CHROME_VERSION_BUILD 1092
#define CHROME_VERSION_PATCH 0
#define DO_MAKE_STRING(p) #p
@@ -398,12 +398,6 @@ typedef struct _cef_browser_settings_t {
bool accelerated_compositing_enabled;
///
- // Set to true (1) to enable threaded compositing. This is currently only
- // supported by the command buffer graphics implementation.
- ///
- bool threaded_compositing_enabled;
-
- ///
// Set to true (1) to disable accelerated layers. This affects features like
// 3D CSS transforms.
///
@@ -395,7 +395,6 @@ struct CefBrowserSettingsTraits {
target->webgl_disabled = src->webgl_disabled;
target->accelerated_compositing_enabled =
src->accelerated_compositing_enabled;
- target->threaded_compositing_enabled = src->threaded_compositing_enabled;
target->accelerated_layers_disabled = src->accelerated_layers_disabled;
target->accelerated_video_disabled = src->accelerated_video_disabled;
target->accelerated_2d_canvas_disabled =
View
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
Binary file not shown.

0 comments on commit f6d6de8

Please sign in to comment.