Merge to XFA: Get rid of most instance of 'foo != NULL'

fpdfsdk/src/pdfwindow/PWL_ScrollBar.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 "fpdfsdk/include/pdfwindow/PDFWindow.h"
 #include "fpdfsdk/include/pdfwindow/PWL_ScrollBar.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
 
 #define IsFloatZero(f) ((f) < 0.0001 && (f) > -0.0001)
 #define IsFloatBigger(fa, fb) ((fa) > (fb) && !IsFloatZero((fa) - (fb)))
 #define IsFloatSmaller(fa, fb) ((fa) < (fb) && !IsFloatZero((fa) - (fb)))
 #define IsFloatEqual(fa, fb) IsFloatZero((fa) - (fb))
 
-/* ------------------------------- PWL_FLOATRANGE
- * ------------------------------- */
-
 PWL_FLOATRANGE::PWL_FLOATRANGE() {
   Default();
 }
 
 PWL_FLOATRANGE::PWL_FLOATRANGE(FX_FLOAT min, FX_FLOAT max) {
   Set(min, max);
 }
 
 void PWL_FLOATRANGE::Default() {
   fMin = 0;
@@ skipping 12 matching lines @@
 
 FX_BOOL PWL_FLOATRANGE::In(FX_FLOAT x) const {
   return (IsFloatBigger(x, fMin) || IsFloatEqual(x, fMin)) &&
          (IsFloatSmaller(x, fMax) || IsFloatEqual(x, fMax));
 }
 
 FX_FLOAT PWL_FLOATRANGE::GetWidth() const {
   return fMax - fMin;
 }
 
-/* ------------------------------- PWL_SCROLL_PRIVATEDATA
- * ------------------------------- */
-
 PWL_SCROLL_PRIVATEDATA::PWL_SCROLL_PRIVATEDATA() {
   Default();
 }
 
 void PWL_SCROLL_PRIVATEDATA::Default() {
   ScrollRange.Default();
   fScrollPos = ScrollRange.fMin;
   fClientWidth = 0;
   fBigStep = 10;
   fSmallStep = 1;
@@ skipping 41 matching lines @@
 void PWL_SCROLL_PRIVATEDATA::AddBig() {
   if (!SetPos(fScrollPos + fBigStep))
     SetPos(ScrollRange.fMax);
 }
 
 void PWL_SCROLL_PRIVATEDATA::SubBig() {
   if (!SetPos(fScrollPos - fBigStep))
     SetPos(ScrollRange.fMin);
 }
 
-/* ------------------------------- CPWL_SBButton -------------------------------
- */
-
 CPWL_SBButton::CPWL_SBButton(PWL_SCROLLBAR_TYPE eScrollBarType,
                              PWL_SBBUTTON_TYPE eButtonType) {
   m_eScrollBarType = eScrollBarType;
   m_eSBButtonType = eButtonType;
 
   m_bMouseDown = FALSE;
 }
 
 CPWL_SBButton::~CPWL_SBButton() {}
 
@@ skipping 269 matching lines @@
               CPWL_Utils::DrawFillArea(
                   pDevice, pUser2Device, pts, 7,
                   ArgbEncode(nTransparancy, 255, 255, 255));
             else
               CPWL_Utils::DrawFillArea(pDevice, pUser2Device, pts, 7,
                                        CPWL_Utils::PWLColorToFXColor(
                                            PWL_DEFAULT_HEAVYGRAYCOLOR, 255));
           }
         } break;
         case PSBT_POS: {
-          // CPWL_Wnd::DrawThisAppearance(pDevice,pUser2Device);
-
           // draw border
           CPDF_Rect rcDraw = rectWnd;
           CPWL_Utils::DrawStrokeRect(pDevice, pUser2Device, rcDraw,
                                      ArgbEncode(nTransparancy, 100, 100, 100),
                                      0.0f);
 
           // draw inner border
           rcDraw = CPWL_Utils::DeflateRect(rectWnd, 0.5f);
           CPWL_Utils::DrawStrokeRect(pDevice, pUser2Device, rcDraw,
                                      ArgbEncode(nTransparancy, 255, 255, 255),
@@ skipping 105 matching lines @@
             ptRight.y += 2.0f;
 
             CPWL_Utils::DrawStrokeLine(pDevice, pUser2Device, ptLeft, ptRight,
                                        crStroke, 1.0f);
 
             ptLeft.y += 2.0f;
             ptRight.y += 2.0f;
 
             CPWL_Utils::DrawStrokeLine(pDevice, pUser2Device, ptLeft, ptRight,
                                        crStroke, 1.0f);
-
-            /*
-            ptLeft.y += 1.5f;
-            ptRight.y += 1.5f;
-
-            CPWL_Utils::DrawStrokeLine(pDevice, pUser2Device, ptLeft, ptRight,
-                    ArgbEncode(nTransparancy,150,150,150),1.0f);
-                    */
           }
         } break;
         default:
           break;
       }
       break;
     default:
       break;
   }
 }
