Commit 6e0a5ed9 authored by Sam McNally's avatar Sam McNally Committed by Commit Bot

Handle null |collection_| in DWriteFontProxyImpl::GetFamilyCount again.

Bug: 804793
Change-Id: I5db57099fd3a0d3e348dc97a95e30af21e79d5b2
Reviewed-on: https://chromium-review.googlesource.com/892543Reviewed-by: default avatarAvi Drissman <avi@chromium.org>
Commit-Queue: Sam McNally <sammc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#533572}
parent 196e6562
...@@ -200,7 +200,6 @@ void DWriteFontProxyImpl::FindFamily(const base::string16& family_name, ...@@ -200,7 +200,6 @@ void DWriteFontProxyImpl::FindFamily(const base::string16& family_name,
FindFamilyCallback callback) { FindFamilyCallback callback) {
InitializeDirectWrite(); InitializeDirectWrite();
TRACE_EVENT0("dwrite", "FontProxyHost::OnFindFamily"); TRACE_EVENT0("dwrite", "FontProxyHost::OnFindFamily");
DCHECK(collection_);
UINT32 family_index = UINT32_MAX; UINT32 family_index = UINT32_MAX;
if (collection_) { if (collection_) {
BOOL exists = FALSE; BOOL exists = FALSE;
...@@ -218,8 +217,7 @@ void DWriteFontProxyImpl::FindFamily(const base::string16& family_name, ...@@ -218,8 +217,7 @@ void DWriteFontProxyImpl::FindFamily(const base::string16& family_name,
void DWriteFontProxyImpl::GetFamilyCount(GetFamilyCountCallback callback) { void DWriteFontProxyImpl::GetFamilyCount(GetFamilyCountCallback callback) {
InitializeDirectWrite(); InitializeDirectWrite();
TRACE_EVENT0("dwrite", "FontProxyHost::OnGetFamilyCount"); TRACE_EVENT0("dwrite", "FontProxyHost::OnGetFamilyCount");
DCHECK(collection_); std::move(callback).Run(collection_ ? collection_->GetFontFamilyCount() : 0);
std::move(callback).Run(collection_->GetFontFamilyCount());
} }
void DWriteFontProxyImpl::GetFamilyNames(UINT32 family_index, void DWriteFontProxyImpl::GetFamilyNames(UINT32 family_index,
...@@ -228,7 +226,6 @@ void DWriteFontProxyImpl::GetFamilyNames(UINT32 family_index, ...@@ -228,7 +226,6 @@ void DWriteFontProxyImpl::GetFamilyNames(UINT32 family_index,
TRACE_EVENT0("dwrite", "FontProxyHost::OnGetFamilyNames"); TRACE_EVENT0("dwrite", "FontProxyHost::OnGetFamilyNames");
callback = mojo::WrapCallbackWithDefaultInvokeIfNotRun( callback = mojo::WrapCallbackWithDefaultInvokeIfNotRun(
std::move(callback), std::vector<mojom::DWriteStringPairPtr>()); std::move(callback), std::vector<mojom::DWriteStringPairPtr>());
DCHECK(collection_);
if (!collection_) if (!collection_)
return; return;
...@@ -291,7 +288,6 @@ void DWriteFontProxyImpl::GetFontFiles(uint32_t family_index, ...@@ -291,7 +288,6 @@ void DWriteFontProxyImpl::GetFontFiles(uint32_t family_index,
callback = mojo::WrapCallbackWithDefaultInvokeIfNotRun( callback = mojo::WrapCallbackWithDefaultInvokeIfNotRun(
std::move(callback), std::vector<base::FilePath>(), std::move(callback), std::vector<base::FilePath>(),
std::vector<base::File>()); std::vector<base::File>());
DCHECK(collection_);
if (!collection_) if (!collection_)
return; return;
......
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