Roll third_party/freetype-android/src to VER-2-6-2.

https://chromium.googlesource.com/chromium/src/third_party/freetype2.git/+log/30fe5e762e06261..66cf29b1bc869b

This updates from VER-2-6-1 + 1 to VER-2-6-2.

It is expected that this will change the weight of CFF fonts.
If this becomes undesireable, there is a patch which can be applied.

BUG=chromium:551028

Committed: https://crrev.com/a7a845a523c9f2f3c481ec99c0c35646f9e5ea7f
Cr-Commit-Position: refs/heads/master@{#364438}

Committed: https://crrev.com/89e75f4d6c033ba5904cc808feb1292e8f211120
Cr-Commit-Position: refs/heads/master@{#364723}

Review URL: https://codereview.chromium.org/1518643003

Cr-Commit-Position: refs/heads/master@{#364850}

4 files changed, 50 insertions, 10 deletions

diff --git a/DEPS b/DEPS
index 65d2234..9d4e809 100644
--- a/DEPS
+++ b/DEPS
@@ -444,7 +444,7 @@ deps_os = {
      Var('chromium_git') + '/chromium/deps/findbugs.git' + '@' + '57f05238d3ac77ea0a194813d3065dd780c6e566',
 
     'src/third_party/freetype-android/src':
-     Var('chromium_git') + '/chromium/src/third_party/freetype2.git' + '@' + '30fe5e762e062612fdf4b56b50d813525a5aa311',
+     Var('chromium_git') + '/chromium/src/third_party/freetype2.git' + '@' + '66cf29b1bc869b44863b0de2115bd017dfcce849',
 
    'src/third_party/elfutils/src':
      Var('chromium_git') + '/external/elfutils.git' + '@' + '249673729a7e5dbd5de4f3760bdcaa3d23d154d7',
diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations
index 08850d1..964f510 100644
--- a/third_party/WebKit/LayoutTests/TestExpectations
+++ b/third_party/WebKit/LayoutTests/TestExpectations
@@ -1248,6 +1248,26 @@ crbug.com/535478 [ Win ] virtual/threaded/inspector/tracing/decode-resize.html [
 
 crbug.com/524646 [ Mac10.10 ] fast/dom/shadow/shadowdom-for-button.html [ Failure ]
 
+crbug.com/551028 [ Android ] css1/classification/list_style.html [ NeedsManualRebaseline ]
+crbug.com/551028 [ Android ] svg/W3C-SVG-1.1-SE/coords-dom-02-f.svg [ NeedsManualRebaseline ]
+crbug.com/551028 [ Android ] css1/formatting_model/horizontal_formatting.html [ NeedsManualRebaseline ]
+crbug.com/551028 [ Android ] css1/formatting_model/canvas.html [ NeedsManualRebaseline ]
+crbug.com/551028 [ Android ] css1/cascade/important.html [ NeedsManualRebaseline ]
+crbug.com/551028 [ Android ] css1/font_properties/font_style.html [ NeedsManualRebaseline ]
+crbug.com/551028 [ Android ] css1/font_properties/font_variant.html [ NeedsManualRebaseline ]
+crbug.com/551028 [ Android ] css1/color_and_background/background_color.html [ NeedsManualRebaseline ]
+crbug.com/551028 [ Android ] css1/classification/list_style_position.html [ NeedsManualRebaseline ]
+crbug.com/551028 [ Android ] svg/batik/text/textAnchor3.svg [ NeedsManualRebaseline ]
+crbug.com/551028 [ Android ] fast/text/chromium-linux-fontconfig-renderstyle.html [ NeedsManualRebaseline ]
+crbug.com/551028 [ Android ] svg/canvas/canvas-pattern-svg.html [ NeedsManualRebaseline ]
+crbug.com/551028 [ Android ] css1/color_and_background/color.html [ NeedsManualRebaseline ]
+crbug.com/551028 [ Android ] fast/hidpi/clip-text-in-hidpi.html [ NeedsManualRebaseline ]
+crbug.com/551028 [ Android ] editing/caret/caret-color.html [ NeedsManualRebaseline ]
+crbug.com/551028 [ Android ] css1/classification/list_style_image.html [ NeedsManualRebaseline ]
+crbug.com/551028 [ Android ] css1/text_properties/text_align.html [ NeedsManualRebaseline ]
+crbug.com/551028 [ Android ] fast/invalid/009.html [ NeedsManualRebaseline ]
+crbug.com/551028 [ Android ] fast/compact/002.html [ NeedsManualRebaseline ]
+
 crbug.com/538717 [ Win Mac Linux ] http/tests/permissions/chromium/test-request-multiple-window.html [ Failure Pass Timeout ]
 crbug.com/538717 [ Win Mac Linux ] http/tests/permissions/chromium/test-request-multiple-worker.html [ Failure Pass Timeout ]
 crbug.com/538717 [ Win Mac Linux ] http/tests/permissions/chromium/test-request-multiple-sharedworker.html [ Failure Pass Timeout ]
diff --git a/third_party/freetype-android/README.chromium b/third_party/freetype-android/README.chromium
index b4adfad..126a660 100644
--- a/third_party/freetype-android/README.chromium
+++ b/third_party/freetype-android/README.chromium
@@ -1,7 +1,7 @@
 Name: FreeType
 URL: http://www.freetype.org/
-Version: VER-2-6-1-updates
-Revision: 30fe5e762e062612fdf4b56b50d813525a5aa311
+Version: VER-2-6-2
+Revision: 66cf29b1bc869b44863b0de2115bd017dfcce849
 License: Custom license "inspired by the BSD, Artistic, and IJG (Independent
          JPEG Group) licenses"
 License File: src/docs/FTL.TXT
@@ -21,6 +21,8 @@ How to update:
    FreeType tag being branched and commit changes there.
 2. Update freetype.gyp and BUILD.gn to reflect any changes. These should be kept
    in sync with the Android.mk for FreeType in Android as possible.
-3. Update this file.
-4. Commit build changes while rolling Chromium's freetype-android DEPS to the
+3. Merge the new src/include/freetype/config/ftoption.h into
+   include/freetype-android-config/ftoption.h .
+4. Update this file.
+5. Commit build changes while rolling Chromium's freetype-android DEPS to the
    new commit.
diff --git a/third_party/freetype-android/include/freetype-android-config/ftoption.h b/third_party/freetype-android/include/freetype-android-config/ftoption.h
index 2499196..2e83cf0 100644
--- a/third_party/freetype-android/include/freetype-android-config/ftoption.h
+++ b/third_party/freetype-android/include/freetype-android-config/ftoption.h
@@ -38,9 +38,9 @@ FT_BEGIN_HEADER
   /*    library from a single source directory.                            */
   /*                                                                       */
   /*  - You can put a copy of this file in your build directory, more      */
-  /*    precisely in `$BUILD/config/ftoption.h', where `$BUILD' is the     */
-  /*    name of a directory that is included _before_ the FreeType include */
-  /*    path during compilation.                                           */
+  /*    precisely in `$BUILD/freetype/config/ftoption.h', where `$BUILD'   */
+  /*    is the name of a directory that is included _before_ the FreeType  */
+  /*    include path during compilation.                                   */
   /*                                                                       */
   /*    The default FreeType Makefiles and Jamfiles use the build          */
   /*    directory `builds/<system>' by default, but you can easily change  */
@@ -51,7 +51,7 @@ FT_BEGIN_HEADER
   /*    locate this file during the build.  For example,                   */
   /*                                                                       */
   /*      #define FT_CONFIG_OPTIONS_H  <myftoptions.h>                     */
-  /*      #include <config/ftheader.h>                                     */
+  /*      #include <freetype/config/ftheader.h>                            */
   /*                                                                       */
   /*    will use `$BUILD/myftoptions.h' instead of this file for macro     */
   /*    definitions.                                                       */
@@ -59,7 +59,7 @@ FT_BEGIN_HEADER
   /*    Note also that you can similarly pre-define the macro              */
   /*    FT_CONFIG_MODULES_H used to locate the file listing of the modules */
   /*    that are statically linked to the library at compile time.  By     */
-  /*    default, this file is <config/ftmodule.h>.                         */
+  /*    default, this file is <freetype/config/ftmodule.h>.                */
   /*                                                                       */
   /* We highly recommend using the third method whenever possible.         */
   /*                                                                       */
@@ -693,6 +693,24 @@ FT_BEGIN_HEADER
 
 
   /*************************************************************************/
+  /*                                                                       */
+  /* Option TT_CONFIG_OPTION_MAX_RUNNABLE_OPCODES controls the maximum     */
+  /* number of bytecode instructions executed for a single run of the      */
+  /* bytecode interpreter, needed to prevent infinite loops.  You don't    */
+  /* want to change this except for very special situations (e.g., making  */
+  /* a library fuzzer spend less time to handle broken fonts).             */
+  /*                                                                       */
+  /* It is not expected that this value is ever modified by a configuring  */
+  /* script; instead, it gets surrounded with #ifndef ... #endif so that   */
+  /* the value can be set as a preprocessor option on the compiler's       */
+  /* command line.                                                         */
+  /*                                                                       */
+#ifndef TT_CONFIG_OPTION_MAX_RUNNABLE_OPCODES
+#define TT_CONFIG_OPTION_MAX_RUNNABLE_OPCODES  1000000L
+#endif
+
+
+  /*************************************************************************/
   /*************************************************************************/
   /****                                                                 ****/
   /****      T Y P E 1   D R I V E R    C O N F I G U R A T I O N       ****/