From 11e966a2dd931d4676a1b6a7d074a40dd4c1a5d1 Mon Sep 17 00:00:00 2001
From: npm <npm@chromium.org>
Date: Mon, 17 Oct 2016 13:02:28 -0700
Subject: Move fxge/android to if(is_android) on build

core/fxge/android files all have if _FX_OS_ == _FX_ANDROID_. Instead,
put the files inside if (is_android) on Build.gn. Also, the skia file
is already under if (pdf_use_skia), so the if defined(_SKIA_SUPPORT_)
can be removed.

Review-Url: https://codereview.chromium.org/2413983004
---
 core/fxge/android/fpf_skiafont.cpp    | 8 ++------
 core/fxge/android/fpf_skiafont.h      | 5 -----
 core/fxge/android/fpf_skiafontmgr.cpp | 3 ---
 core/fxge/skia/fx_skia_device.cpp     | 3 ---
 4 files changed, 2 insertions(+), 17 deletions(-)

(limited to 'core/fxge')

diff --git a/core/fxge/android/fpf_skiafont.cpp b/core/fxge/android/fpf_skiafont.cpp
index 58e472247a..9c19697387 100644
--- a/core/fxge/android/fpf_skiafont.cpp
+++ b/core/fxge/android/fpf_skiafont.cpp
@@ -4,13 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fxcrt/fx_system.h"
-
-#if _FX_OS_ == _FX_ANDROID_
+#include "core/fxge/android/fpf_skiafont.h"
 
 #include <algorithm>
 
-#include "core/fxge/android/fpf_skiafont.h"
+#include "core/fxcrt/fx_system.h"
 #include "core/fxge/android/fpf_skiafontmgr.h"
 #include "core/fxge/fx_freetype.h"
 
@@ -215,5 +213,3 @@ FX_BOOL CFPF_SkiaFont::InitFont(CFPF_SkiaFontMgr* pFontMgr,
   m_dwRefCount = 1;
   return TRUE;
 }
-
-#endif  // _FX_OS_ == _FX_ANDROID_
diff --git a/core/fxge/android/fpf_skiafont.h b/core/fxge/android/fpf_skiafont.h
index 1a952628a9..66971d5717 100644
--- a/core/fxge/android/fpf_skiafont.h
+++ b/core/fxge/android/fpf_skiafont.h
@@ -8,9 +8,6 @@
 #define CORE_FXGE_ANDROID_FPF_SKIAFONT_H_
 
 #include "core/fxcrt/fx_system.h"
-
-#if _FX_OS_ == _FX_ANDROID_
-
 #include "core/fxge/fx_font.h"
 
 class CFPF_SkiaFontDescriptor;
@@ -53,6 +50,4 @@ class CFPF_SkiaFont {
   uint32_t m_dwRefCount;
 };
 
-#endif  // _FX_OS_ == _FX_ANDROID_
-
 #endif  // CORE_FXGE_ANDROID_FPF_SKIAFONT_H_
diff --git a/core/fxge/android/fpf_skiafontmgr.cpp b/core/fxge/android/fpf_skiafontmgr.cpp
index 3ecacd387c..3bd5cb42d1 100644
--- a/core/fxge/android/fpf_skiafontmgr.cpp
+++ b/core/fxge/android/fpf_skiafontmgr.cpp
@@ -6,8 +6,6 @@
 
 #include "core/fxcrt/fx_system.h"
 
-#if _FX_OS_ == _FX_ANDROID_
-
 #define FPF_SKIAMATCHWEIGHT_NAME1 62
 #define FPF_SKIAMATCHWEIGHT_NAME2 60
 #define FPF_SKIAMATCHWEIGHT_1 16
@@ -523,4 +521,3 @@ void CFPF_SkiaFontMgr::ReportFace(FXFT_Face face,
 }
 
 void CFPF_SkiaFontMgr::OutputSystemFonts() {}
-#endif
diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp
index c4f3818182..3630689b99 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#if defined(_SKIA_SUPPORT_)
 #include <algorithm>
 #include <vector>
 
@@ -1677,5 +1676,3 @@ void CFX_DIBSource::DebugVerifyBitmapIsPreMultiplied(void* opt) const {
   }
 #endif
 }
-
-#endif
-- 
cgit v1.2.3