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

Unified Diff: source/test/letest/SimpleFontInstance.cpp

Issue 845603002: Update ICU to 54.1 step 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master
Patch Set: remove unusued directories Created 5 years, 11 months 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 | « source/test/letest/Makefile.in ('k') | source/test/letest/cfonts.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/test/letest/SimpleFontInstance.cpp
diff --git a/source/test/letest/SimpleFontInstance.cpp b/source/test/letest/SimpleFontInstance.cpp
index 8051bf5c6997c9916d1631f364f54a0ea70354a9..30849f734842648ce09beb88b9868b68380664f0 100644
--- a/source/test/letest/SimpleFontInstance.cpp
+++ b/source/test/letest/SimpleFontInstance.cpp
@@ -1,7 +1,7 @@
/*
*******************************************************************************
*
- * Copyright (C) 1999-2013, International Business Machines
+ * Copyright (C) 1999-2014, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@@ -17,7 +17,10 @@
#include "layout/LETypes.h"
#include "layout/LEFontInstance.h"
+#ifndef USING_ICULEHB
#include "CanonShaping.h"
+#endif
+
#include "SimpleFontInstance.h"
SimpleFontInstance::SimpleFontInstance(float pointSize, LEErrorCode &status)
@@ -40,6 +43,7 @@ SimpleFontInstance::~SimpleFontInstance()
const void *SimpleFontInstance::getFontTable(LETag tableTag) const
{
+#ifndef USING_ICULEHB
if (tableTag == LE_GSUB_TABLE_TAG) {
return CanonShaping::glyphSubstitutionTable;
}
@@ -47,7 +51,7 @@ const void *SimpleFontInstance::getFontTable(LETag tableTag) const
if (tableTag == LE_GDEF_TABLE_TAG) {
return CanonShaping::glyphDefinitionTable;
}
-
+#endif
return NULL;
}
@@ -60,6 +64,7 @@ void SimpleFontInstance::getGlyphAdvance(LEGlyphID glyph, LEPoint &advance) cons
advance.fX = 0;
}
#else
+ (void)glyph; // Suppress unused parameter compiler warning.
advance.fX = xUnitsToPoints(2048);
#endif
« no previous file with comments | « source/test/letest/Makefile.in ('k') | source/test/letest/cfonts.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698