From 6802bb108732c154d8f6b435636dd38e8f636b52 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 1 Aug 2012 10:16:07 -0700 Subject: [PATCH] Update cef Linux includes to branch 1025 revision 724 --- cef/include/internal/cef_linux.h | 30 ++++++++++++++++++++++++++ cef/include/internal/cef_types_linux.h | 7 ++++++ 2 files changed, 37 insertions(+) diff --git a/cef/include/internal/cef_linux.h b/cef/include/internal/cef_linux.h index b53c2341cad..0c9003b0688 100644 --- a/cef/include/internal/cef_linux.h +++ b/cef/include/internal/cef_linux.h @@ -37,7 +37,9 @@ #include "include/internal/cef_types_linux.h" #include "include/internal/cef_types_wrappers.h" +/// // Atomic increment and decrement. +/// inline long CefAtomicIncrement(long volatile *pDest) { // NOLINT(runtime/int) return __sync_add_and_fetch(pDest, 1); } @@ -45,7 +47,9 @@ inline long CefAtomicDecrement(long volatile *pDest) { // NOLINT(runtime/int) return __sync_sub_and_fetch(pDest, 1); } +/// // Critical section wrapper. +/// class CefCriticalSection { public: CefCriticalSection() { @@ -68,10 +72,13 @@ class CefCriticalSection { pthread_mutexattr_t attr_; }; +/// // Handle types. +/// #define CefWindowHandle cef_window_handle_t #define CefCursorHandle cef_cursor_handle_t + struct CefWindowInfoTraits { typedef cef_window_info_t struct_type; @@ -85,7 +92,9 @@ struct CefWindowInfoTraits { } }; +/// // Class representing window information. +/// class CefWindowInfo : public CefStructBase { public: typedef CefStructBase parent; @@ -99,6 +108,7 @@ class CefWindowInfo : public CefStructBase { } }; + struct CefPrintInfoTraits { typedef cef_print_info_t struct_type; @@ -111,9 +121,29 @@ struct CefPrintInfoTraits { } }; +/// // Class representing print context information. +/// typedef CefStructBase CefPrintInfo; + +struct CefKeyInfoTraits { + typedef cef_key_info_t struct_type; + + static inline void init(struct_type* s) {} + static inline void clear(struct_type* s) {} + + static inline void set(const struct_type* src, struct_type* target, + bool copy) { + target->key = src->key; + } +}; + +/// +// Class representing key information. +/// +typedef CefStructBase CefKeyInfo; + #endif // OS_LINUX #endif // CEF_INCLUDE_INTERNAL_CEF_LINUX_H_ diff --git a/cef/include/internal/cef_types_linux.h b/cef/include/internal/cef_types_linux.h index 81e997a62fd..15966907e1d 100644 --- a/cef/include/internal/cef_types_linux.h +++ b/cef/include/internal/cef_types_linux.h @@ -72,6 +72,13 @@ typedef struct _cef_print_info_t { double m_Scale; } cef_print_info_t; +/// +// Class representing key information. +/// +typedef struct _cef_key_info_t { + int key; +} cef_key_info_t; + #ifdef __cplusplus } #endif