commit cc2323f0d0d626edac4a426097eb38b53ba54848
author Nico Weber <thakis@chromium.org> Thu Jul 02 14:40:08 2015 -0700
committer Nico Weber <thakis@chromium.org> Thu Jul 02 14:40:08 2015 -0700
tree 1f409ac45b50bf5685ea7d79ae76530f9cedf461
parent 0b0f2130e403aaa558a04ffa664e6f4f0f38d1b1

Add parentheses around && within ||.

BUG=504699
R=raymes@chromium.org, thakis@chromium.org

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

core/src/fxge/win32/fx_win32_device.cpp

diff --git a/core/src/fxge/win32/fx_win32_device.cpp b/core/src/fxge/win32/fx_win32_device.cpp
index f9da1cc..899adf5 100644
--- a/core/src/fxge/win32/fx_win32_device.cpp
+++ b/core/src/fxge/win32/fx_win32_device.cpp
@@ -792,7 +792,7 @@
         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) &&

core/src/fxge/win32/fx_win32_gdipext.cpp

diff --git a/core/src/fxge/win32/fx_win32_gdipext.cpp b/core/src/fxge/win32/fx_win32_gdipext.cpp
index 072f408..8fef914 100644
--- a/core/src/fxge/win32/fx_win32_gdipext.cpp
+++ b/core/src/fxge/win32/fx_win32_gdipext.cpp
@@ -936,7 +936,7 @@
         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);
         }
     }