Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
bde204b6
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
3
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
bde204b6
编写于
3月 23, 2009
作者:
P
prr
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
6745225: Memory leak while drawing Attributed String
Reviewed-by: jgodinez, dougfelt
上级
f7208fec
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
111 addition
and
4 deletion
+111
-4
src/share/classes/sun/font/FileFontStrike.java
src/share/classes/sun/font/FileFontStrike.java
+19
-4
src/share/classes/sun/font/GlyphLayout.java
src/share/classes/sun/font/GlyphLayout.java
+2
-0
test/java/awt/font/LineBreakMeasurer/FRCTest.java
test/java/awt/font/LineBreakMeasurer/FRCTest.java
+90
-0
未找到文件。
src/share/classes/sun/font/FileFontStrike.java
浏览文件 @
bde204b6
...
...
@@ -26,6 +26,7 @@
package
sun.font
;
import
java.lang.ref.SoftReference
;
import
java.lang.ref.WeakReference
;
import
java.awt.Font
;
import
java.awt.GraphicsEnvironment
;
import
java.awt.Rectangle
;
...
...
@@ -842,15 +843,29 @@ public class FileFontStrike extends PhysicalStrike {
return
fileFont
.
getGlyphOutlineBounds
(
pScalerContext
,
glyphCode
);
}
private
ConcurrentHashMap
<
Integer
,
GeneralPath
>
outlineMap
;
private
WeakReference
<
ConcurrentHashMap
<
Integer
,
GeneralPath
>>
outlineMapRef
;
GeneralPath
getGlyphOutline
(
int
glyphCode
,
float
x
,
float
y
)
{
if
(
outlineMap
==
null
)
{
outlineMap
=
new
ConcurrentHashMap
<
Integer
,
GeneralPath
>();
GeneralPath
gp
=
null
;
ConcurrentHashMap
<
Integer
,
GeneralPath
>
outlineMap
=
null
;
if
(
outlineMapRef
!=
null
)
{
outlineMap
=
outlineMapRef
.
get
();
if
(
outlineMap
!=
null
)
{
gp
=
(
GeneralPath
)
outlineMap
.
get
(
glyphCode
);
}
}
GeneralPath
gp
=
(
GeneralPath
)
outlineMap
.
get
(
glyphCode
);
if
(
gp
==
null
)
{
gp
=
fileFont
.
getGlyphOutline
(
pScalerContext
,
glyphCode
,
0
,
0
);
if
(
outlineMap
==
null
)
{
outlineMap
=
new
ConcurrentHashMap
<
Integer
,
GeneralPath
>();
outlineMapRef
=
new
WeakReference
<
ConcurrentHashMap
<
Integer
,
GeneralPath
>>(
outlineMap
);
}
outlineMap
.
put
(
glyphCode
,
gp
);
}
gp
=
(
GeneralPath
)
gp
.
clone
();
// mutable!
...
...
src/share/classes/sun/font/GlyphLayout.java
浏览文件 @
bde204b6
...
...
@@ -338,6 +338,8 @@ public final class GlyphLayout {
cache
=
new
ConcurrentHashMap
<
SDKey
,
SDCache
>(
10
);
cacheRef
=
new
SoftReference
<
ConcurrentHashMap
<
SDKey
,
SDCache
>>(
cache
);
}
else
if
(
cache
.
size
()
>=
512
)
{
cache
.
clear
();
}
cache
.
put
(
key
,
res
);
}
...
...
test/java/awt/font/LineBreakMeasurer/FRCTest.java
0 → 100644
浏览文件 @
bde204b6
/*
* Copyright 2008-9 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
/*
* @test
* @bug 6448405 6519513 6745225
* @summary static HashMap cache in LineBreakMeasurer can grow wihout bounds
* @run main/othervm/timeout=600 -client -Xms16m -Xmx16m FRCTest
*/
import
java.awt.*
;
import
java.awt.image.*
;
import
java.awt.font.*
;
import
java.awt.geom.*
;
import
java.text.*
;
import
java.util.Hashtable
;
public
class
FRCTest
{
static
AttributedString
vanGogh
=
new
AttributedString
(
"Many people believe that Vincent van Gogh painted his best works "
+
"during the two-year period he spent in Provence. Here is where he "
+
"painted The Starry Night--which some consider to be his greatest "
+
"work of all. However, as his artistic brilliance reached new "
+
"heights in Provence, his physical and mental health plummeted. "
,
new
Hashtable
());
public
static
void
main
(
String
[]
args
)
{
// First test the behaviour of Graphics2D.getFontRenderContext();
BufferedImage
bi
=
new
BufferedImage
(
1
,
1
,
BufferedImage
.
TYPE_INT_RGB
);
Graphics2D
g2d
=
bi
.
createGraphics
();
AffineTransform
g2dTx
=
new
AffineTransform
(
2
,
0
,
2
,
0
,
1
,
1
);
g2d
.
setTransform
(
g2dTx
);
AffineTransform
frcTx
=
g2d
.
getFontRenderContext
().
getTransform
();
AffineTransform
frcExpected
=
new
AffineTransform
(
2
,
0
,
2
,
0
,
0
,
0
);
if
(!
frcTx
.
equals
(
frcExpected
))
{
throw
new
RuntimeException
(
"FRC Tx may have translate?"
);
}
// Now test that using different translates with LBM is OK
// This test doesn't prove a lot since showing a leak really
// requires a basher test that can run for a long time.
for
(
int
x
=
0
;
x
<
100
;
x
++)
{
for
(
int
y
=
0
;
y
<
100
;
y
++)
{
AttributedCharacterIterator
aci
=
vanGogh
.
getIterator
();
AffineTransform
tx
=
AffineTransform
.
getTranslateInstance
(
x
,
y
);
FontRenderContext
frc
=
new
FontRenderContext
(
tx
,
false
,
false
);
LineBreakMeasurer
lbm
=
new
LineBreakMeasurer
(
aci
,
frc
);
lbm
.
setPosition
(
aci
.
getBeginIndex
());
while
(
lbm
.
getPosition
()
<
aci
.
getEndIndex
())
{
lbm
.
nextLayout
(
100
f
);
}
}
}
for
(
int
x
=
0
;
x
<
25
;
x
++)
{
for
(
int
y
=
0
;
y
<
25
;
y
++)
{
AttributedCharacterIterator
aci
=
vanGogh
.
getIterator
();
double
rot
=
Math
.
random
()*.
4
*
Math
.
PI
-
.
2
*
Math
.
PI
;
AffineTransform
tx
=
AffineTransform
.
getRotateInstance
(
rot
);
FontRenderContext
frc
=
new
FontRenderContext
(
tx
,
false
,
false
);
LineBreakMeasurer
lbm
=
new
LineBreakMeasurer
(
aci
,
frc
);
lbm
.
setPosition
(
aci
.
getBeginIndex
());
while
(
lbm
.
getPosition
()
<
aci
.
getEndIndex
())
{
lbm
.
nextLayout
(
100
f
);
}
}
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录