Skip to content

Commit 7f1c93d

Browse files
auto-submit[bot]auto-submit[bot]
authored
Reverts "Platform view devicelab ad banner scroll list real ads (#144745)" (#145189)
Reverts: flutter/flutter#144745 Initiated by: gspencergoog Reason for reverting: appears to have broken the build. Original PR Author: hellohuanlin Reviewed By: {jmagman, jonahwilliams} This change reverts the following previous change: This benchmark is to measure the platform view performance improvement. It is similar to https://github.com/lucalooz/flutter_ads_list_perf There's still a pending issue flutter/flutter#144339 *List which issues are fixed by this PR. You must list at least one issue. An issue is not required if the PR fixes something trivial like a typo.* Fixes flutter/flutter#143534 Fixes flutter/flutter#143257 *If you had to change anything in the [flutter/tests] repo, include a link to the migration guide as per the [breaking change policy].*
1 parent be78542 commit 7f1c93d

File tree

16 files changed

+11
-301
lines changed

16 files changed

+11
-301
lines changed

‎.ci.yaml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4626,16 +4626,6 @@ targets:
46264626
["devicelab", "ios", "mac"]
46274627
task_name: platform_views_scroll_perf_ios__timeline_summary
46284628

4629-
- name: Mac_ios platform_views_scroll_perf_ad_banners__timeline_summary
4630-
recipe: devicelab/devicelab_drone
4631-
presubmit: false
4632-
bringup: true
4633-
timeout: 60
4634-
properties:
4635-
tags: >
4636-
["devicelab", "ios", "mac"]
4637-
task_name: platform_views_scroll_perf_ad_banners__timeline_summary
4638-
46394629
- name: Mac_ios platform_views_scroll_perf_non_intersecting_impeller_ios__timeline_summary
46404630
recipe: devicelab/devicelab_drone
46414631
presubmit: false

‎TESTOWNERS‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@
207207
/dev/devicelab/bin/tasks/platform_channels_benchmarks_ios.dart @gaaclarke @flutter/engine
208208
/dev/devicelab/bin/tasks/platform_interaction_test_ios.dart @hellohuanlin @flutter/engine
209209
/dev/devicelab/bin/tasks/platform_view_ios__start_up.dart @stuartmorgan @flutter/plugin
210-
/dev/devicelab/bin/tasks/platform_views_scroll_perf_ad_banners__timeline_summary.dart @hellohuanlin @flutter/engine
211210
/dev/devicelab/bin/tasks/platform_views_scroll_perf_ios__timeline_summary.dart @hellohuanlin @flutter/engine
212211
/dev/devicelab/bin/tasks/platform_views_scroll_perf_non_intersecting_impeller_ios__timeline_summary.dart @jonahwilliams @flutter/engine
213212
/dev/devicelab/bin/tasks/post_backdrop_filter_perf_ios__timeline_summary.dart @hellohuanlin @flutter/engine

‎dev/benchmarks/platform_views_layout/ios/Flutter/Debug.xcconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
21
#include "Generated.xcconfig"

‎dev/benchmarks/platform_views_layout/ios/Flutter/Release.xcconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
21
#include "Generated.xcconfig"

‎dev/benchmarks/platform_views_layout/ios/Podfile‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎dev/benchmarks/platform_views_layout/ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 1 addition & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
4552BF1971CFF555ACB2839A /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BD993316F35385497F75FF6C /* libPods-Runner.a */; };
1110
647B792C24207B8900ABA501 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 647B792B24207B8900ABA501 /* AppDelegate.m */; };
1211
647B792F24207D1600ABA501 /* DummyPlatformView.m in Sources */ = {isa = PBXBuildFile; fileRef = 647B792E24207D1600ABA501 /* DummyPlatformView.m */; };
1312
647B793224208A4200ABA501 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 647B793024208A4200ABA501 /* GeneratedPluginRegistrant.m */; };
@@ -32,9 +31,6 @@
3231
/* End PBXCopyFilesBuildPhase section */
3332

3433
/* Begin PBXFileReference section */
35-
0F4D3146B7B6DF07E43DC73C /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
36-
3269CF3CF6F192082C33C163 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
37-
5E91F24FF1A398625C9C0FA5 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
3834
647B792824207ADD00ABA501 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
3935
647B792B24207B8900ABA501 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
4036
647B792D24207CC400ABA501 /* DummyPlatformView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DummyPlatformView.h; sourceTree = "<group>"; };
@@ -51,39 +47,19 @@
5147
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
5248
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
5349
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
54-
BD993316F35385497F75FF6C /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
5550
/* End PBXFileReference section */
5651

