fxcrt convergence - master side

core/src/fxge/agg/src/fx_agg_driver.cpp

Index: core/src/fxge/agg/src/fx_agg_driver.cpp
diff --git a/core/src/fxge/agg/src/fx_agg_driver.cpp b/core/src/fxge/agg/src/fx_agg_driver.cpp
index fd3ea2509631575f76576c75af4d627f5851e5d1..d9783d174b6a598618820b301d02805c810f0179 100644
--- a/core/src/fxge/agg/src/fx_agg_driver.cpp
+++ b/core/src/fxge/agg/src/fx_agg_driver.cpp
@@ -318,7 +318,7 @@ FX_BOOL CFX_AggDeviceDriver::SetClip_PathFill(
     const CFX_AffineMatrix* pObject2Device,
     int fill_mode) {
   m_FillFlags = fill_mode;
-  if (m_pClipRgn == NULL) {
+  if (!m_pClipRgn) {
     m_pClipRgn = new CFX_ClipRgn(GetDeviceCaps(FXDC_PIXEL_WIDTH),
                                  GetDeviceCaps(FXDC_PIXEL_HEIGHT));
   }
@@ -350,7 +350,7 @@ FX_BOOL CFX_AggDeviceDriver::SetClip_PathStroke(
     const CFX_PathData* pPathData,
     const CFX_AffineMatrix* pObject2Device,
     const CFX_GraphStateData* pGraphState) {
-  if (m_pClipRgn == NULL) {
+  if (!m_pClipRgn) {
     m_pClipRgn = new CFX_ClipRgn(GetDeviceCaps(FXDC_PIXEL_WIDTH),
                                  GetDeviceCaps(FXDC_PIXEL_HEIGHT));
   }