Fix CGdiDeviceDriver::DrawLine().

core/fxge/win32/fx_win32_device.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 "core/fxge/include/fx_ge.h"
 
 #include <algorithm>
 #include <memory>
@@ skipping 761 matching lines @@
 void CGdiDeviceDriver::SaveState() {
   SaveDC(m_hDC);
 }
 
 void CGdiDeviceDriver::RestoreState(bool bKeepSaved) {
   RestoreDC(m_hDC, -1);
   if (bKeepSaved)
     SaveDC(m_hDC);
 }
 
-void* CGdiDeviceDriver::GetClipRgn() {
-  HRGN hClipRgn = CreateRectRgn(0, 0, 1, 1);
-  if (::GetClipRgn(m_hDC, hClipRgn) == 0) {
-    DeleteObject(hClipRgn);
-    hClipRgn = nullptr;
-  }
-  return (void*)hClipRgn;
-}
-
 FX_BOOL CGdiDeviceDriver::GDI_SetDIBits(CFX_DIBitmap* pBitmap1,
                                         const FX_RECT* pSrcRect,
                                         int left,
                                         int top,
                                         void* pIccTransform) {
   if (m_DeviceClass == FXDC_PRINTER) {
     std::unique_ptr<CFX_DIBitmap> pBitmap(pBitmap1->FlipImage(FALSE, TRUE));
     if (!pBitmap)
       return FALSE;
 
@@ skipping 138 matching lines @@
   SelectObject(m_hDC, hOld);
   DeleteObject(hPattern);
 
   return TRUE;
 }
 
 FX_BOOL CGdiDeviceDriver::GetClipBox(FX_RECT* pRect) {
   return ::GetClipBox(m_hDC, (RECT*)pRect);
 }
 
-FX_BOOL CGdiDeviceDriver::SetClipRgn(void* hRgn) {
-  ::SelectClipRgn(m_hDC, (HRGN)hRgn);
-  return TRUE;
-}
-
 void CGdiDeviceDriver::DrawLine(FX_FLOAT x1,
                                 FX_FLOAT y1,
                                 FX_FLOAT x2,
-                                FX_FLOAT y2) {
-  int flag1 = (x1 < 0) | ((x1 > m_Width) << 1) | ((y1 < 0) << 2) |
-              ((y1 > m_Height) << 3);
-  int flag2 = (x2 < 0) | ((x2 > m_Width) << 1) | ((y2 < 0) << 2) |
-              ((y2 > m_Height) << 3);
-  if (flag1 & flag2) {
+                                FX_FLOAT y2,
+                                const CFX_Matrix* pMatrix) {
+  bool bStartOutOfBounds = x1 < 0 || x1 > m_Width || y1 < 0 || y1 > m_Height;
+  bool bEndOutOfBounds = x2 < 0 || x2 > m_Width || y2 < 0 || y2 > m_Height;
+  if (bStartOutOfBounds & bEndOutOfBounds)
     return;
-  }
-  if (flag1 || flag2) {
-    FX_FLOAT x[2], y[2];
+
+  if (bStartOutOfBounds || bEndOutOfBounds) {
+    FX_FLOAT x[2];
+    FX_FLOAT y[2];
     int np;
 #ifdef _SKIA_SUPPORT_
     // TODO(caryclark) temporary replacement of antigrain in line function
     // to permit removing antigrain altogether
     rect_base rect = {0.0f, 0.0f, (FX_FLOAT)(m_Width), (FX_FLOAT)(m_Height)};
     np = clip_liang_barsky(x1, y1, x2, y2, rect, x, y);
 #else
     agg::rect_base<FX_FLOAT> rect(0.0f, 0.0f, (FX_FLOAT)(m_Width),
                                   (FX_FLOAT)(m_Height));
     np = agg::clip_liang_barsky<FX_FLOAT>(x1, y1, x2, y2, rect, x, y);
 #endif
-    if (np == 0) {
+    if (np == 0)
       return;
-    }
+
     if (np == 1) {
       x2 = x[0];
       y2 = y[0];
     } else {
+      ASSERT(np == 2);
       x1 = x[0];
       y1 = y[0];
-      x2 = x[np - 1];
-      y2 = y[np - 1];
+      x2 = x[1];
+      y2 = y[1];
     }
   }
+  if (pMatrix) {
+    pMatrix->Transform(x1, y1);
+    pMatrix->Transform(x2, y2);
+  }
   MoveToEx(m_hDC, FXSYS_round(x1), FXSYS_round(y1), nullptr);
   LineTo(m_hDC, FXSYS_round(x2), FXSYS_round(y2));
 }
 
 FX_BOOL CGdiDeviceDriver::DrawPath(const CFX_PathData* pPathData,
                                    const CFX_Matrix* pMatrix,
                                    const CFX_GraphStateData* pGraphState,
                                    uint32_t fill_color,
                                    uint32_t stroke_color,
                                    int fill_mode,
@@ skipping 59 matching lines @@
     hPen = CreatePen(pGraphState, pMatrix, stroke_color);
     hPen = (HPEN)SelectObject(m_hDC, hPen);
   }
   if (fill_mode && fill_alpha) {
     SetPolyFillMode(m_hDC, fill_mode);
     hBrush = CreateBrush(fill_color);
     hBrush = (HBRUSH)SelectObject(m_hDC, hBrush);
   }
   if (pPathData->GetPointCount() == 2 && pGraphState &&
       pGraphState->m_DashCount) {
-    FX_FLOAT x1 = pPathData->GetPointX(0), y1 = pPathData->GetPointY(0);
-    if (pMatrix) {
-      pMatrix->Transform(x1, y1);
-    }
-    FX_FLOAT x2 = pPathData->GetPointX(1), y2 = pPathData->GetPointY(1);
-    if (pMatrix) {
-      pMatrix->Transform(x2, y2);
-    }
-    DrawLine(x1, y1, x2, y2);
+    FX_FLOAT x1 = pPathData->GetPointX(0);
+    FX_FLOAT y1 = pPathData->GetPointY(0);
+    FX_FLOAT x2 = pPathData->GetPointX(1);
+    FX_FLOAT y2 = pPathData->GetPointY(1);
+    DrawLine(x1, y1, x2, y2, pMatrix);
   } else {
     SetPathToDC(m_hDC, pPathData, pMatrix);
     if (pGraphState && stroke_alpha) {
       if (fill_mode && fill_alpha) {
         if (old_fill_mode & FX_FILL_TEXT_MODE) {
           StrokeAndFillPath(m_hDC);
         } else {
           FillPath(m_hDC);
           SetPathToDC(m_hDC, pPathData, pMatrix);
           StrokePath(m_hDC);
@@ skipping 92 matching lines @@
   }
   HPEN hPen = CreatePen(PS_SOLID, 1, rgb);
   hPen = (HPEN)SelectObject(m_hDC, hPen);
   MoveToEx(m_hDC, FXSYS_round(x1), FXSYS_round(y1), nullptr);
   LineTo(m_hDC, FXSYS_round(x2), FXSYS_round(y2));
   hPen = (HPEN)SelectObject(m_hDC, hPen);
   DeleteObject(hPen);
   return TRUE;
 }
 
-FX_BOOL CGdiDeviceDriver::DeleteDeviceRgn(void* pRgn) {
-  DeleteObject((HGDIOBJ)pRgn);
-  return TRUE;
-}
-
 CGdiDisplayDriver::CGdiDisplayDriver(HDC hDC)
     : CGdiDeviceDriver(hDC, FXDC_DISPLAY) {
   CWin32Platform* pPlatform =
       (CWin32Platform*)CFX_GEModule::Get()->GetPlatformData();
   if (pPlatform->m_GdiplusExt.IsAvailable()) {
     m_RenderCaps |= FXRC_ALPHA_PATH | FXRC_ALPHA_IMAGE;
   }
 }
 
 FX_BOOL CGdiDisplayDriver::GetDIBits(CFX_DIBitmap* pBitmap,
@@ skipping 254 matching lines @@
   if (m_hDC) {
     SelectObject(m_hDC, m_hOldBitmap);
     DeleteDC(m_hDC);
   }
   if (m_hBitmap)
     DeleteObject(m_hBitmap);
   delete GetBitmap();
 }
 
 #endif  // _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_