ozone: Support building without cairo

This adds a use_cairo gyp variable that removes cairo from the build. To build skia without cairo, we need the code in bitmap_platform_device_android.cc. To make all platforms build the correct files, rename bitmap_platform_device_linux to bitmap_platform_device_cairo and rename bitmap_platform_device_android to bitmap_platform_device_skia. We'll use bitmap_platform_device_skia for Android and for embedded content shell. BUG=318315, 318413 Review URL: https://codereview.chromium.org/59133008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236037 0039d316-1c4b-4281-b951-d872f2087c98
marcosholgado · Nov 19, 2013 · 928362a · 928362a
1 parent ea9f65b
commit 928362a
Show file tree

Hide file tree

Showing 13 changed files with 55 additions and 36 deletions.
diff --git a/build/common.gypi b/build/common.gypi
@@ -520,11 +520,13 @@
           'use_glib%': 1,
         }],
 
-        # Flags to use pango.
+        # Flags to use pango and cairo.
         ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or embedded==1', {
           'use_pango%': 0,
+          'use_cairo%': 0,
         }, {
           'use_pango%': 1,
+          'use_cairo%': 1,
         }],
 
         # DBus usage.
@@ -853,6 +855,7 @@
     'use_dbus%': '<(use_dbus)',
     'use_glib%': '<(use_glib)',
     'use_pango%': '<(use_pango)',
+    'use_cairo%': '<(use_cairo)',
     'use_ozone%': '<(use_ozone)',
     'use_ozone_evdev%': '<(use_ozone_evdev)',
     'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
@@ -2053,6 +2056,9 @@
       ['use_ash==1', {
         'defines': ['USE_ASH=1'],
       }],
+      ['use_cairo==1', {
+        'defines': ['USE_CAIRO=1'],
+      }],
       ['use_cras==1', {
         'defines': ['USE_CRAS=1'],
       }],

diff --git a/skia/ext/bitmap_platform_device.h b/skia/ext/bitmap_platform_device.h
@@ -12,10 +12,10 @@
 #include "skia/ext/bitmap_platform_device_win.h"
 #elif defined(__APPLE__)
 #include "skia/ext/bitmap_platform_device_mac.h"
-#elif defined(ANDROID)
-#include "skia/ext/bitmap_platform_device_android.h"
-#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__sun)
-#include "skia/ext/bitmap_platform_device_linux.h"
+#elif defined(USE_CAIRO)
+#include "skia/ext/bitmap_platform_device_cairo.h"
+#else
+#include "skia/ext/bitmap_platform_device_skia.h"
 #endif
 
 namespace skia {

diff --git a/skia/ext/bitmap_platform_device_linux.cc → skia/ext/bitmap_platform_device_cairo.cc b/skia/ext/bitmap_platform_device_linux.cc → skia/ext/bitmap_platform_device_cairo.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium 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 "skia/ext/bitmap_platform_device_linux.h"
+#include "skia/ext/bitmap_platform_device_cairo.h"
 #include "skia/ext/bitmap_platform_device_data.h"
 #include "skia/ext/platform_canvas.h"
 

diff --git a/skia/ext/bitmap_platform_device_linux.h → skia/ext/bitmap_platform_device_cairo.h b/skia/ext/bitmap_platform_device_linux.h → skia/ext/bitmap_platform_device_cairo.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SKIA_EXT_BITMAP_PLATFORM_DEVICE_LINUX_H_
-#define SKIA_EXT_BITMAP_PLATFORM_DEVICE_LINUX_H_
+#ifndef SKIA_EXT_BITMAP_PLATFORM_DEVICE_CAIRO_H_
+#define SKIA_EXT_BITMAP_PLATFORM_DEVICE_CAIRO_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ -111,4 +111,4 @@ class BitmapPlatformDevice : public SkBitmapDevice, public PlatformDevice {
 
 }  // namespace skia
 
