Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
liujiuri
engine
提交
9b0b743c
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,发现更多精彩内容 >>
提交
9b0b743c
编写于
2月 25, 2016
作者:
A
Adam Barth
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2424 from abarth/rev_skia
Update Skia
上级
008964f2
d2ab5b44
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
4 addition
and
10 deletion
+4
-10
DEPS
DEPS
+1
-1
skia/BUILD.gn
skia/BUILD.gn
+1
-4
skia/ext/SkMemory_new_handler.cpp
skia/ext/SkMemory_new_handler.cpp
+1
-2
sky/engine/platform/fonts/harfbuzz/HarfBuzzFaceSkia.cpp
sky/engine/platform/fonts/harfbuzz/HarfBuzzFaceSkia.cpp
+0
-1
sky/engine/platform/fonts/skia/SimpleFontDataSkia.cpp
sky/engine/platform/fonts/skia/SimpleFontDataSkia.cpp
+1
-2
未找到文件。
DEPS
浏览文件 @
9b0b743c
...
...
@@ -22,7 +22,7 @@ vars = {
'mojo_sdk_revision': '172be18ea745ab29aea132e6cb952e726dc32543',
'mojo_devtools_revision': '49879d78ce4486e10c2214a101d9b2e82794b2f4',
'base_revision': '6c89618151eb0e23d330778e6d6ea16fc6105010',
'skia_revision': '
609d97918788c077514f190b0f1087ccbd420f5d
',
'skia_revision': '
f6bfccd562f4ac071db9902097ad4bea83294085
',
# Note: When updating the Dart revision, ensure that all entries that are
# dependencies of dart are also updated
...
...
skia/BUILD.gn
浏览文件 @
9b0b743c
...
...
@@ -95,6 +95,7 @@ config("skia_config") {
"config",
"ext",
"//third_party/skia/include/c",
"//third_party/skia/include/client/android",
"//third_party/skia/include/config",
"//third_party/skia/include/core",
"//third_party/skia/include/effects",
...
...
@@ -317,8 +318,6 @@ component("skia") {
# Remove unused util files include in utils.gypi
sources -= [
"//third_party/skia/src/utils/SkBitmapHasher.cpp",
"//third_party/skia/src/utils/SkBitmapHasher.h",
"//third_party/skia/src/utils/SkBoundaryPatch.cpp",
"//third_party/skia/src/utils/SkCamera.cpp",
"//third_party/skia/src/utils/SkCanvasStack.h",
...
...
@@ -333,8 +332,6 @@ component("skia") {
"//third_party/skia/src/utils/SkNinePatch.cpp",
"//third_party/skia/src/utils/SkOSFile.cpp",
"//third_party/skia/src/utils/SkParsePath.cpp",
"//third_party/skia/src/utils/SkSHA1.cpp",
"//third_party/skia/src/utils/SkSHA1.h",
"//third_party/skia/src/utils/SkTFitsIn.h",
#testing
...
...
skia/ext/SkMemory_new_handler.cpp
浏览文件 @
9b0b743c
...
...
@@ -23,8 +23,7 @@ static inline void* throw_on_failure(size_t size, void* p) {
return
p
;
}
void
sk_throw
()
{
SkASSERT
(
!
"sk_throw"
);
void
sk_abort_no_print
()
{
abort
();
}
...
...
sky/engine/platform/fonts/harfbuzz/HarfBuzzFaceSkia.cpp
浏览文件 @
9b0b743c
...
...
@@ -39,7 +39,6 @@
#include "third_party/skia/include/core/SkPoint.h"
#include "third_party/skia/include/core/SkRect.h"
#include "third_party/skia/include/core/SkTypeface.h"
#include "third_party/skia/include/core/SkUtils.h"
#include "hb.h"
#include "sky/engine/wtf/HashMap.h"
...
...
sky/engine/platform/fonts/skia/SimpleFontDataSkia.cpp
浏览文件 @
9b0b743c
...
...
@@ -40,7 +40,6 @@
#include "third_party/skia/include/core/SkPath.h"
#include "third_party/skia/include/core/SkTypeface.h"
#include "third_party/skia/include/core/SkTypes.h"
#include "third_party/skia/include/core/SkUtils.h"
namespace
blink
{
...
...
@@ -276,7 +275,7 @@ bool SimpleFontData::canRenderCombiningCharacterSequence(const UChar* characters
bool
SimpleFontData
::
fillGlyphPage
(
GlyphPage
*
pageToFill
,
unsigned
offset
,
unsigned
length
,
UChar
*
buffer
,
unsigned
bufferLength
)
const
{
if
(
SkUTF16_IsHighSurrogate
(
buffer
[
bufferLength
-
1
]))
{
if
(
U16_IS_LEAD
(
buffer
[
bufferLength
-
1
]))
{
SkDebugf
(
"%s last char is high-surrogate"
,
__FUNCTION__
);
return
false
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录