@@ skipping 20 matching lines @@
   ReleaseCapture();
 
   return TRUE;
 }
 
 FX_BOOL CPWL_SBButton::OnMouseMove(const CPDF_Point& point, FX_DWORD nFlag) {
   CPWL_Wnd::OnMouseMove(point, nFlag);
 
   if (CPWL_Wnd* pParent = GetParentWindow()) {
     pParent->OnNotify(this, PNM_MOUSEMOVE, 0, (intptr_t)&point);
-
-    /*
-    if (m_bMouseDown && (m_eSBButtonType == PSBT_MIN || m_eSBButtonType ==
-    PSBT_MAX))
-    {
-            if
-    (!pParent->OnNotify(this,PNM_LBUTTONDOWN,nFlags,(intptr_t)&point))
-                    return FALSE;
-    }
-    */
   }
 
   return TRUE;
 }
 
-/* ------------------------------- CPWL_ScrollBar
- * ---------------------------------- */
-
 CPWL_ScrollBar::CPWL_ScrollBar(PWL_SCROLLBAR_TYPE sbType)
     : m_sbType(sbType),
       m_pMinButton(NULL),
       m_pMaxButton(NULL),
       m_pPosButton(NULL),
       m_bMouseDown(FALSE),
       m_bMinOrMax(FALSE),
       m_bNotifyForever(TRUE) {}
 
 CPWL_ScrollBar::~CPWL_ScrollBar() {}
@@ skipping 305 matching lines @@
   if (!IsFloatEqual(m_sData.fScrollPos, fOldPos))
     MovePosButton(TRUE);
 }
 
 void CPWL_ScrollBar::SetScrollStep(FX_FLOAT fBigStep, FX_FLOAT fSmallStep) {
   m_sData.SetBigStep(fBigStep);
   m_sData.SetSmallStep(fSmallStep);
 }
 
 void CPWL_ScrollBar::MovePosButton(FX_BOOL bRefresh) {
-  ASSERT(m_pPosButton != NULL);
-  ASSERT(m_pMinButton != NULL);
-  ASSERT(m_pMaxButton != NULL);
+  ASSERT(m_pMinButton);
+  ASSERT(m_pMaxButton);
 
   if (m_pPosButton->IsVisible()) {
     CPDF_Rect rcClient;
     CPDF_Rect rcPosArea, rcPosButton;
 
     rcClient = GetClientRect();
     rcPosArea = GetScrollArea();
 
     FX_FLOAT fLeft, fRight, fTop, fBottom;
 
@@ skipping 261 matching lines @@
   if (m_bMinOrMax)
     m_sData.SubSmall();
   else
     m_sData.AddSmall();
 
   if (FXSYS_memcmp(&m_sData, &sTemp, sizeof(PWL_SCROLL_PRIVATEDATA)) != 0) {
     MovePosButton(TRUE);
     NotifyScrollWindow();
   }
 }