Re-land 714393002 after fixing android build.

sky/engine/platform/fonts/GlyphPage.h

 /*
  * Copyright (C) 2006, 2007, 2008, 2013 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 38 matching lines @@
 struct GlyphData {
     GlyphData(Glyph g = 0, const SimpleFontData* f = 0)
         : glyph(g)
         , fontData(f)
     {
     }
     Glyph glyph;
     const SimpleFontData* fontData;
 };
 
-#if COMPILER(MSVC)
-#pragma warning(push)
-#pragma warning(disable: 4200) // Disable "zero-sized array in struct/union" warning
-#endif
-
 // A GlyphPage contains a fixed-size set of GlyphData mappings for a contiguous
 // range of characters in the Unicode code space. GlyphPages are indexed
 // starting from 0 and incrementing for each 256 glyphs.
 //
 // One page may actually include glyphs from other fonts if the characters are
 // missing in the primary font. It is owned by exactly one GlyphPageTreeNode,
 // although multiple nodes may reference it as their "page" if they are supposed
 // to be overriding the parent's node, but provide no additional information.
 class PLATFORM_EXPORT GlyphPage : public RefCounted<GlyphPage> {
 public:
@@ skipping 137 matching lines @@
 
     const SimpleFontData* m_fontDataForAllGlyphs;
     GlyphPageTreeNode* m_owner;
     RefPtr<CustomDataPage> m_customFontToLoad;
     Glyph m_glyphs[size];
 
     // NOTE: This array has (GlyphPage::size) elements if m_fontDataForAllGlyphs is null.
     const SimpleFontData* m_perGlyphFontData[0];
 };
 
-#if COMPILER(MSVC)
-#pragma warning(pop)
-#endif
-
 } // namespace blink
 
 #endif // GlyphPage_h