webkit/fileapi/file_system_operation.cc - Issue 8390046: Add a debug check to verify that FileSystemCallbackDispatcher is not NULL in FileSystemOperation.

Unified Diff: webkit/fileapi/file_system_operation.cc

Issue 8390046: Add a debug check to verify that FileSystemCallbackDispatcher is not NULL in FileSystemOperation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: webkit/fileapi/file_system_operation.cc

===================================================================

--- webkit/fileapi/file_system_operation.cc (revision 107331)

+++ webkit/fileapi/file_system_operation.cc (working copy)

@@ -80,6 +80,7 @@

void FileSystemOperation::OpenFileSystem(

const GURL& origin_url, fileapi::FileSystemType type, bool create) {

#ifndef NDEBUG

+ DCHECK(dispatcher_ != NULL);

kinuko 2011/10/27 02:10:36 nit: DCHECK(dispatcher_.get()) might be more commo

DCHECK(kOperationNone == pending_operation_);

pending_operation_ = static_cast<FileSystemOperation::OperationType>(

kOperationOpenFileSystem);

@@ -103,6 +104,7 @@

void FileSystemOperation::CreateFile(const GURL& path,

bool exclusive) {

#ifndef NDEBUG

+ DCHECK(dispatcher_ != NULL);

DCHECK(kOperationNone == pending_operation_);

pending_operation_ = kOperationCreateFile;

#endif

@@ -141,6 +143,7 @@

bool exclusive,

bool recursive) {

#ifndef NDEBUG

+ DCHECK(dispatcher_ != NULL);

DCHECK(kOperationNone == pending_operation_);

pending_operation_ = kOperationCreateDirectory;

#endif

@@ -176,6 +179,7 @@

void FileSystemOperation::Copy(const GURL& src_path,

const GURL& dest_path) {

#ifndef NDEBUG

+ DCHECK(dispatcher_ != NULL);

DCHECK(kOperationNone == pending_operation_);

pending_operation_ = kOperationCopy;

#endif

@@ -210,6 +214,7 @@

void FileSystemOperation::Move(const GURL& src_path,

const GURL& dest_path) {

#ifndef NDEBUG

+ DCHECK(dispatcher_ != NULL);

DCHECK(kOperationNone == pending_operation_);

pending_operation_ = kOperationMove;

#endif

@@ -243,6 +248,7 @@

void FileSystemOperation::DirectoryExists(const GURL& path) {

#ifndef NDEBUG

+ DCHECK(dispatcher_ != NULL);

DCHECK(kOperationNone == pending_operation_);

pending_operation_ = kOperationDirectoryExists;

#endif

@@ -259,6 +265,7 @@

void FileSystemOperation::FileExists(const GURL& path) {

#ifndef NDEBUG

+ DCHECK(dispatcher_ != NULL);

DCHECK(kOperationNone == pending_operation_);

pending_operation_ = kOperationFileExists;

#endif

@@ -275,6 +282,7 @@

void FileSystemOperation::GetMetadata(const GURL& path) {

#ifndef NDEBUG

+ DCHECK(dispatcher_ != NULL);

DCHECK(kOperationNone == pending_operation_);

pending_operation_ = kOperationGetMetadata;

#endif

@@ -291,6 +299,7 @@

void FileSystemOperation::ReadDirectory(const GURL& path) {

#ifndef NDEBUG

+ DCHECK(dispatcher_ != NULL);

DCHECK(kOperationNone == pending_operation_);

pending_operation_ = kOperationReadDirectory;

#endif

@@ -307,6 +316,7 @@

void FileSystemOperation::Remove(const GURL& path, bool recursive) {

#ifndef NDEBUG

+ DCHECK(dispatcher_ != NULL);

DCHECK(kOperationNone == pending_operation_);

pending_operation_ = kOperationRemove;

#endif

@@ -327,6 +337,7 @@

const GURL& blob_url,

int64 offset) {

#ifndef NDEBUG

+ DCHECK(dispatcher_ != NULL);

DCHECK(kOperationNone == pending_operation_);

pending_operation_ = kOperationWrite;

#endif

@@ -367,6 +378,7 @@

void FileSystemOperation::Truncate(const GURL& path, int64 length) {

#ifndef NDEBUG

+ DCHECK(dispatcher_ != NULL);

DCHECK(kOperationNone == pending_operation_);

pending_operation_ = kOperationTruncate;

#endif

@@ -401,6 +413,7 @@

const base::Time& last_access_time,

const base::Time& last_modified_time) {

#ifndef NDEBUG

+ DCHECK(dispatcher_ != NULL);

DCHECK(kOperationNone == pending_operation_);

pending_operation_ = kOperationTouchFile;

#endif

@@ -420,6 +433,7 @@

int file_flags,

base::ProcessHandle peer_handle) {

#ifndef NDEBUG

+ DCHECK(dispatcher_ != NULL);

DCHECK(kOperationNone == pending_operation_);

pending_operation_ = kOperationOpenFile;

#endif

« no previous file with comments | « no previous file | no next file » | no next file with comments »