Fixing whitespace lint errors.

core/src/fxge/skia/fx_skia_blitter_new.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.
 
 #include "core/include/fxge/fx_ge.h"
 
-//#define _SKIA_SUPPORT_
+// #define _SKIA_SUPPORT_

[Tom Sepez, 2016/02/23 17:44:19]

Nit: remove this line.

[dsinclair, 2016/02/23 19:14:01]

Done.

 #if defined(_SKIA_SUPPORT_)
 #include "SkBlitter.h"
 #include "core/include/fxcodec/fx_codec.h"
 #include "core/src/fxge/skia/fx_skia_blitter_new.h"
 
 // We use our own renderer here to make it simple
 void CFX_SkiaRenderer::blitAntiH(int x,
                                  int y,
                                  const SkAlpha antialias[],
                                  const int16_t runs[]) {
@@ skipping 365 matching lines @@
   int col_start = span_left < clip_left ? clip_left - span_left : 0;
   int col_end =
       (span_left + span_len) < clip_right ? span_len : (clip_right - span_left);
   if (col_end < col_start)
     return;  // do nothing.
   dest_scan += col_start << 2;
   if (m_Alpha == 255 && cover_scan == 255) {
     FXSYS_memset(dest_scan, m_Color, (col_end - col_start) << 2);
     return;
   }
-  int src_alpha;
-#if 0
-        if (m_bFullCover) {
-            if (m_Alpha == 255) {
-                FXSYS_memset(dest_scan, m_Color, (col_end - col_start)<<2);
-                return;
-            }
-        }
-        else
-#endif
-  src_alpha = m_Alpha * cover_scan / 255;
+  int src_alpha = m_Alpha * cover_scan / 255;
   for (int col = col_start; col < col_end; col++) {
     // Dest format: Argb
     // calculate destination alpha (it's union of source and dest alpha)
     if (dest_scan[3] == 0) {
       dest_scan[3] = src_alpha;
       *dest_scan++ = m_Blue;
       *dest_scan++ = m_Green;
       *dest_scan = m_Red;
       dest_scan += 2;
       continue;
@@ skipping 270 matching lines @@
   int col_start = span_left < clip_left ? clip_left - span_left : 0;
   int col_end =
       (span_left + span_len) < clip_right ? span_len : (clip_right - span_left);
   if (col_end < col_start)
     return;  // do nothing.
   dest_scan += (col_start << 2);
   if (m_Alpha == 255 && cover_scan == 255) {
     FXSYS_memset(dest_scan, m_Color, (col_end - col_start) << 2);
     return;
   }
-  int src_alpha;
-#if 0
-        if (m_bFullCover)
-            src_alpha = m_Alpha;
-        else
-#endif
-  src_alpha = m_Alpha * cover_scan / 255;
+  int src_alpha = m_Alpha * cover_scan / 255;
   for (int col = col_start; col < col_end; col++) {
     // Dest format:  Rgb32
     *dest_scan = FXDIB_ALPHA_MERGE(*dest_scan, m_Blue, src_alpha);
     dest_scan++;
     *dest_scan = FXDIB_ALPHA_MERGE(*dest_scan, m_Green, src_alpha);
     dest_scan++;
     *dest_scan = FXDIB_ALPHA_MERGE(*dest_scan, m_Red, src_alpha);
     dest_scan += 2;
   }
 }
@@ skipping 17 matching lines @@
   if (col_end < col_start)
     return;  // do nothing.
   dest_scan += col_start << 2;
   ori_scan += col_start << 2;
   if (m_Alpha == 255 && cover_scan == 255) {
     FXSYS_memset(dest_scan, m_Color, (col_end - col_start) << 2);
     return;
   }
   int src_alpha = m_Alpha;
   for (int col = col_start; col < col_end; col++) {
-#if 0
-            if (m_bFullCover) {
-                *dest_scan++ = FXDIB_ALPHA_MERGE(*ori_scan++, m_Blue, src_alpha);
-                *dest_scan++ = FXDIB_ALPHA_MERGE(*ori_scan++, m_Green, src_alpha);
-                *dest_scan = FXDIB_ALPHA_MERGE(*ori_scan, m_Red, src_alpha);
-                dest_scan += 2; ori_scan += 2;
-                continue;
-            }
-#endif
     int b = FXDIB_ALPHA_MERGE(*ori_scan++, m_Blue, src_alpha);
     int g = FXDIB_ALPHA_MERGE(*ori_scan++, m_Green, src_alpha);
     int r = FXDIB_ALPHA_MERGE(*ori_scan, m_Red, src_alpha);
     ori_scan += 2;
     *dest_scan = FXDIB_ALPHA_MERGE(*dest_scan, b, cover_scan);
     dest_scan++;
     *dest_scan = FXDIB_ALPHA_MERGE(*dest_scan, g, cover_scan);
     dest_scan++;
     *dest_scan = FXDIB_ALPHA_MERGE(*dest_scan, r, cover_scan);
     dest_scan += 2;
@@ skipping 190 matching lines @@
                                             uint8_t* clip_scan,
                                             uint8_t* dest_extra_alpha_scan) {
   dest_scan =
       (uint8_t*)m_pDevice->GetScanline(span_top) + span_left + (span_left << 1);
   int col_start = span_left < clip_left ? clip_left - span_left : 0;
   int col_end =
       (span_left + span_len) < clip_right ? span_len : (clip_right - span_left);
   if (col_end < col_start)
     return;  // do nothing.
   dest_scan += (col_start << 1) + col_start;
-  int src_alpha;
-#if 0
-        if (m_bFullCover)
-            src_alpha = m_Alpha;
-        else
-#endif
-  src_alpha = m_Alpha * cover_scan / 255;
+  int src_alpha = m_Alpha * cover_scan / 255;
   if (src_alpha == 255) {
     for (int col = col_start; col < col_end; col++) {
       *dest_scan++ = m_Blue;
       *dest_scan++ = m_Green;
       *dest_scan++ = m_Red;
     }
     return;
   }
   for (int col = col_start; col < col_end; col++) {
     *dest_scan = FXDIB_ALPHA_MERGE(*dest_scan, m_Blue, src_alpha);
@@ skipping 30 matching lines @@
   ori_scan += (col_start << 1) + col_start;
   if (m_Alpha == 255 && cover_scan == 255) {
     for (int col = col_start; col < col_end; col++) {
       *dest_scan++ = m_Blue;
       *dest_scan++ = m_Green;
       *dest_scan++ = m_Red;
     }
     return;
   }
   for (int col = col_start; col < col_end; col++) {
-#if 0
-            if (m_bFullCover) {
-                *dest_scan++ = FXDIB_ALPHA_MERGE(*ori_scan++, m_Blue, m_Alpha);
-                *dest_scan++ = FXDIB_ALPHA_MERGE(*ori_scan++, m_Green, m_Alpha);
-                *dest_scan++ = FXDIB_ALPHA_MERGE(*ori_scan++, m_Red, m_Alpha);
-                continue;
-            }
-#endif
     int b = FXDIB_ALPHA_MERGE(*ori_scan++, m_Blue, m_Alpha);
     int g = FXDIB_ALPHA_MERGE(*ori_scan++, m_Green, m_Alpha);
     int r = FXDIB_ALPHA_MERGE(*ori_scan++, m_Red, m_Alpha);
     *dest_scan = FXDIB_ALPHA_MERGE(*dest_scan, b, cover_scan);
     dest_scan++;
     *dest_scan = FXDIB_ALPHA_MERGE(*dest_scan, g, cover_scan);
     dest_scan++;
     *dest_scan = FXDIB_ALPHA_MERGE(*dest_scan, r, cover_scan);
     dest_scan++;
   }
@@ skipping 491 matching lines @@
 
 //--------------------------------------------------------------------
 FX_BOOL CFX_SkiaRenderer::Init(
     CFX_DIBitmap* pDevice,
     CFX_DIBitmap* pOriDevice,
     const CFX_ClipRgn* pClipRgn,
     FX_DWORD color,
     FX_BOOL bFullCover,
     FX_BOOL bRgbByteOrder,
     int alpha_flag,
-    void* pIccTransform)  // The alpha flag must be fill_flag if exist.
-{
+    void* pIccTransform) {  // The alpha flag must be fill_flag if exist.
   m_pDevice = pDevice;
   m_pClipRgn = pClipRgn;
   m_bRgbByteOrder = bRgbByteOrder;
   m_pOriDevice = pOriDevice;
   m_pDestScan = NULL;
   m_pDestExtraAlphaScan = NULL;
   m_pOriScan = NULL;
   m_pClipScan = NULL;
   composite_span = NULL;
   if (m_pClipRgn)
@@ skipping 51 matching lines @@
           m_Gray = FXRGB2GRAY(r, g, b);
         } else {
           m_Gray =
               FXRGB2GRAY(FXARGB_R(color), FXARGB_G(color), FXARGB_B(color));
         }
       }
     }
   } else {
     if (bDeviceCMYK) {  // Cmyk(a) Device
       ASSERT(!m_bRgbByteOrder);
-      // TODO... opt for cmyk
+      // TODO ... opt for cmyk
       composite_span = &CFX_SkiaRenderer::CompositeSpanCMYK;
       if (bObjectCMYK) {
         m_Color = FXCMYK_TODIB(color);
         if (pIccTransform)
           pIccModule->TranslateScanline(pIccTransform, (uint8_t*)&m_Color,
                                         (const uint8_t*)&m_Color, 1);
       } else {  // Object RGB
         if (!pIccTransform)
           return FALSE;
         color = FXARGB_TODIB(color);
@@ skipping 105 matching lines @@
                              : &CFX_SkiaRenderer::CompositeSpanRGB32_7;
     } break;
     case 1:
     case 5:
     case 8:
     case 9:
     case 11:
     case 12:
     case 13:
     case 15:
-      // TODO...
+      // TODO ...
       break;
     case 10:
       composite_span = &CFX_SkiaRenderer::CompositeSpanRGB24_10;
       break;
     case 14:
       composite_span = &CFX_SkiaRenderer::CompositeSpanRGB24_14;
       break;
   }
   return !!composite_span;
 }
@@ skipping 98 matching lines @@
   m_pDevice = pDevice;
   m_Left = Left;
   m_Top = Top;
   if (pDevice) {
     m_dstWidth = m_Left + pDevice->GetWidth();
     m_dstHeight = m_Top + pDevice->GetHeight();
   }
   return TRUE;
 }
 #endif