Commit 54be1287 authored by vitalybuka's avatar vitalybuka Committed by Commit bot

Fixed clang/win build issues.

BUG=416747

Review URL: https://codereview.chromium.org/592343002

Cr-Commit-Position: refs/heads/master@{#296229}
parent 3133f882
...@@ -35,14 +35,14 @@ class RefCountedTempDir ...@@ -35,14 +35,14 @@ class RefCountedTempDir
: public base::RefCountedThreadSafe<RefCountedTempDir, : public base::RefCountedThreadSafe<RefCountedTempDir,
BrowserThread::DeleteOnFileThread> { BrowserThread::DeleteOnFileThread> {
public: public:
RefCountedTempDir() { temp_dir_.CreateUniqueTempDir(); } RefCountedTempDir() { ignore_result(temp_dir_.CreateUniqueTempDir()); }
bool IsValid() const { return temp_dir_.IsValid(); } bool IsValid() const { return temp_dir_.IsValid(); }
const base::FilePath& GetPath() const { return temp_dir_.path(); } const base::FilePath& GetPath() const { return temp_dir_.path(); }
private: private:
friend struct BrowserThread::DeleteOnThread<BrowserThread::FILE>; friend struct BrowserThread::DeleteOnThread<BrowserThread::FILE>;
friend class base::DeleteHelper<RefCountedTempDir>; friend class base::DeleteHelper<RefCountedTempDir>;
~RefCountedTempDir() {}; ~RefCountedTempDir() {}
base::ScopedTempDir temp_dir_; base::ScopedTempDir temp_dir_;
DISALLOW_COPY_AND_ASSIGN(RefCountedTempDir); DISALLOW_COPY_AND_ASSIGN(RefCountedTempDir);
...@@ -199,7 +199,7 @@ class PdfToEmfConverterImpl : public PdfToEmfConverter { ...@@ -199,7 +199,7 @@ class PdfToEmfConverterImpl : public PdfToEmfConverter {
}; };
ScopedTempFile CreateTempFile(scoped_refptr<RefCountedTempDir>* temp_dir) { ScopedTempFile CreateTempFile(scoped_refptr<RefCountedTempDir>* temp_dir) {
if (!(*temp_dir)) if (!temp_dir->get())
*temp_dir = new RefCountedTempDir(); *temp_dir = new RefCountedTempDir();
ScopedTempFile file; ScopedTempFile file;
if (!(*temp_dir)->IsValid()) if (!(*temp_dir)->IsValid())
...@@ -309,7 +309,6 @@ void PdfToEmfUtilityProcessHostClient::OnProcessStarted() { ...@@ -309,7 +309,6 @@ void PdfToEmfUtilityProcessHostClient::OnProcessStarted() {
if (!utility_process_host_) if (!utility_process_host_)
return OnFailed(); return OnFailed();
base::ProcessHandle process = utility_process_host_->GetData().handle;
scoped_refptr<base::RefCountedMemory> data = data_; scoped_refptr<base::RefCountedMemory> data = data_;
data_ = NULL; data_ = NULL;
BrowserThread::PostTaskAndReplyWithResult( BrowserThread::PostTaskAndReplyWithResult(
...@@ -391,7 +390,7 @@ void PdfToEmfUtilityProcessHostClient::OnPageDone(bool success, ...@@ -391,7 +390,7 @@ void PdfToEmfUtilityProcessHostClient::OnPageDone(bool success,
DCHECK_CURRENTLY_ON(BrowserThread::IO); DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (get_page_callbacks_.empty()) if (get_page_callbacks_.empty())
return OnFailed(); return OnFailed();
scoped_ptr<LazyEmf> emf; scoped_ptr<MetafilePlayer> emf;
GetPageCallbackData& data = get_page_callbacks_.front(); GetPageCallbackData& data = get_page_callbacks_.front();
if (success) if (success)
emf.reset(new LazyEmf(temp_dir_, data.emf().Pass())); emf.reset(new LazyEmf(temp_dir_, data.emf().Pass()));
...@@ -459,7 +458,7 @@ PdfToEmfConverterImpl::PdfToEmfConverterImpl() : weak_ptr_factory_(this) { ...@@ -459,7 +458,7 @@ PdfToEmfConverterImpl::PdfToEmfConverterImpl() : weak_ptr_factory_(this) {
} }
PdfToEmfConverterImpl::~PdfToEmfConverterImpl() { PdfToEmfConverterImpl::~PdfToEmfConverterImpl() {
if (utility_client_) if (utility_client_.get())
utility_client_->Stop(); utility_client_->Stop();
} }
...@@ -467,7 +466,7 @@ void PdfToEmfConverterImpl::Start( ...@@ -467,7 +466,7 @@ void PdfToEmfConverterImpl::Start(
const scoped_refptr<base::RefCountedMemory>& data, const scoped_refptr<base::RefCountedMemory>& data,
const PdfRenderSettings& conversion_settings, const PdfRenderSettings& conversion_settings,
const StartCallback& start_callback) { const StartCallback& start_callback) {
DCHECK(!utility_client_); DCHECK(!utility_client_.get());
utility_client_ = new PdfToEmfUtilityProcessHostClient( utility_client_ = new PdfToEmfUtilityProcessHostClient(
weak_ptr_factory_.GetWeakPtr(), conversion_settings); weak_ptr_factory_.GetWeakPtr(), conversion_settings);
utility_client_->Start(data, start_callback); utility_client_->Start(data, start_callback);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment