remove non-Pango font code and FreeType code

* this commit gets rid of the HAVE_PANGO pragma and HAVE_FREETYPE,
  preferring the Pango sections of HAVE_PANGO. using Cairo methods for
  fonts [is discouraged](http://cairographics.org/FAQ/#using_pango).
  and freetype was only ever needed for cairo font rendering, so that
  code was running in the Pango build for no reason at all.
* it also gets rid of context2d's `addFont`, which was never compatible
  with the Pango build. `FontFace` is completely removed since it was
  never used by the Pango build either, and instead of parsing the fonts
  with FreeType we will instead prefer to let the OS do that in
  succeeding commits
* the Windows build has been updated to work with Pango, which it did
  not before

TL;DR - Pango is now required and and as of this commit custom fonts are
removed

Author: chearon

binding.gyp

@@ -4,16 +4,12 @@
       'variables': {
         'GTK_Root%': 'C:/GTK', # Set the location of GTK all-in-one bundle
         'with_jpeg%': 'false',
-        'with_gif%': 'false',
-        'with_pango%': 'false',
-        'with_freetype%': 'false'
+        'with_gif%': 'false'
       }
     }, { # 'OS!="win"'
       'variables': {
         'with_jpeg%': '<!(./util/has_lib.sh jpeg)',
-        'with_gif%': '<!(./util/has_lib.sh gif)',
-        'with_pango%': '<!(./util/has_lib.sh pango)',
-        'with_freetype%': '<!(./util/has_lib.sh freetype)'
+        'with_gif%': '<!(./util/has_lib.sh gif)'
       }
     }]
   ],
@@ -26,12 +22,21 @@
           'copies': [{
             'destination': '<(PRODUCT_DIR)',
             'files': [
+              '<(GTK_Root)/bin/zlib1.dll',
+              '<(GTK_Root)/bin/libintl-8.dll',
+              '<(GTK_Root)/bin/libpng14-14.dll',
+              '<(GTK_Root)/bin/libpangocairo-1.0-0.dll',
+              '<(GTK_Root)/bin/libpango-1.0-0.dll',
+              '<(GTK_Root)/bin/libpangoft2-1.0-0.dll',
+              '<(GTK_Root)/bin/libpangowin32-1.0-0.dll',
               '<(GTK_Root)/bin/libcairo-2.dll',
-              '<(GTK_Root)/bin/libexpat-1.dll',
               '<(GTK_Root)/bin/libfontconfig-1.dll',
               '<(GTK_Root)/bin/libfreetype-6.dll',
-              '<(GTK_Root)/bin/libpng14-14.dll',
-              '<(GTK_Root)/bin/zlib1.dll',
+              '<(GTK_Root)/bin/libglib-2.0-0.dll',
+              '<(GTK_Root)/bin/libgobject-2.0-0.dll',
+              '<(GTK_Root)/bin/libgmodule-2.0-0.dll',
+              '<(GTK_Root)/bin/libgthread-2.0-0.dll',
+              '<(GTK_Root)/bin/libexpat-1.dll'
             ]
           }]
         }]
@@ -54,11 +59,18 @@
         ['OS=="win"', {
           'libraries': [
             '-l<(GTK_Root)/lib/cairo.lib',
-            '-l<(GTK_Root)/lib/libpng.lib'
+            '-l<(GTK_Root)/lib/libpng.lib',
+            '-l<(GTK_Root)/lib/pangocairo-1.0.lib',
+            '-l<(GTK_Root)/lib/pango-1.0.lib',
+            '-l<(GTK_Root)/lib/glib-2.0.lib',
+            '-l<(GTK_Root)/lib/gobject-2.0.lib'
           ],
           'include_dirs': [
             '<(GTK_Root)/include',
             '<(GTK_Root)/include/cairo',
+            '<(GTK_Root)/include/pango-1.0',
+            '<(GTK_Root)/include/glib-2.0',
+            '<(GTK_Root)/lib/glib-2.0/include'
           ],
           'defines': [
             '_USE_MATH_DEFINES' # for M_PI
@@ -87,49 +99,13 @@
           'libraries': [
             '<!@(pkg-config pixman-1 --libs)',
             '<!@(pkg-config cairo --libs)',
-            '<!@(pkg-config libpng --libs)'
+            '<!@(pkg-config libpng --libs)',
+            '<!@(pkg-config pangocairo --libs)'
           ],
           'include_dirs': [
             '<!@(pkg-config cairo --cflags-only-I | sed s/-I//g)',
-            '<!@(pkg-config libpng --cflags-only-I | sed s/-I//g)'
-          ]
-        }],
-        ['with_freetype=="true"', {
-          'defines': [
-            'HAVE_FREETYPE'
-          ],
-          'sources': [
-            'src/FontFace.cc'
-          ],
-          'conditions': [
-            ['OS=="win"', {
-              # No support for windows right now.
-            }, { # 'OS!="win"'
-              'include_dirs': [ # tried to pass through cflags but failed.
-                # Need to include the header files of cairo AND freetype.
-                # Looking up the includes of cairo does both.
-                '<!@(pkg-config cairo --cflags-only-I | sed s/-I//g)'
-              ]
-            }]
-          ]
-        }],
-        ['with_pango=="true"', {
-          'defines': [
-            'HAVE_PANGO'
-          ],
-          'conditions': [
-            ['OS=="win"', {
-              'libraries': [
-                '-l<(GTK_Root)/lib/pangocairo.lib'
-              ]
-            }, { # 'OS!="win"'
-              'include_dirs': [ # tried to pass through cflags but failed
-                '<!@(pkg-config pangocairo --cflags-only-I | sed s/-I//g)'
-              ],
-              'libraries': [
-                '<!@(pkg-config pangocairo --libs)'
-              ]
-            }]
+            '<!@(pkg-config libpng --cflags-only-I | sed s/-I//g)',
+            '<!@(pkg-config pangocairo --cflags-only-I | sed s/-I//g)'
           ]
         }],
         ['with_jpeg=="true"', {

lib/context2d.js

@@ -233,19 +233,6 @@ Context2d.prototype.__defineGetter__('strokeStyle', function(){
   return this.lastStrokeStyle || this.strokeColor;
 });
 
-/**
- * Register `font` for usage.
- *
- * @param {Font} font
- * @api public
- */
-
-Context2d.prototype.addFont = function(font) {
-  this._fonts = this._fonts || {};
-  if (this._fonts[font.name]) return;
-  this._fonts[font.name] = font;
-};
-
 /**
  * Set font.
  *
@@ -259,22 +246,12 @@ Context2d.prototype.__defineSetter__('font', function(val){
     var font;
     if (font = parseFont(val)) {
       this.lastFontString = val;
-
-      var fonts = this._fonts;
-      if (fonts && fonts[font.family]) {
-        var fontObj = fonts[font.family];
-        var type = font.weight + '-' + font.style;
-
-        var fontFace = fontObj.getFace(type);
-        this._setFontFace(fontFace, font.size);
-      } else {
-        this._setFont(
-            font.weight
-          , font.style
-          , font.size
-          , font.unit
-          , font.family);
-      }
+      this._setFont(
+          font.weight
+        , font.style
+        , font.size
+        , font.unit
+        , font.family);
     }
   }
 });

src/Canvas.h

@@ -12,13 +12,8 @@
 #include <node.h>
 #include <node_object_wrap.h>
 #include <node_version.h>
-
-#if HAVE_PANGO
 #include <pango/pangocairo.h>
-#else
 #include <cairo.h>
-#endif
-
 #include <nan.h>
 
 using namespace v8;