DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Enable hybrid composition by default on Android (#20722)" (flutter/engine#20745)

Browse Source 
This reverts commit e57e7810a1c62535832abce02393e830fbd7f306.
This commit is contained in:
Emmanuel Garcia 2020-08-25 09:54:13 -07:00 committed by GitHub
parent 90be8a9e0e
commit bb885a23e2
18 changed files with 99 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engine/src/flutter/common/settings.h
View File

@ -223,6 +223,15 @@ struct Settings {
/// to log a timeline event that tracks the latency of engine startup.
std::chrono::microseconds engine_start_timestamp = {};
/// Whether the application claims that it uses the android embedded view for
/// platform views.
///
/// A `true` value will result the raster task runner always run on the
/// platform thread.
// TODO(cyanlaz): Remove this when dynamic thread merging is done.
// https://github.com/flutter/flutter/issues/59930
bool use_embedded_view = false;
std::string ToString() const;
};

4
engine/src/flutter/flow/surface.cc
View File

@ -18,8 +18,4 @@ std::unique_ptr<GLContextResult> Surface::MakeRenderContextCurrent() {
return std::make_unique<GLContextDefaultResult>(true);
}
bool Surface::ClearRenderContext() {
return false;
}
} // namespace flutter

2
engine/src/flutter/flow/surface.h
View File

@ -33,8 +33,6 @@ class Surface {
virtual std::unique_ptr<GLContextResult> MakeRenderContextCurrent();
virtual bool ClearRenderContext();
private:
FML_DISALLOW_COPY_AND_ASSIGN(Surface);
};

4
engine/src/flutter/shell/common/rasterizer.cc
View File