5752
/* Begin PBXFrameworksBuildPhase section */
5853
97C146EB1CF9000F007C117D /* Frameworks */ = {
5954
isa = PBXFrameworksBuildPhase;
6055
buildActionMask = 2147483647;
6156
files = (
62-
4552BF1971CFF555ACB2839A /* libPods-Runner.a in Frameworks */,
6357
);
6458
runOnlyForDeploymentPostprocessing = 0;
6559
};
6660
/* End PBXFrameworksBuildPhase section */
6761

6862
/* Begin PBXGroup section */
69-
0093AEB0458530A026D4EDDD /* Frameworks */ = {
70-
isa = PBXGroup;
71-
children = (
72-
BD993316F35385497F75FF6C /* libPods-Runner.a */,
73-
);
74-
name = Frameworks;
75-
sourceTree = "<group>";
76-
};
77-
3B86C3C30DA7CC47EE4FB68E /* Pods */ = {
78-
isa = PBXGroup;
79-
children = (
80-
3269CF3CF6F192082C33C163 /* Pods-Runner.debug.xcconfig */,
81-
0F4D3146B7B6DF07E43DC73C /* Pods-Runner.release.xcconfig */,
82-
5E91F24FF1A398625C9C0FA5 /* Pods-Runner.profile.xcconfig */,
83-
);
84-
path = Pods;
85-
sourceTree = "<group>";
86-
};
8763
9740EEB11CF90186004384FC /* Flutter */ = {
8864
isa = PBXGroup;
8965
children = (
@@ -101,8 +77,6 @@
10177
9740EEB11CF90186004384FC /* Flutter */,
10278
97C146F01CF9000F007C117D /* Runner */,
10379
97C146EF1CF9000F007C117D /* Products */,
104-
3B86C3C30DA7CC47EE4FB68E /* Pods */,
105-
0093AEB0458530A026D4EDDD /* Frameworks */,
10680
);
10781
sourceTree = "<group>";
10882
};
@@ -147,14 +121,12 @@
147121
isa = PBXNativeTarget;
148122
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
149123
buildPhases = (
150-
F9890346AACD48B6C9FEE2A0 /* [CP] Check Pods Manifest.lock */,
151124
9740EEB61CF901F6004384FC /* Run Script */,
152125
97C146EA1CF9000F007C117D /* Sources */,
153126
97C146EB1CF9000F007C117D /* Frameworks */,
154127
97C146EC1CF9000F007C117D /* Resources */,
155128
9705A1C41CF9048500538489 /* Embed Frameworks */,
156129
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
157-
9A0E2E29949C30C54EBF3099 /* [CP] Copy Pods Resources */,
158130
);
159131
buildRules = (
160132
);
@@ -243,45 +215,6 @@
243215
shellPath = /bin/sh;
244216
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
245217
};
246-
9A0E2E29949C30C54EBF3099 /* [CP] Copy Pods Resources */ = {
247-
isa = PBXShellScriptBuildPhase;
248-
buildActionMask = 2147483647;
249-
files = (
250-
);
251-
inputFileListPaths = (
252-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
253-
);
254-
name = "[CP] Copy Pods Resources";
255-
outputFileListPaths = (
256-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
257-
);
258-
runOnlyForDeploymentPostprocessing = 0;
259-
shellPath = /bin/sh;
260-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
261-
showEnvVarsInLog = 0;
262-
};
263-
F9890346AACD48B6C9FEE2A0 /* [CP] Check Pods Manifest.lock */ = {
264-
isa = PBXShellScriptBuildPhase;
265-
buildActionMask = 2147483647;
266-
files = (
267-
);
268-
inputFileListPaths = (
269-
);
270-
inputPaths = (
271-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
272-
"${PODS_ROOT}/Manifest.lock",
273-
);
274-
name = "[CP] Check Pods Manifest.lock";
275-
outputFileListPaths = (
276-
);
277-
outputPaths = (
278-
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
279-
);
280-
runOnlyForDeploymentPostprocessing = 0;
281-
shellPath = /bin/sh;
282-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
283-
showEnvVarsInLog = 0;
284-
};
285218
/* End PBXShellScriptBuildPhase section */
286219

