Add parentheses around && within ||.
authorNico Weber <thakis@chromium.org>
Thu, 2 Jul 2015 21:40:08 +0000 (14:40 -0700)
committerNico Weber <thakis@chromium.org>
Thu, 2 Jul 2015 21:40:08 +0000 (14:40 -0700)
BUG=504699
R=raymes@chromium.org, thakis@chromium.org

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

core/src/fxge/win32/fx_win32_device.cpp
core/src/fxge/win32/fx_win32_gdipext.cpp

index f9da1cc..899adf5 100644 (file)
@@ -792,7 +792,7 @@ FX_BOOL CGdiDeviceDriver::DrawPath(const CFX_PathData* pPathData,
         return FALSE;
     }
     if (pPlatform->m_GdiplusExt.IsAvailable()) {
-        if (bDrawAlpha || ((m_DeviceClass != FXDC_PRINTER && !(fill_mode & FXFILL_FULLCOVER)) || pGraphState && pGraphState->m_DashCount)) {
+        if (bDrawAlpha || ((m_DeviceClass != FXDC_PRINTER && !(fill_mode & FXFILL_FULLCOVER)) || (pGraphState && pGraphState->m_DashCount))) {
             if ( !((NULL == pMatrix || _MatrixNoScaled(pMatrix)) &&
                     pGraphState && pGraphState->m_LineWidth == 1.f &&
                     (pPathData->GetPointCount() == 5 || pPathData->GetPointCount() == 4) &&
index 072f408..8fef914 100644 (file)
@@ -936,7 +936,7 @@ BOOL CGdiplusExt::DrawPath(HDC hDC, const CFX_PathData* pPathData,
         if (!bSmooth && (fill_mode & 3)) {
             bSmooth = TRUE;
         }
-        if (bSmooth || pGraphState && pGraphState->m_LineWidth > 2) {
+        if (bSmooth || (pGraphState && pGraphState->m_LineWidth > 2)) {
             CallFunc(GdipSetSmoothingMode)(pGraphics, SmoothingModeAntiAlias);
         }
     }