mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Make CEF compliant with Google/Chromium style (issue #473).
- Add a new check_style tool based on Google's cpplint that can be used to verify compliance of pending changes and specific files/directories. - Update existing CEF source code to be compliant with the style requirements. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@463 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@@ -33,19 +33,19 @@
|
||||
// against the libcef_dll_wrapper target.
|
||||
//
|
||||
|
||||
#ifndef _CEF_BYTE_READ_HANDLER_H
|
||||
#define _CEF_BYTE_READ_HANDLER_H
|
||||
#ifndef CEF_INCLUDE_WRAPPER_CEF_BYTE_READ_HANDLER_H_
|
||||
#define CEF_INCLUDE_WRAPPER_CEF_BYTE_READ_HANDLER_H_
|
||||
#pragma once
|
||||
|
||||
#include "../cef_base.h"
|
||||
#include "../cef_stream.h"
|
||||
#include "include/cef_base.h"
|
||||
#include "include/cef_stream.h"
|
||||
|
||||
///
|
||||
// Thread safe implementation of the CefReadHandler class for reading an
|
||||
// in-memory array of bytes.
|
||||
///
|
||||
class CefByteReadHandler : public CefReadHandler
|
||||
{
|
||||
public:
|
||||
class CefByteReadHandler : public CefReadHandler {
|
||||
public:
|
||||
///
|
||||
// Create a new object for reading an array of bytes. An optional |source|
|
||||
// reference can be kept to keep the underlying data source from being
|
||||
@@ -63,26 +63,26 @@ public:
|
||||
// Seek to the specified offset position. |whence| may be any one of
|
||||
// SEEK_CUR, SEEK_END or SEEK_SET.
|
||||
///
|
||||
virtual int Seek(long offset, int whence);
|
||||
virtual int Seek(int64 offset, int whence);
|
||||
|
||||
///
|
||||
// Return the current offset position.
|
||||
///
|
||||
virtual long Tell();
|
||||
virtual int64 Tell();
|
||||
|
||||
///
|
||||
// Return non-zero if at end of file.
|
||||
///
|
||||
virtual int Eof();
|
||||
|
||||
private:
|
||||
private:
|
||||
const unsigned char* bytes_;
|
||||
size_t size_;
|
||||
size_t offset_;
|
||||
int64 size_;
|
||||
int64 offset_;
|
||||
CefRefPtr<CefBase> source_;
|
||||
|
||||
IMPLEMENT_REFCOUNTING(CefByteReadHandler);
|
||||
IMPLEMENT_LOCKING(CefByteReadHandler);
|
||||
};
|
||||
|
||||
#endif // _CEF_BYTE_READ_HANDLER_H
|
||||
#endif // CEF_INCLUDE_WRAPPER_CEF_BYTE_READ_HANDLER_H_
|
||||
|
@@ -33,11 +33,12 @@
|
||||
// against the libcef_dll_wrapper target.
|
||||
//
|
||||
|
||||
#ifndef _CEF_XML_OBJECT_H
|
||||
#define _CEF_XML_OBJECT_H
|
||||
#ifndef CEF_INCLUDE_WRAPPER_CEF_XML_OBJECT_H_
|
||||
#define CEF_INCLUDE_WRAPPER_CEF_XML_OBJECT_H_
|
||||
#pragma once
|
||||
|
||||
#include "../cef_base.h"
|
||||
#include "../cef_xml_reader.h"
|
||||
#include "include/cef_base.h"
|
||||
#include "include/cef_xml_reader.h"
|
||||
#include <map>
|
||||
#include <vector>
|
||||
|
||||
@@ -66,9 +67,8 @@ class CefStreamReader;
|
||||
// (c) Element nodes are represented by their outer XML string.
|
||||
// </pre>
|
||||
///
|
||||
class CefXmlObject : public CefBase
|
||||
{
|
||||
public:
|
||||
class CefXmlObject : public CefBase {
|
||||
public:
|
||||
typedef std::vector<CefRefPtr<CefXmlObject> > ObjectVector;
|
||||
typedef std::map<CefString, CefString > AttributeMap;
|
||||
|
||||
@@ -76,7 +76,7 @@ public:
|
||||
// Create a new object with the specified name. An object name must always be
|
||||
// at least one character long.
|
||||
///
|
||||
CefXmlObject(const CefString& name);
|
||||
explicit CefXmlObject(const CefString& name);
|
||||
virtual ~CefXmlObject();
|
||||
|
||||
///
|
||||
@@ -172,7 +172,7 @@ public:
|
||||
///
|
||||
size_t FindChildren(const CefString& name, ObjectVector& children);
|
||||
|
||||
private:
|
||||
private:
|
||||
void SetParent(CefXmlObject* parent);
|
||||
|
||||
CefString name_;
|
||||
@@ -185,4 +185,4 @@ private:
|
||||
IMPLEMENT_LOCKING(CefXmlObject);
|
||||
};
|
||||
|
||||
#endif // _CEF_XML_OBJECT_H
|
||||
#endif // CEF_INCLUDE_WRAPPER_CEF_XML_OBJECT_H_
|
||||
|
@@ -33,10 +33,11 @@
|
||||
// against the libcef_dll_wrapper target.
|
||||
//
|
||||
|
||||
#ifndef _CEF_ZIP_ARCHIVE_H
|
||||
#define _CEF_ZIP_ARCHIVE_H
|
||||
#ifndef CEF_INCLUDE_WRAPPER_CEF_ZIP_ARCHIVE_H_
|
||||
#define CEF_INCLUDE_WRAPPER_CEF_ZIP_ARCHIVE_H_
|
||||
#pragma once
|
||||
|
||||
#include "../cef_base.h"
|
||||
#include "include/cef_base.h"
|
||||
#include <map>
|
||||
|
||||
class CefStreamReader;
|
||||
@@ -52,16 +53,14 @@ class CefStreamReader;
|
||||
// means that files from the same folder may not be located together in the
|
||||
// file content map.
|
||||
///
|
||||
class CefZipArchive : public CefBase
|
||||
{
|
||||
public:
|
||||
class CefZipArchive : public CefBase {
|
||||
public:
|
||||
///
|
||||
// Class representing a file in the archive. Accessing the file data from
|
||||
// multiple threads is safe provided a reference to the File object is kept.
|
||||
///
|
||||
class File : public CefBase
|
||||
{
|
||||
public:
|
||||
class File : public CefBase {
|
||||
public:
|
||||
///
|
||||
// Returns the read-only data contained in the file.
|
||||
///
|
||||
@@ -123,11 +122,11 @@ public:
|
||||
///
|
||||
size_t GetFiles(FileMap& map);
|
||||
|
||||
private:
|
||||
private:
|
||||
FileMap contents_;
|
||||
|
||||
IMPLEMENT_REFCOUNTING(CefZipArchive);
|
||||
IMPLEMENT_LOCKING(CefZipArchive);
|
||||
};
|
||||
|
||||
#endif // _CEF_ZIP_ARCHIVE_H
|
||||
#endif // CEF_INCLUDE_WRAPPER_CEF_ZIP_ARCHIVE_H_
|
||||
|
Reference in New Issue
Block a user