Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(835)

Unified Diff: sky/engine/platform/fonts/GlyphPage.h

Issue 722723003: Re-land 714393002 after fixing android build. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/platform/fonts/FontPlatformData.h ('k') | sky/engine/platform/graphics/Color.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/platform/fonts/GlyphPage.h
diff --git a/sky/engine/platform/fonts/GlyphPage.h b/sky/engine/platform/fonts/GlyphPage.h
index ae7ae6d1d2668448e2490e0a053c8167c14d9d80..e835629e961f1a18fb6214009d0a9c9f1bc64bb9 100644
--- a/sky/engine/platform/fonts/GlyphPage.h
+++ b/sky/engine/platform/fonts/GlyphPage.h
@@ -56,11 +56,6 @@ struct GlyphData {
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.
@@ -218,10 +213,6 @@ private:
const SimpleFontData* m_perGlyphFontData[0];
};
-#if COMPILER(MSVC)
-#pragma warning(pop)
-#endif
-
} // namespace blink
#endif // GlyphPage_h
« no previous file with comments | « sky/engine/platform/fonts/FontPlatformData.h ('k') | sky/engine/platform/graphics/Color.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698