Merge to XFA - else after returns.

core/src/fxge/win32/fx_win32_dwrite.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../../include/fxge/fx_ge.h"
 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
 #include "../../../include/fxge/fx_ge_win32.h"
 #include "dwrite_int.h"
@@ skipping 268 matching lines @@
     refCount_ = 0;
     resourcePtr_ = fontFileReferenceKey;
     resourceSize_ = fontFileReferenceKeySize;
 }
 HRESULT STDMETHODCALLTYPE CDwFontFileStream::QueryInterface(REFIID iid, void** ppvObject)
 {
     if (iid == IID_IUnknown || iid == __uuidof(IDWriteFontFileStream)) {
         *ppvObject = this;
         AddRef();
         return S_OK;
-    } else {
-        *ppvObject = NULL;
-        return E_NOINTERFACE;
     }
+    *ppvObject = NULL;
+    return E_NOINTERFACE;
 }
 ULONG STDMETHODCALLTYPE CDwFontFileStream::AddRef()
 {
     return InterlockedIncrement((long*)(&refCount_));
 }
 ULONG STDMETHODCALLTYPE CDwFontFileStream::Release()
 {
     ULONG newCount = InterlockedDecrement((long*)(&refCount_));
     if (newCount == 0) {
         delete this;
     }
     return newCount;
 }
 HRESULT STDMETHODCALLTYPE CDwFontFileStream::ReadFileFragment(
     void const** fragmentStart,
     UINT64 fileOffset,
     UINT64 fragmentSize,
     OUT void** fragmentContext
 )
 {
-    if (fileOffset <= resourceSize_ &&
-            fragmentSize <= resourceSize_ - fileOffset) {
+    if (fileOffset <= resourceSize_ && fragmentSize <= resourceSize_ - fileOffset) {
         *fragmentStart = static_cast<uint8_t const*>(resourcePtr_) + static_cast<size_t>(fileOffset);
         *fragmentContext = NULL;
         return S_OK;
-    } else {
-        *fragmentStart = NULL;
-        *fragmentContext = NULL;
-        return E_FAIL;
     }
+    *fragmentStart = NULL;
+    *fragmentContext = NULL;
+    return E_FAIL;
 }
 void STDMETHODCALLTYPE CDwFontFileStream::ReleaseFileFragment(void* fragmentContext)
 {
 }
 HRESULT STDMETHODCALLTYPE CDwFontFileStream::GetFileSize(OUT UINT64* fileSize)
 {
     *fileSize = resourceSize_;
     return S_OK;
 }
 HRESULT STDMETHODCALLTYPE CDwFontFileStream::GetLastWriteTime(OUT UINT64* lastWriteTime)
 {
     *lastWriteTime = 0;
     return E_NOTIMPL;
 }
 IDWriteFontFileLoader* CDwFontFileLoader::instance_ = NULL;
 CDwFontFileLoader::CDwFontFileLoader() :
     refCount_(0)
 {
 }
 HRESULT STDMETHODCALLTYPE CDwFontFileLoader::QueryInterface(REFIID iid, void** ppvObject)
 {
     if (iid == IID_IUnknown || iid == __uuidof(IDWriteFontFileLoader)) {
         *ppvObject = this;
         AddRef();
         return S_OK;
-    } else {
-        *ppvObject = NULL;
-        return E_NOINTERFACE;
     }
+    *ppvObject = NULL;
+    return E_NOINTERFACE;
 }
 ULONG STDMETHODCALLTYPE CDwFontFileLoader::AddRef()
 {
     return InterlockedIncrement((long*)(&refCount_));
 }
 ULONG STDMETHODCALLTYPE CDwFontFileLoader::Release()
 {
     ULONG newCount = InterlockedDecrement((long*)(&refCount_));
     if (newCount == 0) {
         instance_ = NULL;
@@ skipping 107 matching lines @@
         text_bbox.Height(),
         &dib,
         text_bbox.left,
         text_bbox.top,
         FXDIB_BLEND_NORMAL,
         pClipRgn
     );
     return hr;
 }
 #endif