287220
/* Begin PBXSourcesBuildPhase section */
@@ -374,7 +307,6 @@
374307
buildSettings = {
375308
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
376309
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
377-
DEVELOPMENT_TEAM = "";
378310
ENABLE_BITCODE = NO;
379311
INFOPLIST_FILE = Runner/Info.plist;
380312
LD_RUNPATH_SEARCH_PATHS = (
@@ -498,7 +430,7 @@
498430
buildSettings = {
499431
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
500432
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
501-
DEVELOPMENT_TEAM = "";
433+
DEVELOPMENT_TEAM = S8QB4VV633;
502434
ENABLE_BITCODE = NO;
503435
INFOPLIST_FILE = Runner/Info.plist;
504436
LD_RUNPATH_SEARCH_PATHS = (
@@ -517,7 +449,6 @@
517449
buildSettings = {
518450
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
519451
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
520-
DEVELOPMENT_TEAM = "";
521452
ENABLE_BITCODE = NO;
522453
INFOPLIST_FILE = Runner/Info.plist;
523454
LD_RUNPATH_SEARCH_PATHS = (

‎dev/benchmarks/platform_views_layout/ios/Runner.xcworkspace/contents.xcworkspacedata‎

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dev/benchmarks/platform_views_layout/ios/Runner/Info.plist‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5-
<key>CADisableMinimumFrameDurationOnPhone</key>
6-
<true/>
75
<key>CFBundleDevelopmentRegion</key>
86
<string>$(DEVELOPMENT_LANGUAGE)</string>
97
<key>CFBundleExecutable</key>
@@ -22,12 +20,8 @@
2220
<string>????</string>
2321
<key>CFBundleVersion</key>
2422
<string>1</string>
25-
<key>GADApplicationIdentifier</key>
26-
<string>ca-app-pub-3940256099942544~1458002511</string>
2723
<key>LSRequiresIPhoneOS</key>
2824
<true/>
29-
<key>UIApplicationSupportsIndirectInputEvents</key>
30-
<true/>
3125
<key>UILaunchStoryboardName</key>
3226
<string>LaunchScreen</string>
3327
<key>UIMainStoryboardFile</key>
@@ -49,5 +43,9 @@
4943
<true/>
5044
<key>io.flutter.metal_preview</key>
5145
<true/>
46+
<key>CADisableMinimumFrameDurationOnPhone</key>
47+
<true/>
48+
<key>UIApplicationSupportsIndirectInputEvents</key>
49+
<true/>
5250
</dict>
5351
</plist>

‎dev/benchmarks/platform_views_layout/lib/main_ad_banners.dart‎

Lines changed: 0 additions & 67 deletions
This file was deleted.

‎dev/benchmarks/platform_views_layout/pubspec.yaml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies:
99
sdk: flutter
1010
flutter_driver:
1111
sdk: flutter
12-
google_mobile_ads: 4.0.0
12+
1313
# To change the version of the gallery assets, edit
1414
# //packages/flutter_tools/lib/src/commands/update_packages.dart
1515
# and run
@@ -25,7 +25,6 @@ dependencies:
2525
material_color_utilities: 0.8.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
2626
meta: 1.12.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
2727
path: 1.9.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
28-
plugin_platform_interface: 2.1.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
2928
source_span: 1.10.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
3029
stack_trace: 1.11.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
3130
stream_channel: 2.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -36,10 +35,6 @@ dependencies:
3635
vector_math: 2.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
3736
vm_service: 14.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
3837
webdriver: 3.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
39-
webview_flutter: 4.7.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
40-
webview_flutter_android: 3.15.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
41-
webview_flutter_platform_interface: 2.10.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
42-
webview_flutter_wkwebview: 3.12.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
4338

4439
dev_dependencies:
4540
flutter_test:
@@ -89,4 +84,4 @@ flutter:
8984
- packages/flutter_gallery_assets/people/square/ali.png
9085
- packages/flutter_gallery_assets/places/india_chettinad_silk_maker.png
9186

92-
# PUBSPEC CHECKSUM: c673
87+
# PUBSPEC CHECKSUM: 76bc

0 commit comments

Comments
 (0)