-#endif  // SKIA_EXT_BITMAP_PLATFORM_DEVICE_LINUX_H_
+#endif  // SKIA_EXT_BITMAP_PLATFORM_DEVICE_CAIRO_H_
diff --git a/skia/ext/bitmap_platform_device_android.cc → skia/ext/bitmap_platform_device_skia.cc b/skia/ext/bitmap_platform_device_android.cc → skia/ext/bitmap_platform_device_skia.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium 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 "skia/ext/bitmap_platform_device_android.h"
+#include "skia/ext/bitmap_platform_device_skia.h"
 #include "skia/ext/platform_canvas.h"
 
 namespace skia {

diff --git a/skia/ext/bitmap_platform_device_android.h → skia/ext/bitmap_platform_device_skia.h b/skia/ext/bitmap_platform_device_android.h → skia/ext/bitmap_platform_device_skia.h
@@ -1,12 +1,12 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SKIA_EXT_BITMAP_PLATFORM_DEVICE_ANDROID_H_
-#define SKIA_EXT_BITMAP_PLATFORM_DEVICE_ANDROID_H_
+#ifndef SKIA_EXT_BITMAP_PLATFORM_DEVICE_SKIA_H_
+#define SKIA_EXT_BITMAP_PLATFORM_DEVICE_SKIA_H_
 
-#include "base/memory/ref_counted.h"
 #include "base/compiler_specific.h"
+#include "base/memory/ref_counted.h"
 #include "skia/ext/platform_device.h"
 
 namespace skia {
@@ -57,4 +57,4 @@ class BitmapPlatformDevice : public SkBitmapDevice, public PlatformDevice {
 
 }  // namespace skia
 
-#endif  // SKIA_EXT_BITMAP_PLATFORM_DEVICE_ANDROID_H_
+#endif  // SKIA_EXT_BITMAP_PLATFORM_DEVICE_SKIA_H_
diff --git a/skia/ext/platform_device.h b/skia/ext/platform_device.h
@@ -21,8 +21,7 @@ class SkMetaData;
 class SkPath;
 class SkRegion;
 
-#if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_FREEBSD) \
-    || defined(OS_SOLARIS)
+#if defined(USE_CAIRO)
 typedef struct _cairo cairo_t;
 typedef struct _cairo_rectangle cairo_rectangle_t;
 #elif defined(OS_MACOSX)
@@ -37,16 +36,15 @@ class PlatformDevice;
 #if defined(OS_WIN)
 typedef HDC PlatformSurface;
 typedef RECT PlatformRect;
-#elif defined(ANDROID)
-typedef void* PlatformSurface;
-typedef SkIRect* PlatformRect;
-#elif defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_FREEBSD) \
-    || defined(OS_SOLARIS)
+#elif defined(USE_CAIRO)
 typedef cairo_t* PlatformSurface;
 typedef cairo_rectangle_t PlatformRect;
 #elif defined(OS_MACOSX)
 typedef CGContextRef PlatformSurface;
 typedef CGRect PlatformRect;
+#else
+typedef void* PlatformSurface;
+typedef SkIRect* PlatformRect;
 #endif
 
 // The following routines provide accessor points for the functionality

diff --git a/skia/skia_chrome.gypi b/skia/skia_chrome.gypi
@@ -26,13 +26,13 @@
     'ext/benchmarking_canvas.cc',
     'ext/benchmarking_canvas.h',
     'ext/bitmap_platform_device.h',
-    'ext/bitmap_platform_device_android.cc',
-    'ext/bitmap_platform_device_android.h',
+    'ext/bitmap_platform_device_cairo.cc',
+    'ext/bitmap_platform_device_cairo.h',
     'ext/bitmap_platform_device_data.h',
-    'ext/bitmap_platform_device_linux.cc',
-    'ext/bitmap_platform_device_linux.h',
     'ext/bitmap_platform_device_mac.cc',
     'ext/bitmap_platform_device_mac.h',
+    'ext/bitmap_platform_device_skia.cc',
+    'ext/bitmap_platform_device_skia.h',
     'ext/bitmap_platform_device_win.cc',
     'ext/bitmap_platform_device_win.h',
     'ext/convolver.cc',
@@ -104,6 +104,11 @@
         '-Wstring-conversion',
       ],
     }],
