Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
6365ccf2
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
4
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_jdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
6365ccf2
编写于
11月 25, 2013
作者:
C
ceisserer
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8028722: Render: Drawing strings with exactly 254 glyphs causes hangs
Reviewed-by: prr, bae
上级
166ed51e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
86 addition
and
9 deletion
+86
-9
src/solaris/classes/sun/font/XRTextRenderer.java
src/solaris/classes/sun/font/XRTextRenderer.java
+14
-9
test/java/awt/Graphics2D/DrawString/XRenderElt254TextTest.java
...java/awt/Graphics2D/DrawString/XRenderElt254TextTest.java
+72
-0
未找到文件。
src/solaris/classes/sun/font/XRTextRenderer.java
浏览文件 @
6365ccf2
...
...
@@ -36,6 +36,10 @@ import sun.java2d.xr.*;
* @author Clemens Eisserer
*/
public
class
XRTextRenderer
extends
GlyphListPipe
{
// Workarround for a bug in libXrender.
// In case the number of glyphs of an ELT is a multiple of 254,
// a few garbage bytes are sent to the XServer causing hangs.
static
final
int
MAX_ELT_GLYPH_COUNT
=
253
;
XRGlyphCache
glyphCache
;
XRCompositeManager
maskBuffer
;
...
...
@@ -92,8 +96,11 @@ public class XRTextRenderer extends GlyphListPipe {
int
posX
=
0
,
posY
=
0
;
if
(
gl
.
usePositions
()
||
(
cacheEntry
.
getXAdvance
()
!=
((
float
)
cacheEntry
.
getXOff
())
||
cacheEntry
.
getYAdvance
()
!=
((
float
)
cacheEntry
.
getYOff
()))
||
eltIndex
<
0
||
glyphSet
!=
activeGlyphSet
)
{
||
cacheEntry
.
getXAdvance
()
!=
((
float
)
cacheEntry
.
getXOff
())
||
cacheEntry
.
getYAdvance
()
!=
((
float
)
cacheEntry
.
getYOff
())
||
glyphSet
!=
activeGlyphSet
||
eltIndex
<
0
||
eltList
.
getCharCnt
(
eltIndex
)
==
MAX_ELT_GLYPH_COUNT
)
{
eltIndex
=
eltList
.
getNextIndex
();
eltList
.
setCharCnt
(
eltIndex
,
1
);
...
...
@@ -101,7 +108,7 @@ public class XRTextRenderer extends GlyphListPipe {
eltList
.
setGlyphSet
(
eltIndex
,
glyphSet
);
if
(
gl
.
usePositions
())
{
//
/*In this case advX only stores rounding errors*/
//
In this case advX only stores rounding errors
float
x
=
positions
[
i
*
2
]
+
advX
;
float
y
=
positions
[
i
*
2
+
1
]
+
advY
;
posX
=
(
int
)
Math
.
floor
(
x
);
...
...
@@ -120,16 +127,14 @@ public class XRTextRenderer extends GlyphListPipe {
posX
=
(
int
)
Math
.
floor
(
advX
);
posY
=
(
int
)
Math
.
floor
(
advY
);
// Advance of ELT = difference between stored
// relative
// Advance of ELT = difference between stored relative
// positioning information and required float.
advX
+=
(
cacheEntry
.
getXAdvance
()
-
cacheEntry
.
getXOff
());
advY
+=
(
cacheEntry
.
getYAdvance
()
-
cacheEntry
.
getYOff
());
}
/*
* Offset of the current glyph is the difference to the last
* glyph and this one
*/
// Offset of the current glyph is the difference
// to the last glyph and this one
eltList
.
setXOff
(
eltIndex
,
(
posX
-
oldPosX
));
eltList
.
setYOff
(
eltIndex
,
(
posY
-
oldPosY
));
...
...
test/java/awt/Graphics2D/DrawString/XRenderElt254TextTest.java
0 → 100644
浏览文件 @
6365ccf2
/*
* Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
import
java.awt.*
;
import
java.awt.MultipleGradientPaint.*
;
import
java.awt.image.*
;
import
java.io.*
;
import
javax.imageio.*
;
import
javax.swing.*
;
/**
* @test
* @bug 8028722
* @summary tests wether drawString with 254 characters causes the xrender
* pipeline to hang.
* @author ceisserer
*/
public
class
XRenderElt254TextTest
extends
Frame
implements
Runnable
{
public
volatile
boolean
success
=
false
;
public
void
run
()
{
Image
dstImg
=
getGraphicsConfiguration
().
createCompatibleVolatileImage
(
400
,
400
);
Graphics2D
g
=
(
Graphics2D
)
dstImg
.
getGraphics
();
StringBuilder
strBuilder
=
new
StringBuilder
(
254
);
for
(
int
c
=
0
;
c
<
254
;
c
++)
{
strBuilder
.
append
(
'a'
);
}
for
(
int
i
=
0
;
i
<
100
;
i
++)
{
g
.
drawString
(
strBuilder
.
toString
(),
20
,
20
);
Toolkit
.
getDefaultToolkit
().
sync
();
}
success
=
true
;
}
public
static
void
main
(
String
[]
args
)
throws
Exception
{
XRenderElt254TextTest
test
=
new
XRenderElt254TextTest
();
new
Thread
(
test
).
start
();
for
(
int
i
=
0
;
i
<
30
;
i
++)
{
Thread
.
sleep
(
1000
);
if
(
test
.
success
)
{
return
;
// Test finished successful
}
}
throw
new
RuntimeException
(
"Test Failed"
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录