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

Enable ios platform view by default (#20671)

Browse Source
This commit is contained in:
Chris Yang 2020-08-20 17:46:01 -07:00 committed by GitHub
parent 498dbc6dc1
commit b6035062ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shell/platform/darwin/ios/ios_surface.h
View File

@ -34,8 +34,6 @@ class IOSSurface : public ExternalViewEmbedder {
std::shared_ptr<IOSContext> GetContext() const;
ExternalViewEmbedder* GetExternalViewEmbedderIfEnabled();
virtual bool IsValid() const = 0;
virtual void UpdateStorageSizeIfNecessary() = 0;

17
shell/platform/darwin/ios/ios_surface.mm
View File

@ -13,15 +13,6 @@
namespace flutter {
// The name of the Info.plist flag to enable the embedded iOS views preview.
constexpr const char* kEmbeddedViewsPreview = "io.flutter.embedded_views_preview";
bool IsIosEmbeddedViewsPreviewEnabled() {
static bool preview_enabled =
[[[NSBundle mainBundle] objectForInfoDictionaryKey:@(kEmbeddedViewsPreview)] boolValue];
return preview_enabled;
}
std::unique_ptr<IOSSurface> IOSSurface::Create(
std::shared_ptr<IOSContext> context,
fml::scoped_nsobject<CALayer> layer,
@ -75,14 +66,6 @@ SkCanvas* IOSSurface::GetRootCanvas() {
return nullptr;
}
ExternalViewEmbedder* IOSSurface::GetExternalViewEmbedderIfEnabled() {
if (IsIosEmbeddedViewsPreviewEnabled()) {
return this;
} else {
return nullptr;
}
}
// |ExternalViewEmbedder|
void IOSSurface::CancelFrame() {
TRACE_EVENT0("flutter", "IOSSurface::CancelFrame");

2
shell/platform/darwin/ios/ios_surface_gl.mm
View File

@ -84,7 +84,7 @@ bool IOSSurfaceGL::GLContextPresent() {
// |GPUSurfaceGLDelegate|
ExternalViewEmbedder* IOSSurfaceGL::GetExternalViewEmbedder() {
return GetExternalViewEmbedderIfEnabled();
return this;
}
} // namespace flutter

2
shell/platform/darwin/ios/ios_surface_metal.mm
View File

@ -55,7 +55,7 @@ std::unique_ptr<Surface> IOSSurfaceMetal::CreateGPUSurface(GrDirectContext* /* u
// |GPUSurfaceDelegate|
ExternalViewEmbedder* IOSSurfaceMetal::GetExternalViewEmbedder() {
return GetExternalViewEmbedderIfEnabled();
return this;
}
} // namespace flutter

2
shell/platform/darwin/ios/ios_surface_software.mm
View File

@ -124,7 +124,7 @@ bool IOSSurfaceSoftware::PresentBackingStore(sk_sp<SkSurface> backing_store) {
// |GPUSurfaceSoftwareDelegate|
ExternalViewEmbedder* IOSSurfaceSoftware::GetExternalViewEmbedder() {
return GetExternalViewEmbedderIfEnabled();
return this;
}
} // namespace flutter

2
testing/scenario_app/ios/Scenarios/Scenarios/Info.plist
View File

@ -41,7 +41,5 @@
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>io.flutter.embedded_views_preview</key>
<true/>
</dict>
</plist>