diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py index 944c1ea..8a368c2 100755 --- a/tools/clang/scripts/update.py +++ b/tools/clang/scripts/update.py
@@ -35,7 +35,7 @@ # Do NOT CHANGE this if you don't know what you're doing -- see # https://chromium.googlesource.com/chromium/src/+/master/docs/updating_clang.md # Reverting problematic clang rolls is safe, though. -CLANG_REVISION = '355581' +CLANG_REVISION = '356356' use_head_revision = bool(os.environ.get('LLVM_FORCE_HEAD_REVISION', '0') in ('1', 'YES'))
diff --git a/tools/cygprofile/orderfile_generator_backend.py b/tools/cygprofile/orderfile_generator_backend.py index 412fd7e..86658f12 100755 --- a/tools/cygprofile/orderfile_generator_backend.py +++ b/tools/cygprofile/orderfile_generator_backend.py
@@ -859,7 +859,7 @@ _StashOutputDirectory(self._uninstrumented_out_dir) orderfile_uploaded = True - if self._options._new_commit_flow: + if self._options.new_commit_flow: self._orderfile_updater._GitStash() else: if (self._options.buildbot and self._options.netrc @@ -1000,7 +1000,7 @@ if options.verify: generator._VerifySymbolOrder() elif options.commit_hashes: - if not options._new_commit_flow: + if not options.new_commit_flow: raise Exception('--commit-hashes requries --new-commit-flow') return generator.CommitStashedOrderfileHashes() elif options.upload_ready_orderfiles:
diff --git a/tools/mb/mb.py b/tools/mb/mb.py index 64d0845..056e8fb 100755 --- a/tools/mb/mb.py +++ b/tools/mb/mb.py
@@ -1169,7 +1169,10 @@ '--output-dir', '${ISOLATED_OUTDIR}', '--timeout', '3600'] elif is_android and test_type != "script": - cmdline = [ + cmdline = [] + if asan: + cmdline += [os.path.join('bin', 'run_with_asan')] + cmdline += [ '../../testing/test_env.py', '../../build/android/test_wrapper/logdog_wrapper.py', '--target', target,
diff --git a/tools/metrics/actions/actions.xml b/tools/metrics/actions/actions.xml index e3b75af..b529c498 100644 --- a/tools/metrics/actions/actions.xml +++ b/tools/metrics/actions/actions.xml
@@ -10000,6 +10000,12 @@ </description> </action> +<action name="LinkOpenedInNewTab"> + <owner>yusufo@chromium.org</owner> + <owner>wychen@chromium.org</owner> + <description>Users long pressed and opened in new tab.</description> +</action> + <action name="LoadURL"> <owner>Please list the metric's owners. Add more owner tags as needed.</owner> <description>Please enter the description of this user action.</description> @@ -12541,11 +12547,9 @@ </action> <action name="MobileTabReturnedToCurrentTab"> - <owner>rlanday@chromium.org</owner> - <description> - User in the Android tab switcher returned to the tab that was active when - the tab switcher was opened. - </description> + <owner>yusufo@chromium.org</owner> + <owner>wychen@chromium.org</owner> + <description>Users returned to the tab that was active.</description> </action> <action name="MobileTabStripCloseTab"> @@ -16322,6 +16326,14 @@ </description> </action> +<action name="PWAInstallIcon"> + <owner>alancutter@chromium.org</owner> + <description> + The plus icon shown in the omnibox when a site has passed the browser's PWA + promotability checks. + </description> +</action> + <action name="Redo"> <owner>Please list the metric's owners. Add more owner tags as needed.</owner> <description>Please enter the description of this user action.</description> @@ -20217,6 +20229,30 @@ <description>Please enter the description of this user action.</description> </action> +<action name="TabGroup.Created"> + <owner>yusufo@chromium.org</owner> + <owner>wychen@chromium.org</owner> + <description>Users created a new tab group.</description> +</action> + +<action name="TabGroup.ExpandedFromStrip"> + <owner>yusufo@chromium.org</owner> + <owner>wychen@chromium.org</owner> + <description> + Users tapped "^" button on the tab strip, causing tab group bottom + sheet to be shown. + </description> +</action> + +<action name="TabGroup.MinimizedFromGrid"> + <owner>yusufo@chromium.org</owner> + <owner>wychen@chromium.org</owner> + <description> + Users tapped "v" button on tab group bottom sheet toolbar, causing + tab group bottom sheet to be hidden. + </description> +</action> + <action name="Tablet.WindowDrag.OpenedOverview"> <owner>minch@chromium.org</owner> <description> @@ -21562,4 +21598,57 @@ <affected-action name="Accessibility.Autoclick"/> </action-suffix> +<action-suffix separator="." ordering="suffix"> + <suffix name="DeveloperRequestedNewTab" + label="Users tapped on a link with a target=_blank"/> + <suffix name="OpenInNewTab" + label="Users long pressed a link and opened in new tab."/> + <suffix name="TabSwitcher" + label="Users tapped the 'Create group' button in TabSwitcher."/> + <affected-action name="TabGroup.Created"/> +</action-suffix> + +<action-suffix separator="." ordering="suffix"> + <suffix name="GridTabSwitcher" + label="Users switched tabs from the grid layout TabSwitcher."/> + <suffix name="TabGridSheet" + label="Users switched tabs from the tab group in the bottom sheet + switcher."/> + <suffix name="TabStrip" label="Users switched tabs from the tab strip."/> + <affected-action name="MobileTabSwitched"/> +</action-suffix> + +<action-suffix separator="." ordering="suffix"> + <suffix name="TabGridSheet" + label="Users tapped '+' button on the tab group bottom sheet toolbar + causes a new tab to be created in the group."/> + <suffix name="TabStrip" + label="Users tapped '+' button on the tab strip, causing a new tab to + be created in the group."/> + <affected-action name="MobileNewTabOpened"/> +</action-suffix> + +<action-suffix separator="." ordering="suffix"> + <suffix name="GridTabSwitcher" + label="Users tapped 'x' button on the tab in grid layout TabSwitcher, + causing a tab to be closed."/> + <suffix name="TabGridSheet" + label="Users tapped 'x' button on the tab in tab group bottom sheet, + causing a tab to be closed in the group."/> + <suffix name="TabStrip" + label="Users tapped the currently selected tab's favicon on the tab + strip, causing a tab to be closed in the group."/> + <affected-action name="MobileTabClosed"/> +</action-suffix> + +<action-suffix separator="." ordering="suffix"> + <suffix name="GridTabSwitcher" + label="Users tapped the currently selected tab in grid layout + TabSwitcher."/> + <suffix name="TabGridSheet" + label="Users tapped the currently selected tab in tab group bottom + sheet."/> + <affected-action name="MobileTabReturnedToCurrentTab"/> +</action-suffix> + </actions>
diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml index 55a9ba7..0c84c10 100644 --- a/tools/metrics/histograms/enums.xml +++ b/tools/metrics/histograms/enums.xml
@@ -1710,8 +1710,10 @@ <int value="0" label="MOVE_INTO_FOLDER"/> <int value="1" label="MOVE_OUT_OF_FOLDER"/> <int value="2" label="MOVE_INTO_ANOTHER_FOLDER"/> - <int value="3" label="REORDER_IN_FOLDER"/> - <int value="4" label="REORDER_IN_TOP_LEVEL"/> + <int value="3" label="REORDER_BY_DRAG_IN_FOLDER"/> + <int value="4" label="REORDER_BY_DRAG_IN_TOP_LEVEL"/> + <int value="5" label="REORDER_BY_KEYBOARD_IN_FOLDER"/> + <int value="6" label="REORDER_BY_KEYBOARD_IN_TOP_LEVEL"/> </enum> <enum name="AppListAppType"> @@ -20700,7 +20702,7 @@ <int value="1352" label="CSSValueAppearanceNotNone"/> <int value="1353" label="CSSValueAppearanceOthers"/> <int value="1354" label="CSSValueAppearanceButton"/> - <int value="1355" label="CSSValueAppearanceCaret"/> + <int value="1355" label="OBSOLETE_CSSValueAppearanceCaret"/> <int value="1356" label="CSSValueAppearanceCheckbox"/> <int value="1357" label="CSSValueAppearanceMenulist"/> <int value="1358" label="CSSValueAppearanceMenulistButton"/> @@ -22198,23 +22200,28 @@ <int value="2793" label="AnimationFrameCancelledWithinFrame"/> <int value="2794" label="SchedulingIsInputPending"/> <int value="2795" label="V8StringNormalize"/> - <int value="2796" label="CSSValueAppearanceButtonBevel"/> - <int value="2797" label="CSSValueAppearanceListitem"/> - <int value="2798" label="CSSValueAppearanceMediaControlsBackground"/> + <int value="2796" label="OBSOLETE_CSSValueAppearanceButtonBevel"/> + <int value="2797" label="OBSOLETE_CSSValueAppearanceListitem"/> + <int value="2798" label="OBSOLETE_CSSValueAppearanceMediaControlsBackground"/> <int value="2799" - label="CSSValueAppearanceMediaControlsFullscreenBackground"/> - <int value="2800" label="CSSValueAppearanceMediaCurrentTimeDisplay"/> - <int value="2801" label="CSSValueAppearanceMediaEnterFullscreenButton"/> - <int value="2802" label="CSSValueAppearanceMediaExitFullscreenButton"/> - <int value="2803" label="CSSValueAppearanceMediaMuteButton"/> - <int value="2804" label="CSSValueAppearanceMediaOverlayPlayButton"/> - <int value="2805" label="CSSValueAppearanceMediaPlayButton"/> - <int value="2806" label="CSSValueAppearanceMediaTimeRemainingDisplay"/> - <int value="2807" label="CSSValueAppearanceMediaToggleClosedCaptionsButton"/> - <int value="2808" label="CSSValueAppearanceMediaVolumeSliderContainer"/> - <int value="2809" label="CSSValueAppearanceMenulistTextfield"/> - <int value="2810" label="CSSValueAppearanceMenulistText"/> - <int value="2811" label="CSSValueAppearanceProgressBarValue"/> + label="OBSOLETE_CSSValueAppearanceMediaControlsFullscreenBackground"/> + <int value="2800" label="OBSOLETE_CSSValueAppearanceMediaCurrentTimeDisplay"/> + <int value="2801" + label="OBSOLETE_CSSValueAppearanceMediaEnterFullscreenButton"/> + <int value="2802" + label="OBSOLETE_CSSValueAppearanceMediaExitFullscreenButton"/> + <int value="2803" label="OBSOLETE_CSSValueAppearanceMediaMuteButton"/> + <int value="2804" label="OBSOLETE_CSSValueAppearanceMediaOverlayPlayButton"/> + <int value="2805" label="OBSOLETE_CSSValueAppearanceMediaPlayButton"/> + <int value="2806" + label="OBSOLETE_CSSValueAppearanceMediaTimeRemainingDisplay"/> + <int value="2807" + label="OBSOLETE_CSSValueAppearanceMediaToggleClosedCaptionsButton"/> + <int value="2808" + label="OBSOLETE_CSSValueAppearanceMediaVolumeSliderContainer"/> + <int value="2809" label="OBSOLETE_CSSValueAppearanceMenulistTextfield"/> + <int value="2810" label="OBSOLETE_CSSValueAppearanceMenulistText"/> + <int value="2811" label="OBSOLETE_CSSValueAppearanceProgressBarValue"/> <int value="2812" label="U2FCryptotokenRegister"/> <int value="2813" label="U2FCryptotokenSign"/> <int value="2814" label="CSSValueAppearanceInnerSpinButton"/> @@ -22236,6 +22243,7 @@ <int value="2830" label="CSSSelectorHostContextInLiveProfile"/> <int value="2831" label="ImportMap"/> <int value="2832" label="RefreshHeader"/> + <int value="2833" label="SearchEventFired"/> </enum> <enum name="FeaturePolicyFeature"> @@ -32940,6 +32948,8 @@ <int value="283232244" label="OmniboxUIExperimentNarrowDropdown:enabled"/> <int value="287932297" label="AutofillSettingsCardTypeSplit:enabled"/> <int value="288012253" label="CrostiniFiles:enabled"/> + <int value="288755982" + label="AutofillEnableLocalCardMigrationForNonSyncUser:enabled"/> <int value="292560715" label="ViewsCastDialog:disabled"/> <int value="293134455" label="AutofillSendBillingCustomerNumber:disabled"/> <int value="293996306" label="ArrayPrototypeValues:disabled"/> @@ -33999,6 +34009,8 @@ <int value="1989877708" label="PostScriptPrinting:enabled"/> <int value="1990562608" label="LinkManagedNoticeToChromeUIManagementURL:enabled"/> + <int value="1990670943" + label="AutofillEnableLocalCardMigrationForNonSyncUser:disabled"/> <int value="1991771852" label="LeftToRightUrls:enabled"/> <int value="1991912338" label="ModuleScriptsDynamicImport:enabled"/> <int value="1992466116" label="enable-passive-event-listeners-due-to-fling"/> @@ -34682,6 +34694,9 @@ </enum> <enum name="MainFrameDownloadSandboxGesture"> + <obsolete> + Deprecated as of 03/2019. + </obsolete> <summary> For a download that occurs in top frame, record whether the frame is sandboxed and whether the download involves a transient user gesture. It is @@ -46819,7 +46834,7 @@ <int value="8" label="FileThread"/> <int value="9" label="DatabaseThread"/> <int value="10" label="WebAudioThread"/> - <int value="11" label="ScriptStreamerThread (obsolete)"/> + <int value="11" label="ScriptStreamerThread"/> <int value="12" label="OfflineAudioRenderThread"/> <int value="13" label="ReverbConvolutionBackgroundThread"/> <int value="14" label="HRTFDatabaseLoaderThread"/> @@ -51843,6 +51858,9 @@ </enum> <enum name="SubframeDownloadSandboxOriginAdGesture"> + <obsolete> + Deprecated as of 03/2019. + </obsolete> <summary> For a download that occurs in subframe, record whether the frame is sandboxed, whether the origin is same to the top frame, whether it's an ad @@ -56549,6 +56567,7 @@ <int value="5" label="WebContentsDestroyed"/> <int value="6" label="WriteDataFailed"/> <int value="7" label="UserInstallDeclined"/> + <int value="8" label="InstallManagerDestroyed"/> </enum> <enum name="WebAppInstallSource"> @@ -56974,6 +56993,7 @@ <enum name="WebRtcLoggingWebAppIdHash"> <int value="-100222544" label="Hangouts"/> <int value="0" label="Undefined"/> + <int value="2102772693" label="Duo"/> </enum> <enum name="WebRtcNativeRate">
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml index 0bf7bbc4..5ff7626d 100644 --- a/tools/metrics/histograms/histograms.xml +++ b/tools/metrics/histograms/histograms.xml
@@ -26401,6 +26401,9 @@ <histogram name="Download.MainFrame.SandboxGesture" enum="MainFrameDownloadSandboxGesture"> + <obsolete> + Deprecated as of 03/2019. + </obsolete> <owner>yaoxia@chromium.org</owner> <summary> For a download that occurs in top frame, record whether the frame is @@ -27113,6 +27116,9 @@ <histogram name="Download.Subframe.SandboxOriginAdGesture" enum="SubframeDownloadSandboxOriginAdGesture"> + <obsolete> + Deprecated as of 03/2019. + </obsolete> <owner>yaoxia@chromium.org</owner> <summary> For a download that occurs in subframe, record whether the frame is @@ -43368,7 +43374,7 @@ </histogram> <histogram name="InputMethod.Mojo.Extension.ActivateIMELatency" units="ms" - expires_after="2019-03-31"> + expires_after="2019-06-30"> <owner>googleo@chromium.org</owner> <owner>shuchen@chromium.org</owner> <summary> @@ -43386,7 +43392,7 @@ </histogram> <histogram name="InputMethod.Mojo.Extension.Rulebased.ProcessLatency" - units="ms" expires_after="2019-03-31"> + units="ms" expires_after="2019-06-30"> <owner>googleo@chromium.org</owner> <owner>shuchen@chromium.org</owner> <summary> @@ -43396,7 +43402,7 @@ </histogram> <histogram name="InputMethod.Mojo.Extension.ServiceInitLatency" units="ms" - expires_after="2019-03-31"> + expires_after="2019-06-30"> <owner>googleo@chromium.org</owner> <owner>shuchen@chromium.org</owner> <summary> @@ -54224,6 +54230,23 @@ <histogram name="Memory.NativeLibrary.MappedAndResidentMemoryFootprint" units="KB" expires_after="2019-07-01"> + <obsolete> + Deprecated 03/2019. Replaced by + Memory.NativeLibrary.MappedAndResidentMemoryFootprint2 to add more precision + to buckets. + </obsolete> + <owner>msalama@google.com</owner> + <owner>lizeb@chromium.org</owner> + <summary> + The size of the resident memory for the native library code across all + processes. This metric is computed by parsing proc/self/pagemap and counting + native library pages that are mapped and present in RAM for at least one + Chrome process. Recorded once per UMA ping. Available only on Android. + </summary> +</histogram> + +<histogram name="Memory.NativeLibrary.MappedAndResidentMemoryFootprint2" + units="KB" expires_after="2019-10-01"> <owner>msalama@google.com</owner> <owner>lizeb@chromium.org</owner> <summary> @@ -80558,7 +80581,7 @@ </histogram> <histogram - name="PageLoad.Experimental.PaintTiming.NavigationToLargestContentPaintAllFrames" + name="PageLoad.Experimental.PaintTiming.NavigationToLargestContentPaint.AllFrames" units="ms" expires_after="2019-04-23"> <owner>maxlg@chromium.org</owner> <owner>speed-metrics-dev@chromium.org</owner> @@ -121491,7 +121514,7 @@ </details> </histogram> -<histogram name="Tabs.TabOffsetOfSwitch"> +<histogram base="true" name="Tabs.TabOffsetOfSwitch"> <owner>yusufo@chromium.org</owner> <summary> How many tabs a user moved forward or backward in the Android tab switcher. @@ -123553,6 +123576,16 @@ </summary> </histogram> +<histogram name="UKM.MigratedClientIdInt64ToUInt64" enum="BooleanMigrated" + expires_after="M77"> + <owner>jwd@chromium.org</owner> + <summary> + The client id was migrated from an Int64 pref to a UInt64 pref. Not migrated + is recorded when a valid UInt64 value is loaded from prefs. Migration + started in M75. + </summary> +</histogram> + <histogram name="UKM.PersistentLogRecall.Status" enum="PersistedLogsLogReadStatus"> <owner>holte@chromium.org</owner> @@ -145377,7 +145410,11 @@ Incognito (used for DesktopMenu)"/> <suffix name="GAIAReAuth" label="GAIA-initiated interaction indicating a service type of - Reauthenticate this user"/> + Reauthenticate this user"> + <obsolete> + Deprecated 3/2019. + </obsolete> + </suffix> <suffix name="GAIASignout" label="GAIA-initiated interaction indicating a service type of Signout"/> <suffix name="GAIASignoutIncognito" @@ -148246,6 +148283,14 @@ <affected-histogram name="Tab.NewTabOnload"/> </histogram_suffixes> +<histogram_suffixes name="TabOffsetOfSwitchComponentList" separator="."> + <suffix name="GridTabSwitcher" label="Tab switcher in grid layout"/> + <suffix name="TabGridSheet" + label="The bottom sheet that show a list of Tabs in a grid"/> + <suffix name="TabStrip" label="The TabStrip componets"/> + <affected-histogram name="Tabs.TabOffsetOfSwitch"/> +</histogram_suffixes> + <histogram_suffixes name="Tabs.SwitchLatency" separator="_"> <suffix name="Actual" label="The time it takes to show a real live frame from the renderer on
diff --git a/tools/metrics/ukm/ukm.xml b/tools/metrics/ukm/ukm.xml index ea7fe75e..3d210c7 100644 --- a/tools/metrics/ukm/ukm.xml +++ b/tools/metrics/ukm/ukm.xml
@@ -2287,6 +2287,9 @@ </event> <event name="MainFrameDownload"> + <obsolete> + Deprecated as of 03/2019. + </obsolete> <owner>yaoxia@chromium.org</owner> <summary> Measurement for top frame download. It is only recorded for downloads @@ -5369,6 +5372,9 @@ </event> <event name="SubframeDownload"> + <obsolete> + Deprecated as of 03/2019. + </obsolete> <owner>yaoxia@chromium.org</owner> <summary> Measurement for subframe download. It is only recorded for downloads
diff --git a/tools/perf/benchmarks/smoothness.py b/tools/perf/benchmarks/smoothness.py index 179382b..c4a6c3e 100644 --- a/tools/perf/benchmarks/smoothness.py +++ b/tools/perf/benchmarks/smoothness.py
@@ -21,7 +21,10 @@ def CreateCoreTimelineBasedMeasurementOptions(self): category_filter = chrome_trace_category_filter.CreateLowOverheadFilter() options = timeline_based_measurement.Options(category_filter) - options.SetTimelineBasedMetrics(['renderingMetric']) + options.config.chrome_trace_config.EnableUMAHistograms( + 'Event.Latency.ScrollBegin.Touch.TimeToScrollUpdateSwapBegin4', + 'Event.Latency.ScrollUpdate.Touch.TimeToScrollUpdateSwapBegin4') + options.SetTimelineBasedMetrics(['renderingMetric', 'umaMetric']) return options
diff --git a/tools/perf/contrib/cluster_telemetry/rendering_ct.py b/tools/perf/contrib/cluster_telemetry/rendering_ct.py index 35c33ba..e0b2670 100644 --- a/tools/perf/contrib/cluster_telemetry/rendering_ct.py +++ b/tools/perf/contrib/cluster_telemetry/rendering_ct.py
@@ -40,5 +40,8 @@ def CreateCoreTimelineBasedMeasurementOptions(self): category_filter = chrome_trace_category_filter.CreateLowOverheadFilter() options = timeline_based_measurement.Options(category_filter) - options.SetTimelineBasedMetrics(['renderingMetric']) + options.config.chrome_trace_config.EnableUMAHistograms( + 'Event.Latency.ScrollBegin.Touch.TimeToScrollUpdateSwapBegin4', + 'Event.Latency.ScrollUpdate.Touch.TimeToScrollUpdateSwapBegin4') + options.SetTimelineBasedMetrics(['renderingMetric', 'umaMetric']) return options
diff --git a/tools/perf/contrib/cluster_telemetry/repaint.py b/tools/perf/contrib/cluster_telemetry/repaint.py index ed88aa6..97f9133 100644 --- a/tools/perf/contrib/cluster_telemetry/repaint.py +++ b/tools/perf/contrib/cluster_telemetry/repaint.py
@@ -44,5 +44,8 @@ def CreateCoreTimelineBasedMeasurementOptions(self): category_filter = chrome_trace_category_filter.CreateLowOverheadFilter() options = timeline_based_measurement.Options(category_filter) - options.SetTimelineBasedMetrics(['renderingMetric']) + options.config.chrome_trace_config.EnableUMAHistograms( + 'Event.Latency.ScrollBegin.Touch.TimeToScrollUpdateSwapBegin4', + 'Event.Latency.ScrollUpdate.Touch.TimeToScrollUpdateSwapBegin4') + options.SetTimelineBasedMetrics(['renderingMetric', 'umaMetric']) return options
diff --git a/tools/perf/contrib/cros_benchmarks/ui_smoothness_bench.py b/tools/perf/contrib/cros_benchmarks/ui_smoothness_bench.py index 8838cbc..707f20db 100644 --- a/tools/perf/contrib/cros_benchmarks/ui_smoothness_bench.py +++ b/tools/perf/contrib/cros_benchmarks/ui_smoothness_bench.py
@@ -22,5 +22,8 @@ def CreateCoreTimelineBasedMeasurementOptions(self): category_filter = chrome_trace_category_filter.CreateLowOverheadFilter() options = timeline_based_measurement.Options(category_filter) - options.SetTimelineBasedMetrics(['renderingMetric']) + options.config.chrome_trace_config.EnableUMAHistograms( + 'Event.Latency.ScrollBegin.Touch.TimeToScrollUpdateSwapBegin4', + 'Event.Latency.ScrollUpdate.Touch.TimeToScrollUpdateSwapBegin4') + options.SetTimelineBasedMetrics(['renderingMetric', 'umaMetric']) return options
diff --git a/tools/perf/contrib/vr_benchmarks/vr_benchmarks.py b/tools/perf/contrib/vr_benchmarks/vr_benchmarks.py index ae56555..a68ba9c7 100644 --- a/tools/perf/contrib/vr_benchmarks/vr_benchmarks.py +++ b/tools/perf/contrib/vr_benchmarks/vr_benchmarks.py
@@ -249,7 +249,10 @@ def CreateCoreTimelineBasedMeasurementOptions(self): category_filter = chrome_trace_category_filter.CreateLowOverheadFilter() options = timeline_based_measurement.Options(category_filter) - options.SetTimelineBasedMetrics(['renderingMetric']) + options.config.chrome_trace_config.EnableUMAHistograms( + 'Event.Latency.ScrollBegin.Touch.TimeToScrollUpdateSwapBegin4', + 'Event.Latency.ScrollUpdate.Touch.TimeToScrollUpdateSwapBegin4') + options.SetTimelineBasedMetrics(['renderingMetric', 'umaMetric']) return options def CreateStorySet(self, options):
diff --git a/tools/perf/core/perf_data_generator.py b/tools/perf/core/perf_data_generator.py index 25e771bd..6474ea5 100755 --- a/tools/perf/core/perf_data_generator.py +++ b/tools/perf/core/perf_data_generator.py
@@ -429,7 +429,9 @@ 'isolate': 'performance_test_suite', 'num_shards': 26, 'extra_args': [ - '--run-ref-build', + # Temporarily disable reference builds on + # Mac to mitigate crbug.com/940075 + #'--run-ref-build', ('--test-shard-map-filename=' 'mac-10_12_laptop_low_end-perf_map.json'), '--assert-gpu-compositing', @@ -508,7 +510,9 @@ { 'isolate': 'performance_test_suite', 'extra_args': [ - '--run-ref-build', + # Temporarily disable reference builds on + # Mac to mitigate crbug.com/940075 + #'--run-ref-build', '--test-shard-map-filename=mac-10_13_laptop_high_end-perf_map.json', '--assert-gpu-compositing', ],
diff --git a/tools/perf/page_sets/rendering/rendering_stories.py b/tools/perf/page_sets/rendering/rendering_stories.py index eb64475..9cd818e 100644 --- a/tools/perf/page_sets/rendering/rendering_stories.py +++ b/tools/perf/page_sets/rendering/rendering_stories.py
@@ -63,17 +63,6 @@ if (platform == platforms.MOBILE and story_class.TAGS and - story_tags.GPU_RASTERIZATION in story_class.TAGS): - self.AddStory(story_class( - page_set=self, - shared_page_state_class=shared_page_state_class, - name_suffix='_desktop_gpu_raster', - extra_browser_args=required_args + [ - '--force-gpu-rasterization', - ])) - - if (platform == platforms.MOBILE and - story_class.TAGS and story_tags.IMAGE_DECODING in story_class.TAGS): self.AddStory(story_class( page_set=self,