mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Significant API changes for issue #218:
- Replace CefHandler with a new CefClient interface and separate handler interfaces. - Add support for virtual inheritance to allow multiple CefBase parented interfaces to be implemented in the same class. - Replace CefThreadSafeBase with IMPLEMENT_* macros to support virtual inheritance and to only provide locking implementations when needed. - Move the CefBrowserSettings parameter from CefInitialize to CreateBrowser. - Add a new cef_build.h header that provides platform-specific and OS_* defines. - Introduce the use of OVERRIDE to generate compiler errors on Windows if a child virtual method declaration doesn't match the parent declaration. - Use NDEBUG instead of _DEBUG because _DEBUG is not defined on Mac. (issue #240). git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@235 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@@ -60,7 +60,7 @@
|
||||
// (b) Entity reference nodes are resolved to the corresponding entity
|
||||
// value.
|
||||
// (c) Element nodes are represented by their outer XML string.
|
||||
class CefXmlObject : public CefThreadSafeBase<CefBase>
|
||||
class CefXmlObject : public CefBase
|
||||
{
|
||||
public:
|
||||
typedef std::vector<CefRefPtr<CefXmlObject> > ObjectVector;
|
||||
@@ -148,12 +148,15 @@ private:
|
||||
CefString value_;
|
||||
AttributeMap attributes_;
|
||||
ObjectVector children_;
|
||||
|
||||
IMPLEMENT_REFCOUNTING(CefXmlObject);
|
||||
IMPLEMENT_LOCKING(CefXmlObject);
|
||||
};
|
||||
|
||||
|
||||
// Thread safe implementation of the CefReadHandler class for reading an
|
||||
// in-memory array of bytes.
|
||||
class CefByteReadHandler : public CefThreadSafeBase<CefReadHandler>
|
||||
class CefByteReadHandler : public CefReadHandler
|
||||
{
|
||||
public:
|
||||
// Create a new object for reading an array of bytes. An optional |source|
|
||||
@@ -180,6 +183,9 @@ private:
|
||||
size_t size_;
|
||||
size_t offset_;
|
||||
CefRefPtr<CefBase> source_;
|
||||
|
||||
IMPLEMENT_REFCOUNTING(CefByteReadHandler);
|
||||
IMPLEMENT_LOCKING(CefByteReadHandler);
|
||||
};
|
||||
|
||||
|
||||
@@ -192,7 +198,7 @@ private:
|
||||
// (3) File ordering from the original zip archive is not maintained. This
|
||||
// means that files from the same folder may not be located together in the
|
||||
// file content map.
|
||||
class CefZipArchive : public CefThreadSafeBase<CefBase>
|
||||
class CefZipArchive : public CefBase
|
||||
{
|
||||
public:
|
||||
// Class representing a file in the archive. Accessing the file data from
|
||||
@@ -241,6 +247,9 @@ public:
|
||||
|
||||
private:
|
||||
FileMap contents_;
|
||||
|
||||
IMPLEMENT_REFCOUNTING(CefZipArchive);
|
||||
IMPLEMENT_LOCKING(CefZipArchive);
|
||||
};
|
||||
|
||||
#endif // _CEF_WRAPPER_H
|
||||
|
||||
Reference in New Issue
Block a user