Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
liujiuri
engine
提交
ff8bbe4e
E
engine
项目概览
liujiuri
/
engine
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
engine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ff8bbe4e
编写于
7月 24, 2015
作者:
E
Eric Seidel
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #269 from eseidelGoogle/skia_roll
Roll Skia to the latest revision to pick up drawAtlas fix
上级
00823e6e
244cebd4
变更
9
显示空白变更内容
内联
并排
Showing
9 changed file
with
18 addition
and
17 deletion
+18
-17
DEPS
DEPS
+1
-1
skia/ext/analysis_canvas.cc
skia/ext/analysis_canvas.cc
+1
-1
skia/ext/analysis_canvas.h
skia/ext/analysis_canvas.h
+1
-1
skia/ext/benchmarking_canvas.cc
skia/ext/benchmarking_canvas.cc
+4
-3
skia/ext/benchmarking_canvas.h
skia/ext/benchmarking_canvas.h
+2
-2
skia/ext/pixel_ref_utils.cc
skia/ext/pixel_ref_utils.cc
+1
-1
sky/engine/core/painting/Canvas.cpp
sky/engine/core/painting/Canvas.cpp
+1
-1
sky/engine/platform/graphics/GraphicsContext.cpp
sky/engine/platform/graphics/GraphicsContext.cpp
+3
-3
sky/engine/platform/graphics/filters/FilterEffect.cpp
sky/engine/platform/graphics/filters/FilterEffect.cpp
+4
-4
未找到文件。
DEPS
浏览文件 @
ff8bbe4e
...
...
@@ -19,7 +19,7 @@
vars = {
'chromium_git': 'https://chromium.googlesource.com',
'skia_revision': '2
ced78866fcadd98895777c8dffe92e229775181
',
'skia_revision': '2
9ccdf86ab0a1649fd775c9431891bacb1391e99
',
'dart_revision': 'e5e3d161e70d862608e6597facdf5ac8ae9ab2c3',
'dart_observatory_packages_revision': 'cdc4b3d4c15b9c0c8e7702dff127b440afbb7485',
...
...
skia/ext/analysis_canvas.cc
浏览文件 @
ff8bbe4e
...
...
@@ -191,7 +191,7 @@ void AnalysisCanvas::onDrawBitmapRect(const SkBitmap&,
const
SkRect
*
src
,
const
SkRect
&
dst
,
const
SkPaint
*
paint
,
DrawBitmapRectFlags
flags
)
{
SrcRectConstraint
flags
)
{
// Call drawRect to determine transparency,
// but reset solid color to false.
SkPaint
tmpPaint
;
...
...
skia/ext/analysis_canvas.h
浏览文件 @
ff8bbe4e
...
...
@@ -48,7 +48,7 @@ class SK_API AnalysisCanvas : public SkCanvas,
const
SkRect
*
src
,
const
SkRect
&
dst
,
const
SkPaint
*
paint
,
DrawBitmapRectFlags
flags
)
override
;
SrcRectConstraint
flags
)
override
;
void
onDrawBitmapNine
(
const
SkBitmap
&
bitmap
,
const
SkIRect
&
center
,
const
SkRect
&
dst
,
...
...
skia/ext/benchmarking_canvas.cc
浏览文件 @
ff8bbe4e
...
...
@@ -702,7 +702,7 @@ void BenchmarkingCanvas::onDrawBitmapRect(const SkBitmap& bitmap,
const
SkRect
*
src
,
const
SkRect
&
dst
,
const
SkPaint
*
paint
,
DrawBitmapRectFlags
flags
)
{
SrcRectConstraint
flags
)
{
AutoOp
op
(
this
,
"DrawBitmapRect"
,
paint
);
op
.
addParam
(
"bitmap"
,
AsValue
(
bitmap
));
if
(
src
)
...
...
@@ -726,7 +726,8 @@ void BenchmarkingCanvas::onDrawImage(const SkImage* image,
}
void
BenchmarkingCanvas
::
onDrawImageRect
(
const
SkImage
*
image
,
const
SkRect
*
src
,
const
SkRect
&
dst
,
const
SkPaint
*
paint
)
{
const
SkRect
&
dst
,
const
SkPaint
*
paint
,
SrcRectConstraint
flags
)
{
DCHECK
(
image
);
AutoOp
op
(
this
,
"DrawImageRect"
,
paint
);
op
.
addParam
(
"image"
,
AsValue
(
*
image
));
...
...
@@ -734,7 +735,7 @@ void BenchmarkingCanvas::onDrawImageRect(const SkImage* image, const SkRect* src
op
.
addParam
(
"src"
,
AsValue
(
*
src
));
op
.
addParam
(
"dst"
,
AsValue
(
dst
));
INHERITED
::
onDrawImageRect
(
image
,
src
,
dst
,
op
.
paint
());
INHERITED
::
onDrawImageRect
(
image
,
src
,
dst
,
op
.
paint
()
,
flags
);
}
void
BenchmarkingCanvas
::
onDrawBitmapNine
(
const
SkBitmap
&
bitmap
,
...
...
skia/ext/benchmarking_canvas.h
浏览文件 @
ff8bbe4e
...
...
@@ -60,10 +60,10 @@ protected:
void
onDrawBitmap
(
const
SkBitmap
&
,
SkScalar
left
,
SkScalar
top
,
const
SkPaint
*
)
override
;
void
onDrawBitmapRect
(
const
SkBitmap
&
,
const
SkRect
*
src
,
const
SkRect
&
dst
,
const
SkPaint
*
,
DrawBitmapRectFlags
flags
)
override
;
const
SkPaint
*
,
SrcRectConstraint
flags
)
override
;
void
onDrawImage
(
const
SkImage
*
,
SkScalar
left
,
SkScalar
top
,
const
SkPaint
*
)
override
;
void
onDrawImageRect
(
const
SkImage
*
,
const
SkRect
*
src
,
const
SkRect
&
dst
,
const
SkPaint
*
)
override
;
const
SkPaint
*
,
SrcRectConstraint
flags
)
override
;
void
onDrawBitmapNine
(
const
SkBitmap
&
,
const
SkIRect
&
center
,
const
SkRect
&
dst
,
const
SkPaint
*
)
override
;
void
onDrawSprite
(
const
SkBitmap
&
,
int
left
,
int
top
,
const
SkPaint
*
)
override
;
...
...
skia/ext/pixel_ref_utils.cc
浏览文件 @
ff8bbe4e
...
...
@@ -146,7 +146,7 @@ class GatherPixelRefDevice : public SkBitmapDevice {
const
SkRect
*
src_or_null
,
const
SkRect
&
dst
,
const
SkPaint
&
paint
,
SkCanvas
::
DrawBitmapRectFlags
flags
)
override
{
SkCanvas
::
SrcRectConstraint
flags
)
override
{
SkRect
bitmap_rect
=
SkRect
::
MakeWH
(
bitmap
.
width
(),
bitmap
.
height
());
SkMatrix
matrix
;
matrix
.
setRectToRect
(
bitmap_rect
,
dst
,
SkMatrix
::
kFill_ScaleToFit
);
...
...
sky/engine/core/painting/Canvas.cpp
浏览文件 @
ff8bbe4e
...
...
@@ -226,7 +226,7 @@ void Canvas::drawImageRect(const CanvasImage* image, Rect& src, Rect& dst, Paint
if
(
!
m_canvas
)
return
;
ASSERT
(
image
);
m_canvas
->
drawBitmapRect
ToRect
(
image
->
bitmap
(),
&
src
.
sk_rect
,
dst
.
sk_rect
,
&
paint
->
paint
());
m_canvas
->
drawBitmapRect
(
image
->
bitmap
(),
&
src
.
sk_rect
,
dst
.
sk_rect
,
&
paint
->
paint
());
}
void
Canvas
::
drawPicture
(
Picture
*
picture
)
...
...
sky/engine/platform/graphics/GraphicsContext.cpp
浏览文件 @
ff8bbe4e
...
...
@@ -967,10 +967,10 @@ void GraphicsContext::drawBitmapRect(const SkBitmap& bitmap, const SkRect* src,
if
(
contextDisabled
())
return
;
SkCanvas
::
DrawBitmapRectFlags
flags
=
immutableState
()
->
shouldClampToSourceRect
()
?
SkCanvas
::
k
None_DrawBitmapRectFlag
:
SkCanvas
::
kBleed_DrawBitmapRectFlag
;
SkCanvas
::
SrcRectConstraint
flags
=
immutableState
()
->
shouldClampToSourceRect
()
?
SkCanvas
::
k
Strict_SrcRectConstraint
:
SkCanvas
::
kFast_SrcRectConstraint
;
m_canvas
->
drawBitmapRect
ToRect
(
bitmap
,
src
,
dst
,
paint
,
flags
);
m_canvas
->
drawBitmapRect
(
bitmap
,
src
,
dst
,
paint
,
flags
);
if
(
regionTrackingEnabled
())
m_trackedRegion
.
didDrawRect
(
this
,
dst
,
*
paint
,
&
bitmap
);
...
...
sky/engine/platform/graphics/filters/FilterEffect.cpp
浏览文件 @
ff8bbe4e
...
...
@@ -556,20 +556,20 @@ SkImageFilter::CropRect FilterEffect::getCropRect(const FloatSize& cropOffset) c
if
(
hasX
())
{
rect
.
setX
(
boundaries
.
x
());
flags
|=
SkImageFilter
::
CropRect
::
kHasLeft_CropEdge
;
flags
|=
SkImageFilter
::
CropRect
::
kHas
Right
_CropEdge
;
flags
|=
SkImageFilter
::
CropRect
::
kHas
Width
_CropEdge
;
}
if
(
hasY
())
{
rect
.
setY
(
boundaries
.
y
());
flags
|=
SkImageFilter
::
CropRect
::
kHasTop_CropEdge
;
flags
|=
SkImageFilter
::
CropRect
::
kHas
Bottom
_CropEdge
;
flags
|=
SkImageFilter
::
CropRect
::
kHas
Height
_CropEdge
;
}
if
(
hasWidth
())
{
rect
.
setWidth
(
boundaries
.
width
());
flags
|=
SkImageFilter
::
CropRect
::
kHas
Right
_CropEdge
;
flags
|=
SkImageFilter
::
CropRect
::
kHas
Width
_CropEdge
;
}
if
(
hasHeight
())
{
rect
.
setHeight
(
boundaries
.
height
());
flags
|=
SkImageFilter
::
CropRect
::
kHas
Bottom
_CropEdge
;
flags
|=
SkImageFilter
::
CropRect
::
kHas
Height
_CropEdge
;
}
rect
.
scale
(
filter
()
->
absoluteTransform
().
a
(),
filter
()
->
absoluteTransform
().
d
());
return
SkImageFilter
::
CropRect
(
rect
,
flags
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录