提交 d5a0e4cf 编写于 作者: P prr

8224915: Better serial attributes

Reviewed-by: serb, psadhukhan, mschoene, rhalade
上级 a546966c
...@@ -1750,6 +1750,7 @@ public class Font implements java.io.Serializable ...@@ -1750,6 +1750,7 @@ public class Font implements java.io.Serializable
// value is the default. // value is the default.
if (fRequestedAttributes != null) { if (fRequestedAttributes != null) {
try {
values = getAttributeValues(); // init values = getAttributeValues(); // init
AttributeValues extras = AttributeValues extras =
AttributeValues.fromSerializableHashtable(fRequestedAttributes); AttributeValues.fromSerializableHashtable(fRequestedAttributes);
...@@ -1759,10 +1760,13 @@ public class Font implements java.io.Serializable ...@@ -1759,10 +1760,13 @@ public class Font implements java.io.Serializable
values = getAttributeValues().merge(extras); values = getAttributeValues().merge(extras);
this.nonIdentityTx = values.anyNonDefault(EXTRA_MASK); this.nonIdentityTx = values.anyNonDefault(EXTRA_MASK);
this.hasLayoutAttributes = values.anyNonDefault(LAYOUT_MASK); this.hasLayoutAttributes = values.anyNonDefault(LAYOUT_MASK);
} catch (Throwable t) {
throw new IOException(t);
} finally {
fRequestedAttributes = null; // don't need it any more fRequestedAttributes = null; // don't need it any more
} }
} }
}
/** /**
* Returns the number of glyphs in this <code>Font</code>. Glyph codes * Returns the number of glyphs in this <code>Font</code>. Glyph codes
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册