Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_43355755
engine
提交
9af920ef
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,发现更多精彩内容 >>
提交
9af920ef
编写于
7月 13, 2018
作者:
J
Jonah Williams
提交者:
liyuqian
7月 13, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "Add assistiveTechnologyEnabled flag to window" (#5746)
Reverts flutter/engine#5740
上级
a28c3e75
变更
17
隐藏空白更改
内联
并排
Showing
17 changed file
with
6 addition
and
129 deletion
+6
-129
lib/ui/hooks.dart
lib/ui/hooks.dart
+0
-5
lib/ui/window.dart
lib/ui/window.dart
+0
-24
lib/ui/window/window.cc
lib/ui/window/window.cc
+0
-10
lib/ui/window/window.h
lib/ui/window/window.h
+0
-1
runtime/runtime_controller.cc
runtime/runtime_controller.cc
+1
-12
runtime/runtime_controller.h
runtime/runtime_controller.h
+0
-3
shell/common/engine.cc
shell/common/engine.cc
+0
-4
shell/common/engine.h
shell/common/engine.h
+0
-2
shell/common/platform_view.cc
shell/common/platform_view.cc
+0
-4
shell/common/platform_view.h
shell/common/platform_view.h
+0
-5
shell/common/shell.cc
shell/common/shell.cc
+0
-14
shell/common/shell.h
shell/common/shell.h
+0
-4
shell/platform/android/io/flutter/view/FlutterView.java
shell/platform/android/io/flutter/view/FlutterView.java
+0
-5
shell/platform/android/platform_view_android_jni.cc
shell/platform/android/platform_view_android_jni.cc
+0
-12
shell/platform/darwin/ios/framework/Source/FlutterViewController.mm
...form/darwin/ios/framework/Source/FlutterViewController.mm
+5
-7
shell/platform/darwin/ios/platform_view_ios.h
shell/platform/darwin/ios/platform_view_ios.h
+0
-6
shell/platform/darwin/ios/platform_view_ios.mm
shell/platform/darwin/ios/platform_view_ios.mm
+0
-11
未找到文件。
lib/ui/hooks.dart
浏览文件 @
9af920ef
...
...
@@ -70,11 +70,6 @@ void _updateSemanticsEnabled(bool enabled) {
_invoke
(
window
.
onSemanticsEnabledChanged
,
window
.
_onSemanticsEnabledChangedZone
);
}
void
_updateAssistiveTechnologyEnabled
(
bool
enabled
)
{
window
.
_assistiveTechnologyEnabled
=
enabled
;
_invoke
(
window
.
_onAssistiveTechnologyEnabled
,
window
.
_onAssistiveTechnologyEnabledZone
);
}
void
_dispatchPlatformMessage
(
String
name
,
ByteData
data
,
int
responseId
)
{
if
(
window
.
onPlatformMessage
!=
null
)
{
_invoke3
<
String
,
ByteData
,
PlatformMessageResponseCallback
>(
...
...
lib/ui/window.dart
浏览文件 @
9af920ef
...
...
@@ -637,30 +637,6 @@ class Window {
bool
get
semanticsEnabled
=>
_semanticsEnabled
;
bool
_semanticsEnabled
=
false
;
/// Whether the user is using assitive technologies to interact with the
/// application.
///
/// This includes screen readers such as TalkBack on Android and VoiceOVer
/// on iOS, as well as hardware switches, and more.
///
/// The [onAssistiveTechnologyEnabled] callback is called whenever this value
/// changes.
bool
get
assistiveTechnologyEnabled
=>
_assistiveTechnologyEnabled
;
bool
_assistiveTechnologyEnabled
=
false
;
/// A callback that is invoked when the value of [assistiveTechnologyEnabled]
/// changes.
///
/// The framework invokes this callback in the same zone in which the callback
/// was set.
VoidCallback
get
onAssistiveTechnologyEnabled
=>
_onAssistiveTechnologyEnabled
;
VoidCallback
_onAssistiveTechnologyEnabled
;
Zone
_onAssistiveTechnologyEnabledZone
;
set
onAssistiveTechnologyEnabled
(
VoidCallback
callback
)
{
_onAssistiveTechnologyEnabled
=
callback
;
_onAssistiveTechnologyEnabledZone
=
Zone
.
current
;
}
/// A callback that is invoked when the value of [semanticsEnabled] changes.
///
/// The framework invokes this callback in the same zone in which the
...
...
lib/ui/window/window.cc
浏览文件 @
9af920ef
...
...
@@ -199,16 +199,6 @@ void Window::UpdateSemanticsEnabled(bool enabled) {
{
ToDart
(
enabled
)});
}
void
Window
::
UpdateAssistiveTechnologyEnabled
(
bool
enabled
)
{
tonic
::
DartState
*
dart_state
=
library_
.
dart_state
().
get
();
if
(
!
dart_state
)
return
;
tonic
::
DartState
::
Scope
scope
(
dart_state
);
DartInvokeField
(
library_
.
value
(),
"_updateAssistiveTechnologyEnabled"
,
{
ToDart
(
enabled
)});
}
void
Window
::
DispatchPlatformMessage
(
fxl
::
RefPtr
<
PlatformMessage
>
message
)
{
tonic
::
DartState
*
dart_state
=
library_
.
dart_state
().
get
();
if
(
!
dart_state
)
...
...
lib/ui/window/window.h
浏览文件 @
9af920ef
...
...
@@ -54,7 +54,6 @@ class Window final {
const
std
::
string
&
country_code
);
void
UpdateUserSettingsData
(
const
std
::
string
&
data
);
void
UpdateSemanticsEnabled
(
bool
enabled
);
void
UpdateAssistiveTechnologyEnabled
(
bool
enabled
);
void
DispatchPlatformMessage
(
fxl
::
RefPtr
<
PlatformMessage
>
message
);
void
DispatchPointerDataPacket
(
const
PointerDataPacket
&
packet
);
void
DispatchSemanticsAction
(
int32_t
id
,
...
...
runtime/runtime_controller.cc
浏览文件 @
9af920ef
...
...
@@ -122,8 +122,7 @@ std::unique_ptr<RuntimeController> RuntimeController::Clone() const {
bool
RuntimeController
::
FlushRuntimeStateToIsolate
()
{
return
SetViewportMetrics
(
window_data_
.
viewport_metrics
)
&&
SetLocale
(
window_data_
.
language_code
,
window_data_
.
country_code
)
&&
SetSemanticsEnabled
(
window_data_
.
semantics_enabled
)
&&
SetAssistiveTechnologyEnabled
(
window_data_
.
assistive_technology_enabled
);
SetSemanticsEnabled
(
window_data_
.
semantics_enabled
);
}
bool
RuntimeController
::
SetViewportMetrics
(
const
ViewportMetrics
&
metrics
)
{
...
...
@@ -171,16 +170,6 @@ bool RuntimeController::SetSemanticsEnabled(bool enabled) {
return
false
;
}
bool
RuntimeController
::
SetAssistiveTechnologyEnabled
(
bool
enabled
)
{
window_data_
.
assistive_technology_enabled
=
enabled
;
if
(
auto
window
=
GetWindowIfAvailable
())
{
window
->
UpdateAssistiveTechnologyEnabled
(
window_data_
.
assistive_technology_enabled
);
return
true
;
}
return
false
;
}
bool
RuntimeController
::
BeginFrame
(
fxl
::
TimePoint
frame_time
)
{
if
(
auto
window
=
GetWindowIfAvailable
())
{
window
->
BeginFrame
(
frame_time
);
...
...
runtime/runtime_controller.h
浏览文件 @
9af920ef
...
...
@@ -47,8 +47,6 @@ class RuntimeController final : public WindowClient {
bool
SetSemanticsEnabled
(
bool
enabled
);
bool
SetAssistiveTechnologyEnabled
(
bool
enabled
);
bool
BeginFrame
(
fxl
::
TimePoint
frame_time
);
bool
NotifyIdle
(
int64_t
deadline
);
...
...
@@ -82,7 +80,6 @@ class RuntimeController final : public WindowClient {
std
::
string
country_code
;
std
::
string
user_settings_data
=
"{}"
;
bool
semantics_enabled
=
false
;
bool
assistive_technology_enabled
=
false
;
};
RuntimeDelegate
&
client_
;
...
...
shell/common/engine.cc
浏览文件 @
9af920ef
...
...
@@ -339,10 +339,6 @@ void Engine::SetSemanticsEnabled(bool enabled) {
runtime_controller_
->
SetSemanticsEnabled
(
enabled
);
}
void
Engine
::
SetAssistiveTechnologyEnabled
(
bool
enabled
)
{
runtime_controller_
->
SetAssistiveTechnologyEnabled
(
enabled
);
}
void
Engine
::
StopAnimator
()
{
animator_
->
Stop
();
}
...
...
shell/common/engine.h
浏览文件 @
9af920ef
...
...
@@ -99,8 +99,6 @@ class Engine final : public blink::RuntimeDelegate {
void
SetSemanticsEnabled
(
bool
enabled
);
void
SetAssistiveTechnologyEnabled
(
bool
enabled
);
void
ScheduleFrame
(
bool
regenerate_layer_tree
=
true
)
override
;
// |blink::RuntimeDelegate|
...
...
shell/common/platform_view.cc
浏览文件 @
9af920ef
...
...
@@ -52,10 +52,6 @@ void PlatformView::SetSemanticsEnabled(bool enabled) {
delegate_
.
OnPlatformViewSetSemanticsEnabled
(
*
this
,
enabled
);
}
void
PlatformView
::
SetAssistiveTechnologyEnabled
(
bool
enabled
)
{
delegate_
.
OnPlatformViewSetAssistiveTechnologyEnabled
(
*
this
,
enabled
);
}
void
PlatformView
::
SetViewportMetrics
(
const
blink
::
ViewportMetrics
&
metrics
)
{
delegate_
.
OnPlatformViewSetViewportMetrics
(
*
this
,
metrics
);
}
...
...
shell/common/platform_view.h
浏览文件 @
9af920ef
...
...
@@ -58,9 +58,6 @@ class PlatformView {
virtual
void
OnPlatformViewSetSemanticsEnabled
(
const
PlatformView
&
view
,
bool
enabled
)
=
0
;
virtual
void
OnPlatformViewSetAssistiveTechnologyEnabled
(
const
PlatformView
&
view
,
bool
enabled
)
=
0
;
virtual
void
OnPlatformViewRegisterTexture
(
const
PlatformView
&
view
,
std
::
shared_ptr
<
flow
::
Texture
>
texture
)
=
0
;
...
...
@@ -87,8 +84,6 @@ class PlatformView {
virtual
void
SetSemanticsEnabled
(
bool
enabled
);
virtual
void
SetAssistiveTechnologyEnabled
(
bool
enabled
);
void
SetViewportMetrics
(
const
blink
::
ViewportMetrics
&
metrics
);
void
NotifyCreated
();
...
...
shell/common/shell.cc
浏览文件 @
9af920ef
...
...
@@ -574,20 +574,6 @@ void Shell::OnPlatformViewSetSemanticsEnabled(const PlatformView& view,
});
}
void
Shell
::
OnPlatformViewSetAssistiveTechnologyEnabled
(
const
PlatformView
&
view
,
bool
enabled
)
{
FXL_DCHECK
(
is_setup_
);
FXL_DCHECK
(
&
view
==
platform_view_
.
get
());
FXL_DCHECK
(
task_runners_
.
GetPlatformTaskRunner
()
->
RunsTasksOnCurrentThread
());
task_runners_
.
GetUITaskRunner
()
->
PostTask
(
[
engine
=
engine_
->
GetWeakPtr
(),
enabled
]
{
if
(
engine
)
{
engine
->
SetAssistiveTechnologyEnabled
(
enabled
);
}
});
}
// |shell::PlatformView::Delegate|
void
Shell
::
OnPlatformViewRegisterTexture
(
const
PlatformView
&
view
,
...
...
shell/common/shell.h
浏览文件 @
9af920ef
...
...
@@ -149,10 +149,6 @@ class Shell final : public PlatformView::Delegate,
void
OnPlatformViewSetSemanticsEnabled
(
const
PlatformView
&
view
,
bool
enabled
)
override
;
// |shell::PlatformView::Delegate|
void
OnPlatformViewSetAssistiveTechnologyEnabled
(
const
PlatformView
&
view
,
bool
enabled
)
override
;
// |shell::PlatformView::Delegate|
void
OnPlatformViewRegisterTexture
(
const
PlatformView
&
view
,
...
...
shell/platform/android/io/flutter/view/FlutterView.java
浏览文件 @
9af920ef
...
...
@@ -669,9 +669,6 @@ public class FlutterView extends SurfaceView
private
static
native
void
nativeSetSemanticsEnabled
(
long
nativePlatformViewAndroid
,
boolean
enabled
);
private
static
native
void
nativeSetAssistiveTechnologyEnabled
(
long
nativePlatformViewAndroid
,
boolean
enabled
);
private
static
native
boolean
nativeGetIsSoftwareRenderingEnabled
();
...
...
@@ -815,13 +812,11 @@ public class FlutterView extends SurfaceView
if
(
enabled
)
{
mTouchExplorationEnabled
=
true
;
ensureAccessibilityEnabled
();
nativeSetAssistiveTechnologyEnabled
(
mNativeView
.
get
(),
true
);
}
else
{
mTouchExplorationEnabled
=
false
;
if
(
mAccessibilityNodeProvider
!=
null
)
{
mAccessibilityNodeProvider
.
handleTouchExplorationExit
();
}
nativeSetAssistiveTechnologyEnabled
(
mNativeView
.
get
(),
false
);
}
resetWillNotDraw
();
}
...
...
shell/platform/android/platform_view_android_jni.cc
浏览文件 @
9af920ef
...
...
@@ -429,13 +429,6 @@ static void SetSemanticsEnabled(JNIEnv* env,
ANDROID_SHELL_HOLDER
->
GetPlatformView
()
->
SetSemanticsEnabled
(
enabled
);
}
static
void
SetAssistiveTechnologyEnabled
(
JNIEnv
*
env
,
jobject
jcaller
,
jlong
shell_holder
,
jboolean
enabled
)
{
ANDROID_SHELL_HOLDER
->
GetPlatformView
()
->
SetAssistiveTechnologyEnabled
(
enabled
);
}
static
jboolean
GetIsSoftwareRendering
(
JNIEnv
*
env
,
jobject
jcaller
)
{
return
FlutterMain
::
Get
().
GetSettings
().
enable_software_rendering
;
}
...
...
@@ -607,11 +600,6 @@ bool PlatformViewAndroid::Register(JNIEnv* env) {
.
signature
=
"(JZ)V"
,
.
fnPtr
=
reinterpret_cast
<
void
*>
(
&
shell
::
SetSemanticsEnabled
),
},
{
.
name
=
"nativeSetAssistiveTechnologyEnabled"
,
.
signature
=
"(JZ)V"
,
.
fnPtr
=
reinterpret_cast
<
void
*>
(
&
shell
::
SetAssistiveTechnologyEnabled
),
},
{
.
name
=
"nativeGetIsSoftwareRenderingEnabled"
,
.
signature
=
"()Z"
,
...
...
shell/platform/darwin/ios/framework/Source/FlutterViewController.mm
浏览文件 @
9af920ef
...
...
@@ -792,18 +792,16 @@ static inline blink::PointerData::DeviceKind DeviceKindFromTouchType(UITouch* to
#pragma mark - Accessibility
-
(
void
)
onAccessibilityStatusChanged
:(
NSNotification
*
)
notification
{
auto
platformView
=
_shell
->
GetPlatformView
();
#if TARGET_OS_SIMULATOR
// There doesn't appear to be any way to determine whether the accessibility
// inspector is enabled on the simulator. We conservatively always turn on the
// accessibility bridge in the simulator, but never assistive technology.
platformView
->
SetSemanticsEnabled
(
true
);
platformView
->
SetAssistiveTechnologyEnabled
(
false
);
// accessibility bridge in the simulator.
bool
enabled
=
true
;
#else
bool
enabled
=
UIAccessibilityIsVoiceOverRunning
()
||
UIAccessibilityIsSwitchControlRunning
();
platformView
->
SetSemanticsEnabled
(
enabled
||
UIAccessibilityIsSpeakScreenEnabled
());
platformView
->
SetAssistiveTechnologyEnabled
(
enabled
);
bool
enabled
=
UIAccessibilityIsVoiceOverRunning
()
||
UIAccessibilityIsSwitchControlRunning
()
||
UIAccessibilityIsSpeakScreenEnabled
();
#endif
_shell
->
GetPlatformView
()
->
SetSemanticsEnabled
(
enabled
);
}
#pragma mark - Memory Notifications
...
...
shell/platform/darwin/ios/platform_view_ios.h
浏览文件 @
9af920ef
...
...
@@ -57,12 +57,6 @@ class PlatformViewIOS final : public HeadlessPlatformViewIOS {
// |shell::PlatformView|
void
SetSemanticsEnabled
(
bool
enabled
)
override
;
// |shell::PlatformView|
void
SetAssistiveTechnologyEnabled
(
bool
enabled
)
override
;
// |shell::PlatformView|
void
HandlePlatformMessage
(
fxl
::
RefPtr
<
blink
::
PlatformMessage
>
message
)
override
;
// |shell::PlatformView|
void
UpdateSemantics
(
blink
::
SemanticsNodeUpdates
update
,
...
...
shell/platform/darwin/ios/platform_view_ios.mm
浏览文件 @
9af920ef
...
...
@@ -67,17 +67,6 @@ void PlatformViewIOS::SetSemanticsEnabled(bool enabled) {
PlatformView
::
SetSemanticsEnabled
(
enabled
);
}
// |shell:PlatformView|
void
PlatformViewIOS
::
SetAssistiveTechnologyEnabled
(
bool
enabled
)
{
if
(
enabled
&&
!
accessibility_bridge_
)
{
accessibility_bridge_
=
std
::
make_unique
<
AccessibilityBridge
>
(
owner_view_
,
this
);
}
// Note: since the accessibility bridge is needed for both semantics and
// assistive technologies, but you cannot have the latter without the
// former, we only destroy the bridge in SetSemanticsEnabled and not here.
PlatformView
::
SetAssistiveTechnologyEnabled
(
enabled
);
}
// |shell::PlatformView|
void
PlatformViewIOS
::
UpdateSemantics
(
blink
::
SemanticsNodeUpdates
update
,
blink
::
CustomAccessibilityActionUpdates
actions
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录