+    [ 'OS != "android" and (OS != "linux" or use_cairo==1)', {
+      'sources!': [
+        'ext/bitmap_platform_device_skia.cc',
+      ],
+    }],
   ],
 
   'target_conditions': [

diff --git a/skia/skia_common.gypi b/skia/skia_common.gypi
@@ -37,6 +37,9 @@
     [ 'desktop_linux == 0 and chromeos == 0', {
       'sources/': [ ['exclude', '_linux\\.(cc|cpp)$'] ],
     }],
+    [ 'use_cairo == 0', {
+      'sources/': [ ['exclude', '_cairo\\.(cc|cpp)$'] ],
+    }],
   ],
 
   # We would prefer this to be direct_dependent_settings,

diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi
@@ -273,14 +273,18 @@
       'dependencies': [
         '../build/linux/system.gyp:fontconfig',
         '../build/linux/system.gyp:freetype2',
-        '../build/linux/system.gyp:pangocairo',
         '../third_party/icu/icu.gyp:icuuc',
       ],
       'cflags': [
         '-Wno-unused',
         '-Wno-unused-function',
       ],
     }],
+    [ 'use_cairo == 1', {
+      'dependencies': [
+        '../build/linux/system.gyp:pangocairo',
+      ],
+    }],
     [ 'OS=="win" or OS=="mac" or OS=="ios" or OS=="android"', {
       'sources!': [
         '../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp',

diff --git a/ui/gfx/blit.cc b/ui/gfx/blit.cc
@@ -11,11 +11,13 @@
 #include "ui/gfx/rect.h"
 #include "ui/gfx/vector2d.h"
 
+#if defined(USE_CAIRO)
 #if defined(OS_OPENBSD)
 #include <cairo.h>
 #elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
 #include <cairo/cairo.h>
 #endif
+#endif
 
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_cftyperef.h"
@@ -76,9 +78,7 @@ void BlitContextToContext(NativeDrawingContext dst_context,
   base::ScopedCFTypeRef<CGImageRef> src_sub_image(
       CGImageCreateWithImageInRect(src_image, src_rect.ToCGRect()));
   CGContextDrawImage(dst_context, dst_rect.ToCGRect(), src_sub_image);
-#elif defined(OS_ANDROID)
-  NOTIMPLEMENTED();
-#else  // Linux, BSD, others
+#elif defined(USE_CAIRO)
   // Only translations in the source context are supported; more complex
   // source context transforms will be ignored.
   cairo_save(dst_context);
@@ -92,6 +92,8 @@ void BlitContextToContext(NativeDrawingContext dst_context,
   cairo_clip(dst_context);
   cairo_paint(dst_context);
   cairo_restore(dst_context);
+#else
+  NOTIMPLEMENTED();
 #endif
 }
 

diff --git a/ui/gfx/image/image_unittest.cc b/ui/gfx/image/image_unittest.cc
@@ -23,7 +23,8 @@
 
 namespace {
 
-#if defined(TOOLKIT_VIEWS) || defined(OS_ANDROID)
+#if defined(TOOLKIT_VIEWS) || defined(OS_ANDROID) || \
+    (defined(OS_LINUX) && !defined(USE_CAIRO))
 const bool kUsesSkiaNatively = true;
 #else
 const bool kUsesSkiaNatively = false;

diff --git a/ui/gfx/native_widget_types.h b/ui/gfx/native_widget_types.h
@@ -171,12 +171,12 @@ typedef PangoFontDescription* NativeFont;
 typedef GtkWidget* NativeEditView;
 typedef cairo_t* NativeDrawingContext;
 typedef void* NativeViewAccessible;
-#elif defined(USE_AURA)
+#elif defined(USE_CAIRO)
 typedef PangoFontDescription* NativeFont;
 typedef void* NativeEditView;
 typedef cairo_t* NativeDrawingContext;
 typedef void* NativeViewAccessible;
-#elif defined(OS_ANDROID)
+#else
 typedef void* NativeFont;
 typedef void* NativeEditView;
 typedef void* NativeDrawingContext;