trimmed release 31.0.1650.63
trimmed release 32.0.1700.107
Rebase 'bugfix/cleartypecanvas' from upstream/30.0.1599.101 onto upstream/32.0.1700.107

Conflicts:
	src/third_party/WebKit/Source/core/platform/graphics/skia/SkiaFontWin.cpp
Fix compile errors for v32

* The code that checks 'couldUseLCDRenderedText' has been moved from
  setupPaintForFont (static function) to FontPlatformData::setupPaint
  (https://chromiumcodereview.appspot.com/24422003)

In this commit, a new 'FontSmoothingOverride' type is introduced, instead of
just passing the 'textFlags' and 'lcdExplicitlyRequested' parameters.  This is
to prevent potential ambiguities when merging future upstream code because of
the use of default parameters in FontPlatformData::setupPaint.