@ -143,10 +143,6 @@ void Rasterizer::Draw(fml::RefPtr<Pipeline<flutter::LayerTree>> pipeline) {
consume_result = PipelineConsumeResult::MoreAvailable;
}
if (surface_ != nullptr) {
surface_->ClearRenderContext();
}
// Merging the thread as we know the next `Draw` should be run on the platform
// thread.
if (surface_ != nullptr && surface_->GetExternalViewEmbedder() != nullptr) {

3
engine/src/flutter/shell/common/switches.cc
View File

@ -229,6 +229,9 @@ Settings SettingsFromCommandLine(const fml::CommandLine& command_line) {
: "127.0.0.1";
}
settings.use_embedded_view =
command_line.HasOption(FlagForSwitch(Switch::UseEmbeddedView));
// Set Observatory Port
if (command_line.HasOption(FlagForSwitch(Switch::DeviceObservatoryPort))) {
if (!GetSwitchValue(command_line, Switch::DeviceObservatoryPort,

10
engine/src/flutter/shell/common/switches.h
View File

@ -196,7 +196,15 @@ DEF_SWITCH(
"Uses separate threads for the platform, UI, GPU and IO task runners. "
"By default, a single thread is used for all task runners. Only available "
"in the flutter_tester.")
// TODO(cyanlaz): Remove this when dynamic thread merging is done.
// https://github.com/flutter/flutter/issues/59930
DEF_SWITCH(UseEmbeddedView,
"use-embedded-view",
"Whether an android application uses embedded views."
"This is a temporary flag to make the raster task runner runs on "
"the platform thread."
"This flag should be removed once the dynamic thread merging is "
"enabled on android.")
DEF_SWITCHES_END
void PrintUsage(const std::string& executable_name);

5
engine/src/flutter/shell/gpu/gpu_surface_gl.cc
View File

@ -341,9 +341,4 @@ std::unique_ptr<GLContextResult> GPUSurfaceGL::MakeRenderContextCurrent() {
return delegate_->GLContextMakeCurrent();
}
// |Surface|
bool GPUSurfaceGL::ClearRenderContext() {
return delegate_->GLContextClearCurrent();
}
} // namespace flutter

3
engine/src/flutter/shell/gpu/gpu_surface_gl.h
View File

@ -48,9 +48,6 @@ class GPUSurfaceGL : public Surface {
// |Surface|
std::unique_ptr<GLContextResult> MakeRenderContextCurrent() override;
// |Surface|
bool ClearRenderContext() override;
private:
GPUSurfaceGLDelegate* delegate_;
sk_sp<GrDirectContext> context_;

54
engine/src/flutter/shell/platform/android/android_shell_holder.cc
View File

@ -28,6 +28,8 @@ static PlatformData GetDefaultPlatformData() {
return platform_data;
}
bool AndroidShellHolder::use_embedded_view;
AndroidShellHolder::AndroidShellHolder(
flutter::Settings settings,
std::shared_ptr<PlatformViewAndroidJNI> jni_facade,
@ -100,21 +102,47 @@ AndroidShellHolder::AndroidShellHolder(
ui_runner = thread_host_.ui_thread->GetTaskRunner();
io_runner = thread_host_.io_thread->GetTaskRunner();
}
if (settings.use_embedded_view) {
use_embedded_view = true;
// Embedded views requires the gpu and the platform views to be the same.
// The plan is to eventually dynamically merge the threads when there's a
// platform view in the layer tree.
// For now we use a fixed thread configuration with the same thread used as
// the gpu and platform task runner.
// TODO(amirh/chinmaygarde): remove this, and dynamically change the thread
// configuration. https://github.com/flutter/flutter/issues/23975
// https://github.com/flutter/flutter/issues/59930
flutter::TaskRunners task_runners(thread_label, // label
platform_runner, // platform
platform_runner, // raster
ui_runner, // ui
io_runner // io
);
flutter::TaskRunners task_runners(thread_label, // label
platform_runner, // platform
gpu_runner, // raster
ui_runner, // ui
io_runner // io
);
shell_ =
Shell::Create(task_runners, // task runners
GetDefaultPlatformData(), // window data
settings_, // settings
on_create_platform_view, // platform view create callback
on_create_rasterizer // rasterizer create callback
);
} else {
use_embedded_view = false;
flutter::TaskRunners task_runners(thread_label, // label
platform_runner, // platform
gpu_runner, // raster
ui_runner, // ui
io_runner // io
);
shell_ =
Shell::Create(task_runners, // task runners
GetDefaultPlatformData(), // window data
settings_, // settings
on_create_platform_view, // platform view create callback
on_create_rasterizer // rasterizer create callback
);
shell_ =
Shell::Create(task_runners, // task runners
GetDefaultPlatformData(), // window data
settings_, // settings
on_create_platform_view, // platform view create callback
on_create_rasterizer // rasterizer create callback
);
}
platform_view_ = weak_platform_view;
FML_DCHECK(platform_view_);

8
engine/src/flutter/shell/platform/android/android_shell_holder.h
View File

@ -21,6 +21,14 @@ namespace flutter {
class AndroidShellHolder {
public:
// Whether the application sets to use embedded_view view
// `io.flutter.embedded_views_preview` flag. This can be static because it is
// determined by the application and it is safe when there are multiple
// `AndroidSurface`s.
// TODO(cyanglaz): remove this when dynamic thread merging is enabled on
// android. https://github.com/flutter/flutter/issues/59930
static bool use_embedded_view;
AndroidShellHolder(flutter::Settings settings,
std::shared_ptr<PlatformViewAndroidJNI> jni_facade,
bool is_background_view);

3
engine/src/flutter/shell/platform/android/android_surface_gl.cc
View File

@ -123,6 +123,9 @@ intptr_t AndroidSurfaceGL::GLContextFBO(GLFrameInfo frame_info) const {
// |GPUSurfaceGLDelegate|
ExternalViewEmbedder* AndroidSurfaceGL::GetExternalViewEmbedder() {
if (!AndroidShellHolder::use_embedded_view) {
return nullptr;
}
return external_view_embedder_.get();
}

3
engine/src/flutter/shell/platform/android/android_surface_software.cc
View File

@ -146,6 +146,9 @@ bool AndroidSurfaceSoftware::PresentBackingStore(
// |GPUSurfaceSoftwareDelegate|
ExternalViewEmbedder* AndroidSurfaceSoftware::GetExternalViewEmbedder() {
if (!AndroidShellHolder::use_embedded_view) {
return nullptr;
}
return external_view_embedder_.get();
}

8
engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/loader/ApplicationInfoLoader.java
View File

@ -79,6 +79,11 @@ final class ApplicationInfoLoader {
return output.toString();
}
private static boolean getUseEmbeddedView(ApplicationInfo appInfo) {
Bundle bundle = appInfo.metaData;
return bundle != null && bundle.getBoolean("io.flutter.embedded_views_preview");
}
private static void parseDomainConfig(
XmlResourceParser xrp, JSONArray output, boolean inheritedCleartextPermitted)
throws IOException, XmlPullParserException {
@ -150,6 +155,7 @@ final class ApplicationInfoLoader {
getString(appInfo.metaData, PUBLIC_FLUTTER_ASSETS_DIR_KEY),
getNetworkPolicy(appInfo, applicationContext),
appInfo.nativeLibraryDir,
clearTextPermitted);
clearTextPermitted,
getUseEmbeddedView(appInfo));
}
}

7
engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/loader/FlutterApplicationInfo.java
View File

@ -18,6 +18,9 @@ public final class FlutterApplicationInfo {
final String domainNetworkPolicy;
final String nativeLibraryDir;
final boolean clearTextPermitted;
// TODO(cyanlaz): Remove this when dynamic thread merging is done.
// https://github.com/flutter/flutter/issues/59930
final boolean useEmbeddedView;
public FlutterApplicationInfo(
String aotSharedLibraryName,
@ -26,7 +29,8 @@ public final class FlutterApplicationInfo {
String flutterAssetsDir,
String domainNetworkPolicy,
String nativeLibraryDir,
boolean clearTextPermitted) {
boolean clearTextPermitted,
boolean useEmbeddedView) {
this.aotSharedLibraryName =
aotSharedLibraryName == null ? DEFAULT_AOT_SHARED_LIBRARY_NAME : aotSharedLibraryName;
this.vmSnapshotData = vmSnapshotData == null ? DEFAULT_VM_SNAPSHOT_DATA : vmSnapshotData;
@ -37,5 +41,6 @@ public final class FlutterApplicationInfo {
this.nativeLibraryDir = nativeLibraryDir;
this.domainNetworkPolicy = domainNetworkPolicy == null ? "" : domainNetworkPolicy;
this.clearTextPermitted = clearTextPermitted;
this.useEmbeddedView = useEmbeddedView;
}
}

3
engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/loader/FlutterLoader.java
View File

@ -223,6 +223,9 @@ public class FlutterLoader {
if (flutterApplicationInfo.domainNetworkPolicy != null) {
shellArgs.add("--domain-network-policy=" + flutterApplicationInfo.domainNetworkPolicy);
}
if (flutterApplicationInfo.useEmbeddedView) {
shellArgs.add("--use-embedded-view");
}
if (settings.getLogTag() != null) {
shellArgs.add("--log-tag=" + settings.getLogTag());
}

2
engine/src/flutter/shell/platform/android/test/io/flutter/embedding/engine/PluginComponentTest.java
View File

@ -28,7 +28,7 @@ public class PluginComponentTest {
FlutterJNI flutterJNI = mock(FlutterJNI.class);
when(flutterJNI.isAttached()).thenReturn(true);
FlutterApplicationInfo emptyInfo =
new FlutterApplicationInfo(null, null, null, null, null, null, false);
new FlutterApplicationInfo(null, null, null, null, null, null, false, false);
// FlutterLoader is the object to which the PluginRegistry defers for obtaining
// the path to a Flutter asset. Ideally in this component test we would use a

3
engine/src/flutter/shell/platform/android/test/io/flutter/embedding/engine/loader/ApplicationInfoLoaderTest.java
View File

@ -43,6 +43,7 @@ public class ApplicationInfoLoaderTest {
assertEquals("", info.domainNetworkPolicy);
assertNull(info.nativeLibraryDir);
assertEquals(true, info.clearTextPermitted);
assertEquals(false, info.useEmbeddedView);
}
@Config(shadows = {ApplicationInfoLoaderTest.ShadowNetworkSecurityPolicy.class})
@ -87,6 +88,7 @@ public class ApplicationInfoLoaderTest {
bundle.putString(ApplicationInfoLoader.PUBLIC_VM_SNAPSHOT_DATA_KEY, "testvmsnapshot");
bundle.putString(ApplicationInfoLoader.PUBLIC_ISOLATE_SNAPSHOT_DATA_KEY, "testisolatesnapshot");
bundle.putString(ApplicationInfoLoader.PUBLIC_FLUTTER_ASSETS_DIR_KEY, "testassets");
bundle.putBoolean("io.flutter.embedded_views_preview", true);
Context context = generateMockContext(bundle, null);
FlutterApplicationInfo info = ApplicationInfoLoader.load(context);
assertNotNull(info);
@ -96,6 +98,7 @@ public class ApplicationInfoLoaderTest {
assertEquals("testassets", info.flutterAssetsDir);
assertNull(info.nativeLibraryDir);
assertEquals("", info.domainNetworkPolicy);
assertEquals(true, info.useEmbeddedView);
}
@Test

3
engine/src/flutter/testing/scenario_app/android/app/src/main/AndroidManifest.xml
View File

@ -35,6 +35,9 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<meta-data
android:name="io.flutter.embedded_views_preview"
android:value="true" />
</application>
<uses-permission android:name="android.permission.INTERNET" />
</manifest>