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:
Marshall Greenblatt
2012-01-09 23:46:23 +00:00
parent 9cc61f448b
commit 1073577d03
558 changed files with 9002 additions and 10977 deletions

View File

@@ -2,46 +2,46 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#ifndef _STREAM_IMPL_H
#define _STREAM_IMPL_H
#ifndef CEF_LIBCEF_STREAM_IMPL_H_
#define CEF_LIBCEF_STREAM_IMPL_H_
#pragma once
#include "include/cef_stream.h"
#include <stdio.h>
#include <string>
#include "include/cef_stream.h"
// Implementation of CefStreamReader for files.
class CefFileReader : public CefStreamReader
{
public:
class CefFileReader : public CefStreamReader {
public:
CefFileReader(FILE* file, bool close);
virtual ~CefFileReader();
virtual size_t Read(void* ptr, size_t size, size_t n) OVERRIDE;
virtual int Seek(long offset, int whence) OVERRIDE;
virtual long Tell() OVERRIDE;
virtual int Seek(int64 offset, int whence) OVERRIDE;
virtual int64 Tell() OVERRIDE;
virtual int Eof() OVERRIDE;
protected:
protected:
bool close_;
FILE *file_;
FILE* file_;
IMPLEMENT_REFCOUNTING(CefFileReader);
IMPLEMENT_LOCKING(CefFileReader);
};
// Implementation of CefStreamWriter for files.
class CefFileWriter : public CefStreamWriter
{
public:
class CefFileWriter : public CefStreamWriter {
public:
CefFileWriter(FILE* file, bool close);
virtual ~CefFileWriter();
virtual size_t Write(const void* ptr, size_t size, size_t n) OVERRIDE;
virtual int Seek(long offset, int whence) OVERRIDE;
virtual long Tell() OVERRIDE;
virtual int Seek(int64 offset, int whence) OVERRIDE;
virtual int64 Tell() OVERRIDE;
virtual int Flush() OVERRIDE;
protected:
FILE *file_;
protected:
FILE* file_;
bool close_;
IMPLEMENT_REFCOUNTING(CefFileWriter);
@@ -49,116 +49,106 @@ protected:
};
// Implementation of CefStreamReader for byte buffers.
class CefBytesReader : public CefStreamReader
{
public:
CefBytesReader(void* data, long datasize, bool copy);
class CefBytesReader : public CefStreamReader {
public:
CefBytesReader(void* data, int64 datasize, bool copy);
virtual ~CefBytesReader();
virtual size_t Read(void* ptr, size_t size, size_t n) OVERRIDE;
virtual int Seek(long offset, int whence) OVERRIDE;
virtual long Tell() OVERRIDE;
virtual int Seek(int64 offset, int whence) OVERRIDE;
virtual int64 Tell() OVERRIDE;
virtual int Eof() OVERRIDE;
void SetData(void* data, long datasize, bool copy);
void SetData(void* data, int64 datasize, bool copy);
void* GetData() { return data_; }
size_t GetDataSize() { return offset_; }
protected:
void* data_;
size_t datasize_;
protected:
void* data_;
int64 datasize_;
bool copy_;
size_t offset_;
int64 offset_;
IMPLEMENT_REFCOUNTING(CefBytesReader);
IMPLEMENT_LOCKING(CefBytesReader);
};
// Implementation of CefStreamWriter for byte buffers.
class CefBytesWriter : public CefStreamWriter
{
public:
CefBytesWriter(size_t grow);
class CefBytesWriter : public CefStreamWriter {
public:
explicit CefBytesWriter(size_t grow);
virtual ~CefBytesWriter();
virtual size_t Write(const void* ptr, size_t size, size_t n) OVERRIDE;
virtual int Seek(long offset, int whence) OVERRIDE;
virtual long Tell() OVERRIDE;
virtual int Seek(int64 offset, int whence) OVERRIDE;
virtual int64 Tell() OVERRIDE;
virtual int Flush() OVERRIDE;
void* GetData() { return data_; }
size_t GetDataSize() { return offset_; }
int64 GetDataSize() { return offset_; }
std::string GetDataString();
protected:
size_t Grow(size_t size);
protected:
size_t Grow(size_t size);
size_t grow_;
void* data_;
size_t datasize_;
size_t offset_;
int64 datasize_;
int64 offset_;
IMPLEMENT_REFCOUNTING(CefBytesWriter);
IMPLEMENT_LOCKING(CefBytesWriter);
};
// Implementation of CefStreamReader for handlers.
class CefHandlerReader : public CefStreamReader
{
public:
CefHandlerReader(CefRefPtr<CefReadHandler> handler) : handler_(handler) {}
class CefHandlerReader : public CefStreamReader {
public:
explicit CefHandlerReader(CefRefPtr<CefReadHandler> handler)
: handler_(handler) {}
virtual size_t Read(void* ptr, size_t size, size_t n) OVERRIDE
{
virtual size_t Read(void* ptr, size_t size, size_t n) OVERRIDE {
return handler_->Read(ptr, size, n);
}
virtual int Seek(long offset, int whence) OVERRIDE
{
virtual int Seek(int64 offset, int whence) OVERRIDE {
return handler_->Seek(offset, whence);
}
virtual long Tell() OVERRIDE
{
virtual int64 Tell() OVERRIDE {
return handler_->Tell();
}
virtual int Eof() OVERRIDE
{
virtual int Eof() OVERRIDE {
return handler_->Eof();
}
protected:
protected:
CefRefPtr<CefReadHandler> handler_;
IMPLEMENT_REFCOUNTING(CefHandlerReader);
};
// Implementation of CefStreamWriter for handlers.
class CefHandlerWriter : public CefStreamWriter
{
public:
CefHandlerWriter(CefRefPtr<CefWriteHandler> handler) : handler_(handler) {}
class CefHandlerWriter : public CefStreamWriter {
public:
explicit CefHandlerWriter(CefRefPtr<CefWriteHandler> handler)
: handler_(handler) {}
virtual size_t Write(const void* ptr, size_t size, size_t n) OVERRIDE
{
virtual size_t Write(const void* ptr, size_t size, size_t n) OVERRIDE {
return handler_->Write(ptr, size, n);
}
virtual int Seek(long offset, int whence) OVERRIDE
{
virtual int Seek(int64 offset, int whence) OVERRIDE {
return handler_->Seek(offset, whence);
}
virtual long Tell() OVERRIDE
{
virtual int64 Tell() OVERRIDE {
return handler_->Tell();
}
virtual int Flush() OVERRIDE
{
virtual int Flush() OVERRIDE {
return handler_->Flush();
}
protected:
protected:
CefRefPtr<CefWriteHandler> handler_;
IMPLEMENT_REFCOUNTING(CefHandlerWriter);
};
#endif // _STREAM_IMPL_H
#endif // CEF_LIBCEF_STREAM_IMPL_H_