Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
沉迷打码的小凳子
glide
提交
1bd66cb3
G
glide
项目概览
沉迷打码的小凳子
/
glide
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
glide
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1bd66cb3
编写于
11月 24, 2014
作者:
S
Sam Judd
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Always return new copy in DrawableResource.
Fixes #276
上级
b6763aea
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
9 addition
and
29 deletion
+9
-29
library/src/androidTest/java/com/bumptech/glide/load/resource/drawable/DrawableResourceTest.java
...ch/glide/load/resource/drawable/DrawableResourceTest.java
+5
-4
library/src/androidTest/java/com/bumptech/glide/load/resource/gif/GifDrawableResourceTest.java
...tech/glide/load/resource/gif/GifDrawableResourceTest.java
+0
-17
library/src/main/java/com/bumptech/glide/load/resource/drawable/DrawableResource.java
...mptech/glide/load/resource/drawable/DrawableResource.java
+4
-8
未找到文件。
library/src/androidTest/java/com/bumptech/glide/load/resource/drawable/DrawableResourceTest.java
浏览文件 @
1bd66cb3
package
com.bumptech.glide.load.resource.drawable
;
package
com.bumptech.glide.load.resource.drawable
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
static
org
.
junit
.
Assert
.
assertNotEquals
;
import
static
org
.
mockito
.
Mockito
.
mock
;
import
static
org
.
mockito
.
Mockito
.
mock
;
import
static
org
.
mockito
.
Mockito
.
verify
;
import
static
org
.
mockito
.
Mockito
.
verify
;
import
static
org
.
mockito
.
Mockito
.
when
;
import
static
org
.
mockito
.
Mockito
.
when
;
...
@@ -38,18 +39,18 @@ public class DrawableResourceTest {
...
@@ -38,18 +39,18 @@ public class DrawableResourceTest {
}
}
@Test
@Test
public
void
testReturnsDrawableOnFirstGet
()
{
public
void
testDoesNotReturnOriginalDrawableOnGet
()
{
assertEquals
(
drawable
,
resource
.
get
());
when
(
drawable
.
getConstantState
()).
thenReturn
(
mock
(
Drawable
.
ConstantState
.
class
));
assertNotEquals
(
drawable
,
resource
.
get
());
}
}
@Test
@Test
public
void
testReturnsNewDrawableOn
Second
Get
()
{
public
void
testReturnsNewDrawableOnGet
()
{
GifDrawable
expected
=
mock
(
GifDrawable
.
class
);
GifDrawable
expected
=
mock
(
GifDrawable
.
class
);
Drawable
.
ConstantState
constantState
=
mock
(
Drawable
.
ConstantState
.
class
);
Drawable
.
ConstantState
constantState
=
mock
(
Drawable
.
ConstantState
.
class
);
when
(
constantState
.
newDrawable
()).
thenReturn
(
expected
);
when
(
constantState
.
newDrawable
()).
thenReturn
(
expected
);
when
(
drawable
.
getConstantState
()).
thenReturn
(
constantState
);
when
(
drawable
.
getConstantState
()).
thenReturn
(
constantState
);
assertEquals
(
drawable
,
resource
.
get
());
assertEquals
(
expected
,
resource
.
get
());
assertEquals
(
expected
,
resource
.
get
());
verify
(
drawable
).
getConstantState
();
verify
(
drawable
).
getConstantState
();
...
...
library/src/androidTest/java/com/bumptech/glide/load/resource/gif/GifDrawableResourceTest.java
浏览文件 @
1bd66cb3
...
@@ -6,7 +6,6 @@ import static org.mockito.Mockito.mock;
...
@@ -6,7 +6,6 @@ import static org.mockito.Mockito.mock;
import
static
org
.
mockito
.
Mockito
.
when
;
import
static
org
.
mockito
.
Mockito
.
when
;
import
android.graphics.Bitmap
;
import
android.graphics.Bitmap
;
import
android.graphics.drawable.Drawable
;
import
com.bumptech.glide.util.Util
;
import
com.bumptech.glide.util.Util
;
...
@@ -29,22 +28,6 @@ public class GifDrawableResourceTest {
...
@@ -29,22 +28,6 @@ public class GifDrawableResourceTest {
resource
=
new
GifDrawableResource
(
drawable
);
resource
=
new
GifDrawableResource
(
drawable
);
}
}
@Test
public
void
testReturnsDrawableOnFirstGet
()
{
assertEquals
(
drawable
,
resource
.
get
());
}
@Test
public
void
testReturnsNewDrawableOnSecondGet
()
{
GifDrawable
expected
=
mock
(
GifDrawable
.
class
);
Drawable
.
ConstantState
constantState
=
mock
(
Drawable
.
ConstantState
.
class
);
when
(
constantState
.
newDrawable
()).
thenReturn
(
expected
);
when
(
drawable
.
getConstantState
()).
thenReturn
(
constantState
);
resource
.
get
();
assertEquals
(
expected
,
resource
.
get
());
}
@Test
@Test
public
void
testReturnsDrawableSizePlusFirstFrameSize
()
{
public
void
testReturnsDrawableSizePlusFirstFrameSize
()
{
final
int
size
=
2134
;
final
int
size
=
2134
;
...
...
library/src/main/java/com/bumptech/glide/load/resource/drawable/DrawableResource.java
浏览文件 @
1bd66cb3
...
@@ -15,7 +15,6 @@ import com.bumptech.glide.load.engine.Resource;
...
@@ -15,7 +15,6 @@ import com.bumptech.glide.load.engine.Resource;
*/
*/
public
abstract
class
DrawableResource
<
T
extends
Drawable
>
implements
Resource
<
T
>
{
public
abstract
class
DrawableResource
<
T
extends
Drawable
>
implements
Resource
<
T
>
{
protected
final
T
drawable
;
protected
final
T
drawable
;
private
boolean
returnedOriginalDrawable
;
public
DrawableResource
(
T
drawable
)
{
public
DrawableResource
(
T
drawable
)
{
if
(
drawable
==
null
)
{
if
(
drawable
==
null
)
{
...
@@ -25,14 +24,11 @@ public abstract class DrawableResource<T extends Drawable> implements Resource<T
...
@@ -25,14 +24,11 @@ public abstract class DrawableResource<T extends Drawable> implements Resource<T
}
}
@SuppressWarnings
(
"unchecked"
)
@SuppressWarnings
(
"unchecked"
)
// drawables should always return a copy of the same class
@Override
@Override
public
final
T
get
()
{
public
final
T
get
()
{
if
(!
returnedOriginalDrawable
)
{
// Drawables contain temporary state related to how they're being displayed (alpha, color filter etc), so
returnedOriginalDrawable
=
true
;
// return a new copy each time. If we ever return the original drawable, it's temporary state may be changed
return
drawable
;
// and subsequent copies may end up with that temporary state. See #276.
}
else
{
return
(
T
)
drawable
.
getConstantState
().
newDrawable
();
return
(
T
)
drawable
.
getConstantState
().
newDrawable
();
}
}
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录