diff --git a/DEPS b/DEPS index 61c9656c..b8c24ce 100644 --- a/DEPS +++ b/DEPS
@@ -40,7 +40,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Skia # and whatever else without interference from each other. - 'skia_revision': 'ee93e7803ac23beaed838834948091b0062465aa', + 'skia_revision': '60751d7a069fb540aa468068f792fb6f4999832d', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling V8 # and whatever else without interference from each other.
diff --git a/chrome/VERSION b/chrome/VERSION index 4e5b00c..12c2345 100644 --- a/chrome/VERSION +++ b/chrome/VERSION
@@ -1,4 +1,4 @@ MAJOR=60 MINOR=0 -BUILD=3099 +BUILD=3100 PATCH=0
diff --git a/chrome/browser/subresource_filter/subresource_filter_content_settings_manager_unittest.cc b/chrome/browser/subresource_filter/subresource_filter_content_settings_manager_unittest.cc index 4fd37f1..7d07dbc 100644 --- a/chrome/browser/subresource_filter/subresource_filter_content_settings_manager_unittest.cc +++ b/chrome/browser/subresource_filter/subresource_filter_content_settings_manager_unittest.cc
@@ -78,8 +78,8 @@ base::ScopedTempDir scoped_dir_; content::TestBrowserThreadBundle thread_bundle_; - TestingProfile testing_profile_; base::HistogramTester histogram_tester_; + TestingProfile testing_profile_; // Owned by the testing_profile_. SubresourceFilterContentSettingsManager* settings_manager_ = nullptr; @@ -102,6 +102,13 @@ } }; +TEST_F(SubresourceFilterContentSettingsManagerTest, LogDefaultSetting) { + const char kDefaultContentSetting[] = + "ContentSettings.DefaultSubresourceFilterSetting"; + // The histogram should be logged at profile creation. + histogram_tester().ExpectTotalCount(kDefaultContentSetting, 1); +} + TEST_F(SubresourceFilterContentSettingsManagerTest, IrrelevantSetting) { GetSettingsMap()->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_POPUPS, CONTENT_SETTING_ALLOW);
diff --git a/components/content_settings/core/browser/content_settings_default_provider.cc b/components/content_settings/core/browser/content_settings_default_provider.cc index 30a2a1d1..ffa75aa 100644 --- a/components/content_settings/core/browser/content_settings_default_provider.cc +++ b/components/content_settings/core/browser/content_settings_default_provider.cc
@@ -188,6 +188,10 @@ IntToContentSetting(prefs_->GetInteger( GetPrefName(CONTENT_SETTINGS_TYPE_AUTOPLAY))), CONTENT_SETTING_NUM_SETTINGS); + UMA_HISTOGRAM_ENUMERATION("ContentSettings.DefaultSubresourceFilterSetting", + IntToContentSetting(prefs_->GetInteger(GetPrefName( + CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER))), + CONTENT_SETTING_NUM_SETTINGS); #endif pref_change_registrar_.Init(prefs_); PrefChangeRegistrar::NamedChangeCallback callback = base::Bind(
diff --git a/third_party/WebKit/LayoutTests/FlagExpectations/enable-slimming-paint-v2 b/third_party/WebKit/LayoutTests/FlagExpectations/enable-slimming-paint-v2 index 21281fa..da3f104 100644 --- a/third_party/WebKit/LayoutTests/FlagExpectations/enable-slimming-paint-v2 +++ b/third_party/WebKit/LayoutTests/FlagExpectations/enable-slimming-paint-v2
@@ -109,7 +109,6 @@ Bug(none) paint/invalidation/table/row-change-background-rowspan-cell.html [ Failure ] Bug(none) virtual/new-remote-playback-pipeline/media/controls/video-controls-with-cast-rendering.html [ Failure ] Bug(none) virtual/new-remote-playback-pipeline/media/controls/video-overlay-cast-dark-rendering.html [ Failure ] -Bug(none) paint/invalidation/obscured-background-no-repaint.html [ Crash ] Bug(none) paint/invalidation/compositing/newly-composited-repaint-rect.html [ Failure ] Bug(none) virtual/new-remote-playback-pipeline/media/controls/video-overlay-cast-light-rendering.html [ Failure ] Bug(none) svg/foreignObject/overflow-clip-in-hidden-container-crash.html [ Crash ] @@ -127,7 +126,6 @@ Bug(none) compositing/clip-child-by-non-stacking-ancestor.html [ Failure ] Bug(none) compositing/color-matching/image-color-matching.html [ Failure ] Bug(none) compositing/columns/composited-in-paginated.html [ Failure ] -Bug(none) compositing/composite-scrollable-fixed-position-when-descendants-composite.html [ Failure ] Bug(none) compositing/contents-opaque/background-clip.html [ Failure ] Bug(none) compositing/contents-opaque/background-color.html [ Failure ] Bug(none) compositing/contents-opaque/body-background-painted.html [ Failure ] @@ -339,7 +337,6 @@ Bug(none) compositing/overflow/overflow-scaled-descendant-overlapping.html [ Crash Timeout ] Bug(none) compositing/overflow/overflow-scroll-background-opaque-to-transparent.html [ Failure ] Bug(none) compositing/overflow/overflow-scroll-background-transparent-to-opaque.html [ Failure ] -Bug(none) compositing/overflow/overflow-scroll-with-negative-offset-translucent-outline.html [ Failure ] Bug(none) compositing/overflow/overflow-scroll-with-opaque-background-will-change.html [ Failure ] Bug(none) compositing/overflow/overflow-scroll-with-opaque-background.html [ Failure ] Bug(none) compositing/overflow/overflow-scroll-with-pointer-events-toggle.html [ Failure ] @@ -524,7 +521,6 @@ Bug(none) fast/borders/rtl-border-02.html [ Failure ] Bug(none) fast/borders/rtl-border-03.html [ Failure ] Bug(none) fast/box-shadow/basic-shadows.html [ Failure ] -Bug(none) fast/box-shadow/box-shadow-transformed.html [ Failure ] Bug(none) fast/box-shadow/box-shadow.html [ Failure ] Bug(none) fast/box-sizing/box-sizing.html [ Failure ] Bug(none) fast/canvas/canvas-composite-video.html [ Failure ] @@ -613,7 +609,6 @@ Bug(none) fast/events/touch/touch-rect-crash-on-unpromote-layer.html [ Failure ] Bug(none) fast/events/wheel/wheelevent-in-horizontal-scrollbar-in-rtl.html [ Failure ] Bug(none) fast/events/wheel/wheelevent-in-vertical-scrollbar-in-rtl.html [ Failure ] -Bug(none) fast/forms/select-popup/popup-menu-position.html [ Failure ] Bug(none) fast/forms/button-default-title.html [ Failure ] Bug(none) fast/forms/fieldset/fieldset-align.html [ Failure ] Bug(none) fast/forms/huge-mac-input-clamped-height.html [ Failure ] @@ -913,7 +908,6 @@ Bug(none) fast/sub-pixel/column-clipping.html [ Failure ] Bug(none) fast/sub-pixel/repaint-subpixel-layer-in-subpixel-composited-layer.html [ Failure ] Bug(none) fast/sub-pixel/should-not-repaint-subpixel-composited-layer.html [ Failure ] -Bug(none) fast/sub-pixel/sub-pixel-composited-layer-with-transform.html [ Failure ] Bug(none) fast/sub-pixel/transformed-iframe-copy-on-scroll.html [ Failure ] Bug(none) fast/table/023.html [ Failure ] Bug(none) virtual/mojo-loading/fast/table/023.html [ Failure ] @@ -1040,7 +1034,6 @@ Bug(none) paint/invalidation/composited-iframe-scroll-repaint.html [ Failure ] Bug(none) paint/invalidation/compositing/page-scale-repaint.html [ Crash ] Bug(none) paint/invalidation/fixed-in-page-scale.html [ Crash ] -Bug(none) paint/invalidation/fixed-move-after-keyboard-scroll.html [ Crash ] Bug(none) paint/invalidation/fixed-right-bottom-in-page-scale.html [ Crash ] Bug(none) paint/invalidation/iframe-scroll-repaint.html [ Failure ] Bug(none) paint/invalidation/relayout-fixed-position-after-scale.html [ Crash ] @@ -1049,12 +1042,8 @@ Bug(none) paint/invalidation/scrolled-iframe-scrollbar-change.html [ Failure ] Bug(none) paint/invalidation/single-line-cells-repeating-thead-break-inside-on-thead-only.html [ Crash ] Bug(none) paint/invalidation/svg/absolute-sized-content-with-resources.xhtml [ Crash ] -Bug(none) paint/invalidation/svg/animate-path-discrete.svg [ Crash ] -Bug(none) paint/invalidation/svg/animate-path-morphing.svg [ Crash ] -Bug(none) paint/invalidation/svg/animate-target-removed-from-document.svg [ Crash ] Bug(none) paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-1.html [ Failure ] Bug(none) paint/invalidation/svg/deep-nested-embedded-svg-size-changes-no-layout-triggers-2.html [ Failure ] -Bug(none) paint/invalidation/svg/feImage-animated-transform-on-target-rect.svg [ Crash ] Bug(none) paint/invalidation/svg/js-late-mask-and-object-creation.svg [ Crash ] Bug(none) paint/invalidation/svg/js-late-mask-creation.svg [ Crash ] Bug(none) paint/invalidation/svg/mask-child-changes.svg [ Crash ] @@ -1065,7 +1054,6 @@ Bug(none) paint/invalidation/svg/resource-invalidate-on-target-update.svg [ Crash ] Bug(none) paint/invalidation/svg/text-mask-update.svg [ Crash ] Bug(none) paint/invalidation/svg/use-detach.svg [ Failure ] -Bug(none) paint/invalidation/svg/use-instanceRoot-event-bubbling.xhtml [ Crash ] Bug(none) paint/invalidation/svg/viewport-mask-update.html [ Crash ] Bug(none) paint/invalidation/table-cell-collapsed-border.html [ Crash ] Bug(none) paint/invalidation/table-collapsed-border.html [ Crash ] @@ -1083,20 +1071,15 @@ Bug(none) paint/frames/frameset-with-stacking-context-and-not-stacking-context-children.html [ Failure ] Bug(none) paint/frames/frameset-with-stacking-contexts.html [ Failure ] Bug(none) paint/invalidation/4776765.html [ Failure ] -Bug(none) paint/invalidation/absolute-margin-change-repaint.html [ Failure ] Bug(none) paint/invalidation/absolute-position-change-containing-block.html [ Failure ] -Bug(none) paint/invalidation/absolute-position-changed.html [ Failure ] Bug(none) paint/invalidation/absolute-position-moved.html [ Failure ] Bug(none) paint/invalidation/abspos-shift-image-incorrect-repaint.html [ Failure ] Bug(none) paint/invalidation/add-table-overpaint.html [ Failure ] Bug(none) paint/invalidation/align-content-change.html [ Failure ] Bug(none) paint/invalidation/align-content-distribution-change-grid.html [ Failure ] -Bug(none) paint/invalidation/align-content-position-change-grid.html [ Failure ] Bug(none) paint/invalidation/align-items-change.html [ Failure ] -Bug(none) paint/invalidation/align-items-overflow-change.html [ Failure ] Bug(none) paint/invalidation/align-self-change-grid.html [ Failure ] Bug(none) paint/invalidation/align-self-change.html [ Failure ] -Bug(none) paint/invalidation/align-self-overflow-change.html [ Failure ] Bug(none) paint/invalidation/animated-gif-background.html [ Failure ] Bug(none) paint/invalidation/animated-gif-transformed-offscreen.html [ Failure ] Bug(none) paint/invalidation/animated-gif.html [ Failure ] @@ -1270,7 +1253,6 @@ Bug(none) paint/invalidation/fixed-descendant-of-transformed-scrolled.html [ Failure ] Bug(none) paint/invalidation/fixed-element-repaint-after-compositing-update.html [ Failure ] Bug(none) paint/invalidation/fixed-img-src-change-after-scroll.html [ Failure ] -Bug(none) paint/invalidation/fixed-margin-change-repaint.html [ Failure ] Bug(none) paint/invalidation/fixed-move-after-scroll.html [ Failure ] Bug(none) paint/invalidation/fixed-position-transparency-with-overflow.html [ Failure ] Bug(none) paint/invalidation/fixed-scale.html [ Failure ] @@ -1284,10 +1266,8 @@ Bug(none) paint/invalidation/fixed-under-composited-fixed-scrolled.html [ Failure ] Bug(none) paint/invalidation/fixed-with-border-under-composited-absolute-scrolled.html [ Failure ] Bug(none) paint/invalidation/fixed.html [ Failure ] -Bug(none) paint/invalidation/flexbox/repaint-column-reverse.html [ Failure ] Bug(none) paint/invalidation/flexbox/repaint-during-resize-no-flex.html [ Failure ] Bug(none) paint/invalidation/flexbox/repaint-on-layout.html [ Failure ] -Bug(none) paint/invalidation/flexbox/repaint-on-margin-change.html [ Failure ] Bug(none) paint/invalidation/flexbox/repaint-opacity-change.html [ Failure ] Bug(none) paint/invalidation/flexbox/repaint-rtl-column.html [ Failure ] Bug(none) paint/invalidation/flexbox/repaint.html [ Failure ] @@ -1301,7 +1281,6 @@ Bug(none) paint/invalidation/focus-continuations.html [ Failure ] Bug(none) paint/invalidation/focus-enable-continuations.html [ Failure ] Bug(none) paint/invalidation/focus-ring-on-child-move.html [ Failure ] -Bug(none) paint/invalidation/focus-ring-on-continuation-move.html [ Failure ] Bug(none) paint/invalidation/focus-ring-on-inline-continuation-move.html [ Failure ] Bug(none) paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown.html [ Failure ] Bug(none) paint/invalidation/forms/checkbox-focus-by-mouse-then-keydown.html [ Failure ] @@ -1347,18 +1326,10 @@ Bug(none) paint/invalidation/invalidation-after-opacity-change-subtree.html [ Failure ] Bug(none) paint/invalidation/invalidation-on-foreground-graphics-layer.html [ Failure ] Bug(none) paint/invalidation/invalidation-with-scale-transform.html [ Failure ] -Bug(none) paint/invalidation/invalidation-with-zero-size-object.html [ Failure ] Bug(none) paint/invalidation/japanese-rl-selection-clear.html [ Failure ] Bug(none) paint/invalidation/japanese-rl-selection-repaint.html [ Failure ] -Bug(none) paint/invalidation/justify-content-change.html [ Failure ] Bug(none) paint/invalidation/justify-content-distribution-change-grid.html [ Failure ] -Bug(none) paint/invalidation/justify-content-position-change-grid.html [ Failure ] -Bug(none) paint/invalidation/justify-content-position-change.html [ Failure ] -Bug(none) paint/invalidation/justify-items-change.html [ Failure ] -Bug(none) paint/invalidation/justify-items-legacy-change.html [ Failure ] -Bug(none) paint/invalidation/justify-items-overflow-change.html [ Failure ] Bug(none) paint/invalidation/justify-self-change.html [ Failure ] -Bug(none) paint/invalidation/justify-self-overflow-change.html [ Failure ] Bug(none) paint/invalidation/layer-full-repaint.html [ Failure ] Bug(none) paint/invalidation/layer-hide-when-needs-layout.html [ Failure ] Bug(none) paint/invalidation/layout-state-only-positioned.html [ Failure ] @@ -1382,7 +1353,6 @@ Bug(none) paint/invalidation/lines-with-layout-delta.html [ Failure ] Bug(none) paint/invalidation/list-marker-2.html [ Failure ] Bug(none) paint/invalidation/make-children-non-inline.html [ Failure ] -Bug(none) paint/invalidation/margin.html [ Failure ] Bug(none) paint/invalidation/media-audio-no-spurious-repaints.html [ Failure ] Bug(none) paint/invalidation/mix-blend-mode-separate-stacking-context.html [ Failure ] Bug(none) paint/invalidation/multi-layout-one-frame.html [ Failure ] @@ -1903,7 +1873,6 @@ Bug(none) svg/text/foreignObject-text-clipping-bug.xml [ Failure ] Bug(none) svg/text/text-selection-text-08-b.svg [ Failure ] Bug(none) svg/transforms/svg-css-transforms-clip-path.xhtml [ Failure ] -Bug(none) svg/transforms/svg-css-transforms.xhtml [ Failure ] Bug(none) svg/transforms/text-with-mask-with-svg-transform.svg [ Failure Crash ] Bug(none) svg/transforms/text-with-pattern-inside-transformed-html.xhtml [ Failure ] Bug(none) svg/W3C-SVG-1.1/coords-viewattr-01-b.svg [ Failure ] @@ -1938,7 +1907,6 @@ Bug(none) svg/zoom/text/zoom-svg-float-border-padding.xml [ Failure ] Bug(none) transforms/rotated-transform-affects-scrolling-1.html [ Failure ] Bug(none) transforms/rotated-transform-affects-scrolling-2.html [ Failure ] -Bug(none) transforms/shadows.html [ Failure ] Bug(none) transforms/transform-on-inline.html [ Failure ] Bug(none) transforms/transform-table-row.html [ Failure ] Bug(none) transforms/transformed-caret.html [ Pass Failure ] @@ -2107,7 +2075,6 @@ crbug.com/589265 fast/css/ZeroOpacityLayers.html [ Failure ] crbug.com/589265 fast/css/ZeroOpacityLayers2.html [ Failure ] crbug.com/589265 fast/forms/indeterminate.html [ Failure ] -crbug.com/589265 fast/forms/textarea/textarea-scrolled-mask.html [ Failure ] crbug.com/589265 svg/custom/small-rect-scale.svg [ Failure ] crbug.com/589265 svg/dynamic-updates/SVGFEBlendElement-dom-in-attr.html [ Failure ] crbug.com/589265 svg/dynamic-updates/SVGFEBlendElement-dom-in2-attr.html [ Failure ] @@ -2167,19 +2134,14 @@ crbug.com/589265 virtual/threaded/animations/animated-filter-svg-element.html [ Failure Crash ] # Some work remains to fully support composited animation and scrolling. -Bug(none) virtual/threaded/animations/css-animation-affects-use-elements.html [ Failure ] -Bug(none) virtual/threaded/animations/composited-animation-style-update.html [ Failure ] +Bug(none) virtual/threaded/animations/css-animation-affects-use-elements.html [ Timeout Failure ] +Bug(none) virtual/threaded/animations/composited-animation-style-update.html [ Timeout Failure ] crbug.com/702350 transitions/opacity-transform-transitions-inside-iframe.html [ Timeout ] crbug.com/702350 virtual/threaded/transitions/opacity-transform-transitions-inside-iframe.html [ Timeout ] crbug.com/702353 transitions/transition-end-event-destroy-iframe.html [ Timeout ] crbug.com/702353 virtual/threaded/transitions/transition-end-event-destroy-iframe.html [ Timeout ] -crbug.com/702353 virtual/threaded/transitions/extra-transition.html [ Timeout ] crbug.com/702365 virtual/threaded/animations/composited-filter-webkit-filter.html [ Failure ] crbug.com/702370 virtual/threaded/animations/compositor-independent-transform-cancel.html [ Failure ] -crbug.com/702379 virtual/threaded/animations/skew-notsequential-compositor.html [ Failure Crash ] -crbug.com/692310 virtual/threaded/animations/3d/replace-filling-transform.html [ Crash ] -crbug.com/692310 virtual/threaded/animations/change-transform-style-during-animation.html [ Crash ] -crbug.com/692310 virtual/threaded/animations/fill-mode-transform.html [ Crash ] # Eight of the frames in the test below paint no content. In SPv2 we will never # composite animations that paint nothing. For now we mark this test as failing, # and can explore enhancing animation test infrastructure or other @@ -2212,7 +2174,6 @@ # Tests that fail after changes to border dash painting, due to antialiasing differences # and minor border radius clipping differences. Some SPv2 change is being ticked by the border # painting code. -Bug(700530) fast/css/background-clip-values.html [ Failure ] Bug(700530) svg/text/small-fonts-in-html5.html [ Failure ] Bug(700530) compositing/overflow/paint-neg-z-order-descendants-into-scrolling-contents-layer.html [ Failure ] Bug(700530) fast/multicol/tall-content-in-inner-with-fixed-height.html [ Failure ] @@ -2223,7 +2184,6 @@ crbug.com/702805 css3/blending/svg-isolation-add-masking.html [ Crash ] crbug.com/702805 css3/blending/svg-blend-layer-filter.html [ Crash ] crbug.com/702805 virtual/threaded/compositing/visibility/overlays-persist-on-navigation.html [ Crash ] -crbug.com/702805 virtual/threaded/animations/responsive-neutral-keyframe.html [ Crash ] crbug.com/702805 svg/text/removing-id-on-path.html [ Failure ] crbug.com/702805 svg/text/selection-style-within-mask-crash.html [ Crash ] crbug.com/702805 svg/custom/mask-with-all-units.svg [ Crash ] @@ -2243,29 +2203,8 @@ crbug.com/702805 svg/masking/mask-type-alpha.svg [ Crash ] crbug.com/702805 svg/masking/mask-type-not-set.svg [ Crash ] crbug.com/702805 svg/masking/mask-type-luminance.svg [ Crash ] -crbug.com/702805 svg/hixie/perf/006.xml [ Crash ] -crbug.com/702805 svg/hixie/perf/003.xml [ Crash ] -crbug.com/702805 svg/hixie/perf/001.xml [ Crash ] -crbug.com/702805 svg/hixie/perf/005.xml [ Crash ] -crbug.com/702805 svg/hixie/perf/002.xml [ Crash ] -crbug.com/702805 svg/hixie/perf/004.xml [ Crash ] -crbug.com/702805 animations/responsive-neutral-keyframe.html [ Crash ] -crbug.com/702805 fast/loader/scroll-restore-target-pseudo.html [ Crash ] -crbug.com/702805 fast/loader/scroll-restore-overrides-fragment.html [ Crash ] crbug.com/702805 fast/forms/select-popup/popup-menu-appearance-coarse.html [ Crash Timeout ] crbug.com/702805 css3/blending/svg-blend-layer-mask.html [ Crash ] crbug.com/702805 fast/borders/border-radius-mask-video-crash.html [ Crash ] -crbug.com/702805 fast/css/getComputedStyle/invalid-url-double-recalc-serialization.html [ Crash ] -crbug.com/702805 fast/overflow/overflow-update-transform.html [ Crash ] -crbug.com/702805 web-animations-api/element-animate-list-of-keyframes.html [ Crash ] -crbug.com/702805 web-animations-api/animation-reverse-end-exclusive.html [ Crash ] -crbug.com/702805 compositing/transitions/singular-scale-transition.html [ Crash ] crbug.com/702805 compositing/images/direct-image-dynamic-border-radius.html [ Crash ] -crbug.com/702805 compositing/content-changed-chicken-egg.html [ Crash ] -crbug.com/702805 compositing/squashing/remove-from-grouped-mapping-on-reassignment.html [ Crash ] crbug.com/702805 compositing/visibility/overlays-persist-on-navigation.html [ Crash ] -crbug.com/702805 compositing/overflow/overflow-positioning.html [ Crash ] -crbug.com/702805 compositing/layer-creation/incremental-destruction.html [ Crash ] -crbug.com/702805 fast/forms/number/number-stepup-stepdown-from-renderer.html [ Crash Timeout ] -crbug.com/702805 fast/forms/range/range-stepup-stepdown-from-renderer.html [ Crash Timeout ] -crbug.com/702805 fast/dom/shadow/selections-in-shadow.html [ Crash Timeout ]
diff --git a/third_party/WebKit/Source/devtools/front_end/perf_ui/flameChart.css b/third_party/WebKit/Source/devtools/front_end/perf_ui/flameChart.css index 6f42b1b..ae1575a 100644 --- a/third_party/WebKit/Source/devtools/front_end/perf_ui/flameChart.css +++ b/third_party/WebKit/Source/devtools/front_end/perf_ui/flameChart.css
@@ -33,35 +33,29 @@ .flame-chart-v-scroll { position: absolute; - top: 0; - right: 0; - bottom: 0; overflow-x: hidden; z-index: 200; padding-left: 1px; + right: 2px; + top: 3px; + bottom: 3px; } .flame-chart-v-scroll.always-show-scrollbar { overflow-y: scroll; } -:host-context(.platform-mac) .flame-chart-v-scroll { - right: 2px; - top: 3px; - bottom: 3px; -} - /* force non-overlay scrollbars */ -:host-context(.platform-mac) ::-webkit-scrollbar { +::-webkit-scrollbar { width: 8px; } -:host-context(.platform-mac) ::-webkit-scrollbar-thumb { +::-webkit-scrollbar-thumb { background-color: hsla(0, 0%, 56%, 0.6); border-radius: 50px; } -:host-context(.platform-mac) .flame-chart-v-scroll:hover::-webkit-scrollbar-thumb { +.flame-chart-v-scroll:hover::-webkit-scrollbar-thumb { background-color: hsla(0, 0%, 25%, 0.6); }
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml index 4dc1b4a..32f6e05 100644 --- a/tools/metrics/histograms/histograms.xml +++ b/tools/metrics/histograms/histograms.xml
@@ -8584,6 +8584,12 @@ </summary> </histogram> +<histogram name="ContentSettings.DefaultSubresourceFilterSetting" + enum="ContentSetting"> + <owner>csharrison@chromium.org</owner> + <summary>The default subresource filter setting at profile open</summary> +</histogram> + <histogram name="ContentSettings.DefaultWebBluetoothGuardSetting" enum="ContentSetting"> <owner>jyasskin@chromium.org</owner> @@ -84717,6 +84723,7 @@ <suffix name="push-messaging" label="Push messaging exceptions"/> <suffix name="site-engagement" label="Site engagement exceptions"/> <suffix name="ssl-cert-decisions" label="SSL cert decisions exceptions"/> + <suffix name="subresource-filter" label="Subresource filter exceptions"/> <suffix name="usb-chooser-data" label="USB chooser data exceptions"/> <affected-histogram name="ContentSettings.Exceptions"/> </histogram_suffixes>