Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_43355755
engine
提交
33da97b1
E
engine
项目概览
weixin_43355755
/
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,发现更多精彩内容 >>
提交
33da97b1
编写于
8月 05, 2016
作者:
A
Adam Barth
提交者:
GitHub
8月 05, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove more //base dependencies (#2880)
上级
52b4d62e
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
113 addition
and
115 deletion
+113
-115
DEPS
DEPS
+1
-1
flutter/lib/jni/dart_jni.h
flutter/lib/jni/dart_jni.h
+8
-8
flutter/lib/jni/jni_api.cc
flutter/lib/jni/jni_api.cc
+2
-2
flutter/lib/jni/jni_array.cc
flutter/lib/jni/jni_array.cc
+28
-28
flutter/lib/jni/jni_class.cc
flutter/lib/jni/jni_class.cc
+36
-36
flutter/lib/jni/jni_object.cc
flutter/lib/jni/jni_object.cc
+29
-29
flutter/lib/jni/jni_object.h
flutter/lib/jni/jni_object.h
+0
-1
flutter/lib/jni/jni_string.cc
flutter/lib/jni/jni_string.cc
+2
-2
flutter/tonic/dart_dependency_catcher.h
flutter/tonic/dart_dependency_catcher.h
+2
-2
flutter/tonic/dart_io.h
flutter/tonic/dart_io.h
+2
-2
sky/engine/core/script/dart_debugger.cc
sky/engine/core/script/dart_debugger.cc
+3
-4
未找到文件。
DEPS
浏览文件 @
33da97b1
...
...
@@ -50,7 +50,7 @@ deps = {
# and not have to specific specific hashes.
'src/lib/ftl':
Var('fuchsia_git') + '/ftl' + '@' + '
be8fe290130170e78cbd3cedbf2ba580c22ced43
',
Var('fuchsia_git') + '/ftl' + '@' + '
523fd939b3e34ded3f364d9190a1ff01d1465ac7
',
'src/lib/tonic':
Var('fuchsia_git') + '/tonic' + '@' + 'b590c06d2076b6c35b737fa5412f54387251588b',
...
...
flutter/lib/jni/dart_jni.h
浏览文件 @
33da97b1
...
...
@@ -9,17 +9,16 @@
#include "base/android/jni_android.h"
#include "base/android/jni_utils.h"
#include "base/memory/ref_counted.h"
#include "lib/tonic/dart_library_natives.h"
#include "lib/tonic/dart_wrappable.h"
#define ENTER_JNI()
\
JNIEnv* env = base::android::AttachCurrentThread();
\
#define ENTER_JNI() \
JNIEnv* env = base::android::AttachCurrentThread(); \
base::android::ScopedJavaLocalFrame java_frame(env);
namespace
blink
{
bool
CheckJniException
(
JNIEnv
*
env
,
Dart_Handle
*
exception
);
bool
CheckJniException
(
JNIEnv
*
env
,
Dart_Handle
*
exception
);
bool
CheckDartException
(
Dart_Handle
result
,
Dart_Handle
*
exception
);
// Data cached for each Dart isolate.
...
...
@@ -37,12 +36,13 @@ class DartJni {
static
bool
InitJni
();
static
void
OnThreadExit
();
static
base
::
android
::
ScopedJavaLocalRef
<
jclass
>
GetClass
(
JNIEnv
*
env
,
const
char
*
name
);
static
base
::
android
::
ScopedJavaLocalRef
<
jclass
>
GetClass
(
JNIEnv
*
env
,
const
char
*
name
);
static
std
::
string
GetObjectClassName
(
JNIEnv
*
env
,
jobject
obj
);
static
jstring
DartToJavaString
(
JNIEnv
*
env
,
Dart_Handle
dart_string
,
static
jstring
DartToJavaString
(
JNIEnv
*
env
,
Dart_Handle
dart_string
,
Dart_Handle
*
exception
);
static
jobject
class_loader
();
...
...
@@ -66,7 +66,7 @@ class JniMethodArgs {
std
::
vector
<
jvalue
>
jvalues_
;
};
}
// namespace blink
}
// namespace blink
namespace
tonic
{
...
...
flutter/lib/jni/jni_api.cc
浏览文件 @
33da97b1
...
...
@@ -20,7 +20,7 @@ int64_t JniApi::FromReflectedField(const JniObject* field) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
0
;
}
...
...
@@ -36,7 +36,7 @@ int64_t JniApi::FromReflectedMethod(const JniObject* method) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
0
;
}
...
...
flutter/lib/jni/jni_array.cc
浏览文件 @
33da97b1
...
...
@@ -27,7 +27,7 @@ jsize JniArray::GetLength() {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
0
;
}
...
...
@@ -58,7 +58,7 @@ ftl::RefPtr<JniObjectArray> JniObjectArray::Create(const JniClass* clazz,
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
nullptr
;
}
...
...
@@ -75,7 +75,7 @@ ftl::RefPtr<JniObject> JniObjectArray::GetArrayElement(jsize index) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
nullptr
;
}
...
...
@@ -93,7 +93,7 @@ void JniObjectArray::SetArrayElement(jsize index, const JniObject* value) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
;
}
...
...
@@ -117,7 +117,7 @@ ftl::RefPtr<JniBooleanArray> JniBooleanArray::Create(jsize length) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
nullptr
;
}
...
...
@@ -135,7 +135,7 @@ bool JniBooleanArray::GetArrayElement(jsize index) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
false
;
}
...
...
@@ -154,7 +154,7 @@ void JniBooleanArray::SetArrayElement(jsize index, bool value) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
;
}
...
...
@@ -178,7 +178,7 @@ ftl::RefPtr<JniByteArray> JniByteArray::Create(jsize length) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
nullptr
;
}
...
...
@@ -196,7 +196,7 @@ int64_t JniByteArray::GetArrayElement(jsize index) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
false
;
}
...
...
@@ -214,7 +214,7 @@ void JniByteArray::SetArrayElement(jsize index, int64_t value) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
;
}
...
...
@@ -238,7 +238,7 @@ ftl::RefPtr<JniCharArray> JniCharArray::Create(jsize length) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
nullptr
;
}
...
...
@@ -256,7 +256,7 @@ int64_t JniCharArray::GetArrayElement(jsize index) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
false
;
}
...
...
@@ -274,7 +274,7 @@ void JniCharArray::SetArrayElement(jsize index, int64_t value) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
;
}
...
...
@@ -298,7 +298,7 @@ ftl::RefPtr<JniShortArray> JniShortArray::Create(jsize length) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
nullptr
;
}
...
...
@@ -316,7 +316,7 @@ int64_t JniShortArray::GetArrayElement(jsize index) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
false
;
}
...
...
@@ -334,7 +334,7 @@ void JniShortArray::SetArrayElement(jsize index, int64_t value) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
;
}
...
...
@@ -357,7 +357,7 @@ ftl::RefPtr<JniIntArray> JniIntArray::Create(jsize length) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
nullptr
;
}
...
...
@@ -375,7 +375,7 @@ int64_t JniIntArray::GetArrayElement(jsize index) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
false
;
}
...
...
@@ -393,7 +393,7 @@ void JniIntArray::SetArrayElement(jsize index, int64_t value) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
;
}
...
...
@@ -417,7 +417,7 @@ ftl::RefPtr<JniLongArray> JniLongArray::Create(jsize length) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
nullptr
;
}
...
...
@@ -435,7 +435,7 @@ int64_t JniLongArray::GetArrayElement(jsize index) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
false
;
}
...
...
@@ -453,7 +453,7 @@ void JniLongArray::SetArrayElement(jsize index, int64_t value) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
;
}
...
...
@@ -477,7 +477,7 @@ ftl::RefPtr<JniFloatArray> JniFloatArray::Create(jsize length) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
nullptr
;
}
...
...
@@ -495,7 +495,7 @@ double JniFloatArray::GetArrayElement(jsize index) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
false
;
}
...
...
@@ -513,7 +513,7 @@ void JniFloatArray::SetArrayElement(jsize index, double value) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
;
}
...
...
@@ -537,7 +537,7 @@ ftl::RefPtr<JniDoubleArray> JniDoubleArray::Create(jsize length) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
nullptr
;
}
...
...
@@ -555,7 +555,7 @@ double JniDoubleArray::GetArrayElement(jsize index) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
false
;
}
...
...
@@ -572,7 +572,7 @@ void JniDoubleArray::SetArrayElement(jsize index, double value) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
;
}
...
...
flutter/lib/jni/jni_class.cc
浏览文件 @
33da97b1
...
...
@@ -33,7 +33,7 @@ ftl::RefPtr<JniClass> JniClass::FromName(const char* name) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
nullptr
;
}
...
...
@@ -56,7 +56,7 @@ ftl::RefPtr<JniClass> JniClass::FromClassObject(const JniObject* clazz) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
nullptr
;
}
...
...
@@ -73,7 +73,7 @@ intptr_t JniClass::GetFieldId(const char* name, const char* sig) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
0
;
}
...
...
@@ -90,7 +90,7 @@ intptr_t JniClass::GetStaticFieldId(const char* name, const char* sig) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
0
;
}
...
...
@@ -107,7 +107,7 @@ intptr_t JniClass::GetMethodId(const char* name, const char* sig) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
0
;
}
...
...
@@ -124,7 +124,7 @@ intptr_t JniClass::GetStaticMethodId(const char* name, const char* sig) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
0
;
}
...
...
@@ -148,7 +148,7 @@ ftl::RefPtr<JniObject> JniClass::NewObject(
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
nullptr
;
}
...
...
@@ -165,7 +165,7 @@ bool JniClass::IsAssignable(const JniClass* clazz) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
false
;
}
...
...
@@ -182,7 +182,7 @@ ftl::RefPtr<JniObject> JniClass::GetStaticObjectField(jfieldID fieldId) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
nullptr
;
}
...
...
@@ -199,7 +199,7 @@ bool JniClass::GetStaticBooleanField(jfieldID fieldId) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
false
;
}
...
...
@@ -216,7 +216,7 @@ int64_t JniClass::GetStaticByteField(jfieldID fieldId) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
0
;
}
...
...
@@ -233,7 +233,7 @@ int64_t JniClass::GetStaticCharField(jfieldID fieldId) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
0
;
}
...
...
@@ -250,7 +250,7 @@ int64_t JniClass::GetStaticShortField(jfieldID fieldId) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
0
;
}
...
...
@@ -267,7 +267,7 @@ int64_t JniClass::GetStaticIntField(jfieldID fieldId) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
0
;
}
...
...
@@ -284,7 +284,7 @@ int64_t JniClass::GetStaticLongField(jfieldID fieldId) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
0
;
}
...
...
@@ -301,7 +301,7 @@ double JniClass::GetStaticFloatField(jfieldID fieldId) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
0
;
}
...
...
@@ -318,7 +318,7 @@ double JniClass::GetStaticDoubleField(jfieldID fieldId) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
0
;
}
...
...
@@ -336,7 +336,7 @@ void JniClass::SetStaticObjectField(jfieldID fieldId, const JniObject* value) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
;
}
...
...
@@ -354,7 +354,7 @@ void JniClass::SetStaticBooleanField(jfieldID fieldId, bool value) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
;
}
...
...
@@ -371,7 +371,7 @@ void JniClass::SetStaticByteField(jfieldID fieldId, int64_t value) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
;
}
...
...
@@ -388,7 +388,7 @@ void JniClass::SetStaticCharField(jfieldID fieldId, int64_t value) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
;
}
...
...
@@ -405,7 +405,7 @@ void JniClass::SetStaticShortField(jfieldID fieldId, int64_t value) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
;
}
...
...
@@ -422,7 +422,7 @@ void JniClass::SetStaticIntField(jfieldID fieldId, int64_t value) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
;
}
...
...
@@ -439,7 +439,7 @@ void JniClass::SetStaticLongField(jfieldID fieldId, int64_t value) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
;
}
...
...
@@ -456,7 +456,7 @@ void JniClass::SetStaticFloatField(jfieldID fieldId, double value) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
;
}
...
...
@@ -473,7 +473,7 @@ void JniClass::SetStaticDoubleField(jfieldID fieldId, double value) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
;
}
...
...
@@ -498,7 +498,7 @@ ftl::RefPtr<JniObject> JniClass::CallStaticObjectMethod(
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
nullptr
;
}
...
...
@@ -522,7 +522,7 @@ bool JniClass::CallStaticBooleanMethod(jmethodID methodId,
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
false
;
}
...
...
@@ -546,7 +546,7 @@ int64_t JniClass::CallStaticByteMethod(jmethodID methodId,
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
0
;
}
...
...
@@ -570,7 +570,7 @@ int64_t JniClass::CallStaticCharMethod(jmethodID methodId,
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
0
;
}
...
...
@@ -594,7 +594,7 @@ int64_t JniClass::CallStaticShortMethod(jmethodID methodId,
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
0
;
}
...
...
@@ -618,7 +618,7 @@ int64_t JniClass::CallStaticIntMethod(jmethodID methodId,
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
0
;
}
...
...
@@ -642,7 +642,7 @@ int64_t JniClass::CallStaticLongMethod(jmethodID methodId,
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
0
;
}
...
...
@@ -666,7 +666,7 @@ double JniClass::CallStaticFloatMethod(jmethodID methodId,
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
0
;
}
...
...
@@ -690,7 +690,7 @@ double JniClass::CallStaticDoubleMethod(jmethodID methodId,
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
0
;
}
...
...
@@ -713,7 +713,7 @@ void JniClass::CallStaticVoidMethod(jmethodID methodId,
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
;
}
...
...
flutter/lib/jni/jni_object.cc
浏览文件 @
33da97b1
...
...
@@ -77,7 +77,7 @@ ftl::RefPtr<JniClass> JniObject::GetObjectClass() {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
nullptr
;
}
...
...
@@ -94,7 +94,7 @@ ftl::RefPtr<JniObject> JniObject::GetObjectField(jfieldID fieldId) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
nullptr
;
}
...
...
@@ -111,7 +111,7 @@ bool JniObject::GetBooleanField(jfieldID fieldId) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
false
;
}
...
...
@@ -128,7 +128,7 @@ int64_t JniObject::GetByteField(jfieldID fieldId) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
0
;
}
...
...
@@ -145,7 +145,7 @@ int64_t JniObject::GetCharField(jfieldID fieldId) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
0
;
}
...
...
@@ -162,7 +162,7 @@ int64_t JniObject::GetShortField(jfieldID fieldId) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
0
;
}
...
...
@@ -179,7 +179,7 @@ int64_t JniObject::GetIntField(jfieldID fieldId) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
0
;
}
...
...
@@ -196,7 +196,7 @@ int64_t JniObject::GetLongField(jfieldID fieldId) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
0
;
}
...
...
@@ -213,7 +213,7 @@ double JniObject::GetFloatField(jfieldID fieldId) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
0
;
}
...
...
@@ -230,7 +230,7 @@ double JniObject::GetDoubleField(jfieldID fieldId) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
0
;
}
...
...
@@ -248,7 +248,7 @@ void JniObject::SetObjectField(jfieldID fieldId, const JniObject* value) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
;
}
...
...
@@ -265,7 +265,7 @@ void JniObject::SetBooleanField(jfieldID fieldId, bool value) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
;
}
...
...
@@ -282,7 +282,7 @@ void JniObject::SetByteField(jfieldID fieldId, int64_t value) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
;
}
...
...
@@ -299,7 +299,7 @@ void JniObject::SetCharField(jfieldID fieldId, int64_t value) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
;
}
...
...
@@ -316,7 +316,7 @@ void JniObject::SetShortField(jfieldID fieldId, int64_t value) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
;
}
...
...
@@ -333,7 +333,7 @@ void JniObject::SetIntField(jfieldID fieldId, int64_t value) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
;
}
...
...
@@ -350,7 +350,7 @@ void JniObject::SetLongField(jfieldID fieldId, int64_t value) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
;
}
...
...
@@ -367,7 +367,7 @@ void JniObject::SetFloatField(jfieldID fieldId, double value) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
;
}
...
...
@@ -384,7 +384,7 @@ void JniObject::SetDoubleField(jfieldID fieldId, double value) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
;
}
...
...
@@ -409,7 +409,7 @@ ftl::RefPtr<JniObject> JniObject::CallObjectMethod(
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
nullptr
;
}
...
...
@@ -433,7 +433,7 @@ bool JniObject::CallBooleanMethod(jmethodID methodId,
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
false
;
}
...
...
@@ -457,7 +457,7 @@ int64_t JniObject::CallByteMethod(jmethodID methodId,
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
0
;
}
...
...
@@ -481,7 +481,7 @@ int64_t JniObject::CallCharMethod(jmethodID methodId,
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
0
;
}
...
...
@@ -505,7 +505,7 @@ int64_t JniObject::CallShortMethod(jmethodID methodId,
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
0
;
}
...
...
@@ -529,7 +529,7 @@ int64_t JniObject::CallIntMethod(jmethodID methodId,
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
0
;
}
...
...
@@ -553,7 +553,7 @@ int64_t JniObject::CallLongMethod(jmethodID methodId,
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
0
;
}
...
...
@@ -577,7 +577,7 @@ double JniObject::CallFloatMethod(jmethodID methodId,
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
0
;
}
...
...
@@ -601,7 +601,7 @@ double JniObject::CallDoubleMethod(jmethodID methodId,
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
0
;
}
...
...
@@ -624,7 +624,7 @@ void JniObject::CallVoidMethod(jmethodID methodId,
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
;
}
...
...
flutter/lib/jni/jni_object.h
浏览文件 @
33da97b1
...
...
@@ -8,7 +8,6 @@
#include <jni.h>
#include "base/android/jni_android.h"
#include "base/memory/ref_counted.h"
#include "lib/tonic/dart_wrappable.h"
namespace
blink
{
...
...
flutter/lib/jni/jni_string.cc
浏览文件 @
33da97b1
...
...
@@ -30,7 +30,7 @@ ftl::RefPtr<JniString> JniString::Create(Dart_Handle dart_string) {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
nullptr
;
}
...
...
@@ -54,7 +54,7 @@ Dart_Handle JniString::GetText() {
}
fail:
Dart_ThrowException
(
exception
);
NOTREACHED
();
FTL_
NOTREACHED
();
return
Dart_Null
();
}
...
...
flutter/tonic/dart_dependency_catcher.h
浏览文件 @
33da97b1
...
...
@@ -7,7 +7,7 @@
#include <unordered_set>
#include "
base
/macros.h"
#include "
lib/ftl
/macros.h"
namespace
blink
{
class
DartLibraryLoader
;
...
...
@@ -31,7 +31,7 @@ class DartDependencyCatcher {
DartLibraryLoader
&
loader_
;
std
::
unordered_set
<
DartDependency
*>
dependencies_
;
DISALLOW_COPY_AND_ASSIGN
(
DartDependencyCatcher
);
FTL_
DISALLOW_COPY_AND_ASSIGN
(
DartDependencyCatcher
);
};
}
// namespace blink
...
...
flutter/tonic/dart_io.h
浏览文件 @
33da97b1
...
...
@@ -5,7 +5,7 @@
#ifndef FLUTTER_TONIC_DART_IO_H_
#define FLUTTER_TONIC_DART_IO_H_
#include "
base
/macros.h"
#include "
lib/ftl
/macros.h"
namespace
blink
{
...
...
@@ -14,7 +14,7 @@ class DartIO {
static
void
InitForIsolate
();
private:
DISALLOW_IMPLICIT_CONSTRUCTORS
(
DartIO
);
FTL_
DISALLOW_IMPLICIT_CONSTRUCTORS
(
DartIO
);
};
}
// namespace blink
...
...
sky/engine/core/script/dart_debugger.cc
浏览文件 @
33da97b1
...
...
@@ -7,7 +7,7 @@
#include "dart/runtime/include/dart_api.h"
#include "dart/runtime/include/dart_native_api.h"
#include "dart/runtime/include/dart_tools_api.h"
#include "lib/ftl/logging.h"
namespace
blink
{
...
...
@@ -103,8 +103,7 @@ intptr_t DartDebugger::FindIsolateIndexById(Dart_IsolateId id) {
return
FindIsolateIndexByIdLocked
(
id
);
}
intptr_t
DartDebugger
::
FindIsolateIndexByIdLocked
(
Dart_IsolateId
id
)
{
intptr_t
DartDebugger
::
FindIsolateIndexByIdLocked
(
Dart_IsolateId
id
)
{
lock_
->
AssertAcquired
();
for
(
size_t
i
=
0
;
i
<
isolates_
->
size
();
i
++
)
{
if
((
*
isolates_
)[
i
]
->
id
()
==
id
)
{
...
...
@@ -130,7 +129,7 @@ void DartDebugger::RemoveIsolate(Dart_IsolateId id) {
return
;
}
}
NOTREACHED
();
FTL_
NOTREACHED
();
}
base
::
Lock
*
DartDebugger
::
lock_
=
nullptr
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录