XFA: merge patch from issue 726033002
authorTom Sepez <tsepez@chromium.org>
Fri, 14 Nov 2014 19:56:27 +0000 (11:56 -0800)
committerTom Sepez <tsepez@chromium.org>
Fri, 14 Nov 2014 19:56:27 +0000 (11:56 -0800)
Fixes android build error under stricter compilation modes.

TBR=bo_xu@foxitsoftware.com

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

core/src/fxge/android/fpf_skiafontmgr.cpp

index 4380732..1525293 100644 (file)
@@ -77,7 +77,7 @@ FX_DWORD FPF_SkiaGetSubstFont(FX_DWORD dwHash)
             return pItem->dwSubSt;
         }
     }
-    return NULL;
+    return 0;
 }
 static const FPF_SKIAFONTMAP g_SkiaSansFontMap[] = {
     {0x58c5083,                0xd5b8d10f},