diff --git a/AUTHORS b/AUTHORS index ab6b550c..c1944f0 100644 --- a/AUTHORS +++ b/AUTHORS
@@ -71,6 +71,7 @@ Amruth Raj <amruthraj@motorola.com> Amruth Raj <ckqr36@motorola.com> Anand Ratn <anand.ratn@samsung.com> +Anant Jain <anant90@gmail.com> Anastasios Cassiotis <tom.cassiotis@gmail.com> anatoly techtonik <techtonik@gmail.com> Ancil George <ancilgeorge@samsung.com> @@ -473,6 +474,7 @@ Jonathan Frazer <listedegarde@gmail.com> Jonathan Garbee <jonathan@garbee.me> Jonathan Hacker <jhacker@arcanefour.com> +Jonathan Kingston <kingstonmailbox@gmail.com> Jongdeok Kim <jongdeok.kim@navercorp.com> Jongheon Kim <sapzape@gmail.com> JongKwon Lee <jongkwon.lee@navercorp.com>
diff --git a/DEPS b/DEPS index 1a2a4542..eb43817 100644 --- a/DEPS +++ b/DEPS
@@ -175,7 +175,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': '78dac6dcb222b38234d20b3deab68af1bff6b6e3', + 'skia_revision': '3e192165cb65d24ee9b59b115dfce8e7a52c61bc', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling V8 # and whatever else without interference from each other. @@ -187,15 +187,15 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling ANGLE # and whatever else without interference from each other. - 'angle_revision': '4f10b113a1914ea554eac86855eec5fd0a78e30e', + 'angle_revision': '9e263aa8a4e65ffbd59bb90f13abd6b8f102f71e', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling SwiftShader # and whatever else without interference from each other. - 'swiftshader_revision': '8be72df6046231eedbd14d155a5a9484bda217c1', + 'swiftshader_revision': '16ae92a4ee5212883f1dbeefd1a91f924b2c2548', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling PDFium # and whatever else without interference from each other. - 'pdfium_revision': 'da0658022d4cfbb40c85a84a1fc889fb057bcdc4', + 'pdfium_revision': 'fe6381e8e36606a37149d4471f24ec34607f4ebd', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling BoringSSL # and whatever else without interference from each other. @@ -238,7 +238,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling catapult # and whatever else without interference from each other. - 'catapult_revision': '4bdcfb7b6e69d52559f73c7ff811d213eb0f9a8e', + 'catapult_revision': '8bf3aecd3335cc7b678c2d3ba24eaab6c43de13c', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libFuzzer # and whatever else without interference from each other. @@ -246,7 +246,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling devtools-frontend # and whatever else without interference from each other. - 'devtools_frontend_revision': '7cdf69dbbf43a6fa66c7d1286584963bd2213790', + 'devtools_frontend_revision': '715c8c459f00def9ee77146442633fd015990a94', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libprotobuf-mutator # and whatever else without interference from each other. @@ -899,7 +899,7 @@ }, 'src/third_party/depot_tools': - Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '8aa9d62e8ecce56cd1054bd8c2dd72ba02c7bb04', + Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '552ddbf3bfe04c7daa75e04d17263b4cd348999b', 'src/third_party/devtools-frontend/src': Var('chromium_git') + '/devtools/devtools-frontend' + '@' + Var('devtools_frontend_revision'), @@ -1250,7 +1250,7 @@ }, 'src/third_party/perfetto': - Var('android_git') + '/platform/external/perfetto.git' + '@' + '82e00fd235e4269372200867ae6eb9eb3a7e62a4', + Var('android_git') + '/platform/external/perfetto.git' + '@' + 'ccdbaf215f0c8ff228c7ddf615fb50efe9ed6f04', 'src/third_party/perl': { 'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + '6f3e5028eb65d0b4c5fdd792106ac4c84eee1eb3', @@ -1454,7 +1454,7 @@ Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + 'ec18cc3262922e7dcdbe70243c6f40606f979144', 'src/third_party/webrtc': - Var('webrtc_git') + '/src.git' + '@' + 'dd14a955967b69bf1611ce2985a5457934b1fb1d', + Var('webrtc_git') + '/src.git' + '@' + '430e4a09e0ca66a9680cd9884a90ca5b4346bcd7', 'src/third_party/libgifcodec': Var('skia_git') + '/libgifcodec' + '@'+ Var('libgifcodec_revision'), @@ -1529,7 +1529,7 @@ Var('chromium_git') + '/v8/v8.git' + '@' + Var('v8_revision'), 'src-internal': { - 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@aee432d7489e46c7f23ef3ed9fdc4fc2873e5046', + 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@76a104eafd232e1525793bf2c7a1cbada9738537', 'condition': 'checkout_src_internal', },
diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java index 8461c6f..08c188f 100644 --- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java +++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java
@@ -10,7 +10,6 @@ import android.os.Build; import android.os.Looper; import android.os.Process; -import android.os.SystemClock; import android.util.Log; import android.webkit.CookieManager; import android.webkit.GeolocationPermissions; @@ -36,9 +35,6 @@ import org.chromium.android_webview.VariationsSeedLoader; import org.chromium.android_webview.WebViewChromiumRunQueue; import org.chromium.android_webview.common.AwResource; -import org.chromium.android_webview.common.DeveloperModeUtils; -import org.chromium.android_webview.common.FlagOverrideHelper; -import org.chromium.android_webview.common.ProductionSupportedFlagList; import org.chromium.android_webview.gfx.AwDrawFnImpl; import org.chromium.base.BuildConfig; import org.chromium.base.BuildInfo; @@ -58,8 +54,6 @@ import org.chromium.net.NetworkChangeNotifier; import org.chromium.ui.base.ResourceBundle; -import java.util.Map; - /** * Class controlling the Chromium initialization for WebView. * We hold on to most static objects used by WebView here. @@ -177,29 +171,6 @@ // available when AwFeatureListCreator::SetUpFieldTrials() runs. finishVariationsInitLocked(); - String webViewPackageName = AwBrowserProcess.getWebViewPackageName(); - boolean isDeveloperModeEnabled = - DeveloperModeUtils.isDeveloperModeEnabled(webViewPackageName); - RecordHistogram.recordBooleanHistogram( - "Android.WebView.DevUi.DeveloperModeEnabled", isDeveloperModeEnabled); - if (isDeveloperModeEnabled) { - long start = SystemClock.elapsedRealtime(); - try { - FlagOverrideHelper helper = - new FlagOverrideHelper(ProductionSupportedFlagList.sFlagList); - Map<String, Boolean> flagOverrides = - DeveloperModeUtils.getFlagOverrides(webViewPackageName); - helper.applyFlagOverrides(flagOverrides); - - RecordHistogram.recordCount100Histogram( - "Android.WebView.DevUi.ToggledFlagCount", flagOverrides.size()); - } finally { - long end = SystemClock.elapsedRealtime(); - RecordHistogram.recordTimesHistogram( - "Android.WebView.DevUi.FlagLoadingBlockingTime", end - start); - } - } - AwBrowserProcess.start(); AwBrowserProcess.handleMinidumpsAndSetMetricsConsent(true /* updateMetricsConsent */);
diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java index 02322d5c..223fba6 100644 --- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java +++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
@@ -37,6 +37,9 @@ import org.chromium.android_webview.WebViewChromiumRunQueue; import org.chromium.android_webview.common.AwSwitches; import org.chromium.android_webview.common.CommandLineUtil; +import org.chromium.android_webview.common.DeveloperModeUtils; +import org.chromium.android_webview.common.FlagOverrideHelper; +import org.chromium.android_webview.common.ProductionSupportedFlagList; import org.chromium.base.BuildInfo; import org.chromium.base.CommandLine; import org.chromium.base.ContextUtils; @@ -57,6 +60,7 @@ import java.io.File; import java.util.List; +import java.util.Map; import java.util.concurrent.Callable; import java.util.concurrent.FutureTask; @@ -309,6 +313,29 @@ cl.appendSwitch(AwSwitches.WEBVIEW_LOG_JS_CONSOLE_MESSAGES); } + String webViewPackageName = AwBrowserProcess.getWebViewPackageName(); + boolean isDeveloperModeEnabled = + DeveloperModeUtils.isDeveloperModeEnabled(webViewPackageName); + RecordHistogram.recordBooleanHistogram( + "Android.WebView.DevUi.DeveloperModeEnabled", isDeveloperModeEnabled); + if (isDeveloperModeEnabled) { + long start = SystemClock.elapsedRealtime(); + try { + FlagOverrideHelper helper = + new FlagOverrideHelper(ProductionSupportedFlagList.sFlagList); + Map<String, Boolean> flagOverrides = + DeveloperModeUtils.getFlagOverrides(webViewPackageName); + helper.applyFlagOverrides(flagOverrides); + + RecordHistogram.recordCount100Histogram( + "Android.WebView.DevUi.ToggledFlagCount", flagOverrides.size()); + } finally { + long end = SystemClock.elapsedRealtime(); + RecordHistogram.recordTimesHistogram( + "Android.WebView.DevUi.FlagLoadingBlockingTime", end - start); + } + } + ThreadUtils.setWillOverrideUiThread(true); BuildInfo.setBrowserPackageInfo(packageInfo);
diff --git a/android_webview/nonembedded/java/res_devui/drawable/blue_circle.xml b/android_webview/nonembedded/java/res_devui/drawable/blue_circle.xml new file mode 100644 index 0000000..db6c1042 --- /dev/null +++ b/android_webview/nonembedded/java/res_devui/drawable/blue_circle.xml
@@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<shape + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/blue_circle" + android:shape="oval"> + <solid android:color="@color/blue"/> + <size + android:width="10dp" + android:height="10dp"/> +</shape>
diff --git a/android_webview/nonembedded/java/res_devui/layout/activity_flags.xml b/android_webview/nonembedded/java/res_devui/layout/activity_flags.xml index e77458b..ccab27d6 100644 --- a/android_webview/nonembedded/java/res_devui/layout/activity_flags.xml +++ b/android_webview/nonembedded/java/res_devui/layout/activity_flags.xml
@@ -38,12 +38,18 @@ android:id="@+id/reset_flags_button" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginBottom="5dp" android:textAppearance="?android:attr/textAppearanceMedium"/> + <!-- horizontal divider --> + <View + android:layout_width="match_parent" + android:layout_height="1dp" + android:background="?android:attr/listDivider"/> + <ListView android:id="@+id/flags_list" android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginTop="5dp"/> + android:layout_height="match_parent"/> </LinearLayout>
diff --git a/android_webview/nonembedded/java/res_devui/layout/flag_states.xml b/android_webview/nonembedded/java/res_devui/layout/flag_states.xml index f9e7f2d..d219399 100644 --- a/android_webview/nonembedded/java/res_devui/layout/flag_states.xml +++ b/android_webview/nonembedded/java/res_devui/layout/flag_states.xml
@@ -16,4 +16,7 @@ android:clickable="false" android:textStyle="bold" android:textAppearance="?android:attr/textAppearanceSmall" - android:padding="2dp" /> + android:layout_marginTop="5dp" + android:layout_marginBottom="5dp" + android:paddingTop="10dp" + android:paddingBottom="10dp" />
diff --git a/android_webview/nonembedded/java/res_devui/layout/toggleable_flag.xml b/android_webview/nonembedded/java/res_devui/layout/toggleable_flag.xml index 95739b6..deedc1c 100644 --- a/android_webview/nonembedded/java/res_devui/layout/toggleable_flag.xml +++ b/android_webview/nonembedded/java/res_devui/layout/toggleable_flag.xml
@@ -13,12 +13,7 @@ android:layout_marginTop="15dp" android:orientation="vertical"> - <!-- horizontal divider --> - <View - android:layout_width="match_parent" - android:layout_height="1dp" - android:background="?android:attr/listDivider"/> - + <!-- A compound drawable will be populated at runtime, but it's OK to configure drawablePadding now. --> <TextView android:id="@+id/flag_name" android:layout_width="match_parent" @@ -26,6 +21,7 @@ android:textIsSelectable="true" android:textStyle="bold" android:textAppearance="?android:attr/textAppearanceMedium" + android:drawablePadding="4dp" android:paddingBottom="2dp" android:paddingTop="2dp" />
diff --git a/android_webview/nonembedded/java/res_devui/values/colors.xml b/android_webview/nonembedded/java/res_devui/values/colors.xml index 298c27e..bd82cfe 100644 --- a/android_webview/nonembedded/java/res_devui/values/colors.xml +++ b/android_webview/nonembedded/java/res_devui/values/colors.xml
@@ -8,4 +8,5 @@ <resources> <color name="error_red">#C5221F</color> <color name="warning_yellow">#FFCC00</color> + <color name="blue">#1967D2</color> </resources>
diff --git a/android_webview/nonembedded/java/src/org/chromium/android_webview/devui/FlagsActivity.java b/android_webview/nonembedded/java/src/org/chromium/android_webview/devui/FlagsActivity.java index 667ad38..5b8f4f70 100644 --- a/android_webview/nonembedded/java/src/org/chromium/android_webview/devui/FlagsActivity.java +++ b/android_webview/nonembedded/java/src/org/chromium/android_webview/devui/FlagsActivity.java
@@ -17,6 +17,7 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; +import android.view.ViewParent; import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.Button; @@ -114,8 +115,9 @@ public void onItemSelected(AdapterView<?> parent, View view, int position, long id) { String flagName = mFlag.getName(); int oldState = booleanToState(mOverriddenFlags.get(flagName)); + int newState = position; - switch (sFlagStates[position]) { + switch (sFlagStates[newState]) { case STATE_DEFAULT: mOverriddenFlags.remove(flagName); break; @@ -127,12 +129,16 @@ break; } - // Only communicate with the service if the map actually updated. This optimizes the - // number of IPCs we make, but this also allows for atomic batch updates by updating - // mOverriddenFlags prior to updating the Spinner state. - int newState = booleanToState(mOverriddenFlags.get(flagName)); + // Update UI and Service. Only communicate with the service if the map actually updated. + // This optimizes the number of IPCs we make, but this also allows for atomic batch + // updates by updating mOverriddenFlags prior to updating the Spinner state. if (oldState != newState) { sendFlagsToService(); + + ViewParent grandparent = parent.getParent(); + if (grandparent instanceof View) { + formatListEntry((View) grandparent, newState); + } } } @@ -173,15 +179,35 @@ adapter.setDropDownViewResource(android.R.layout.select_dialog_singlechoice); flagToggle.setAdapter(adapter); - // Populate spinner state from map. + // Populate spinner state from map and update indicators. int state = booleanToState(mOverriddenFlags.get(flag.getName())); flagToggle.setSelection(state); flagToggle.setOnItemSelectedListener(new FlagStateSpinnerSelectedListener(flag)); + formatListEntry(view, state); return view; } } + /** + * Formats a flag list entry. {@code toggleableFlag} should be the View which holds the {@link + * Spinner}, flag title, flag description, etc. as children. + * + * @param toggleableFlag a View representing an entire flag entry. + * @param state the state of the flag. + */ + private void formatListEntry(View toggleableFlag, int state) { + // View stateIndicator = toggleableFlag.findViewById(R.id.flag_state_indicator); + TextView flagName = toggleableFlag.findViewById(R.id.flag_name); + if (state == /* STATE_DEFAULT */ 0) { + // Unset the compound drawable. + flagName.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0); + } else { // STATE_ENABLED or STATE_DISABLED + // Draws a blue circle to the left of the text. + flagName.setCompoundDrawablesWithIntrinsicBounds(R.drawable.blue_circle, 0, 0, 0); + } + } + @Override public boolean onCreateOptionsMenu(Menu menu) { NavigationMenuHelper.inflate(this, menu);
diff --git a/ash/metrics/demo_session_metrics_recorder.cc b/ash/metrics/demo_session_metrics_recorder.cc index fd974ef..d6cb272 100644 --- a/ash/metrics/demo_session_metrics_recorder.cc +++ b/ash/metrics/demo_session_metrics_recorder.cc
@@ -57,7 +57,7 @@ if (app_id == extension_misc::kScreensaverAppId || app_id == extension_misc::kScreensaverEveAppId || app_id == extension_misc::kScreensaverNocturneAppId || - app_id == extension_misc::kScreensaverAltAppId || + app_id == extension_misc::kScreensaverAtlasAppId || app_id == extension_misc::kScreensaverKukuiAppId) { return DemoModeApp::kScreensaver; }
diff --git a/ash/wm/gestures/back_gesture/back_gesture_event_handler_unittest.cc b/ash/wm/gestures/back_gesture/back_gesture_event_handler_unittest.cc index d6517c6..2f06a24 100644 --- a/ash/wm/gestures/back_gesture/back_gesture_event_handler_unittest.cc +++ b/ash/wm/gestures/back_gesture/back_gesture_event_handler_unittest.cc
@@ -19,6 +19,8 @@ #include "ash/shelf/hotseat_widget.h" #include "ash/shelf/shelf.h" #include "ash/shell.h" +#include "ash/system/model/system_tray_model.h" +#include "ash/system/model/virtual_keyboard_model.h" #include "ash/test/ash_test_base.h" #include "ash/test_shell_delegate.h" #include "ash/wm/overview/overview_controller.h" @@ -541,8 +543,8 @@ EXPECT_EQ(1, target_back_release.accelerator_count()); } -// Tests the back gesture behavior when a virtual keyboard is visible. -TEST_F(BackGestureEventHandlerTest, BackGestureWithVKTest) { +// Tests the back gesture behavior when a Chrome OS IME is visible. +TEST_F(BackGestureEventHandlerTest, BackGestureWithCrosKeyboardTest) { ui::TestAcceleratorTarget target_back_press, target_back_release; RegisterBackPressAndRelease(&target_back_press, &target_back_release); @@ -566,4 +568,30 @@ EXPECT_EQ(1, target_back_release.accelerator_count()); } +// Tests the back gesture behavior when an Android IME is visible. Due to the +// way the Android IME is implemented, a lot of this test is fake behavior, but +// it will help catch regressions. +TEST_F(BackGestureEventHandlerTest, BackGestureWithAndroidKeyboardTest) { + ui::TestAcceleratorTarget target_back_press, target_back_release; + RegisterBackPressAndRelease(&target_back_press, &target_back_release); + + WindowState* window_state = WindowState::Get(top_window()); + ASSERT_FALSE(window_state->IsMinimized()); + + VirtualKeyboardModel* keyboard = + Shell::Get()->system_tray_model()->virtual_keyboard(); + ASSERT_TRUE(keyboard); + // Fakes showing the keyboard. + keyboard->OnArcInputMethodSurfaceBoundsChanged(gfx::Rect(400, 400)); + EXPECT_TRUE(keyboard->visible()); + + // Unfortunately we cannot hook this all the wall up to see if the Android IME + // is hidden, but we can check that back key events are generated and the top + // window is not minimized. + GenerateBackSequence(); + EXPECT_EQ(1, target_back_press.accelerator_count()); + EXPECT_EQ(1, target_back_release.accelerator_count()); + EXPECT_FALSE(window_state->IsMinimized()); +} + } // namespace ash
diff --git a/ash/wm/tablet_mode/tablet_mode_window_manager.cc b/ash/wm/tablet_mode/tablet_mode_window_manager.cc index f671a2b..f9c3f6d8 100644 --- a/ash/wm/tablet_mode/tablet_mode_window_manager.cc +++ b/ash/wm/tablet_mode/tablet_mode_window_manager.cc
@@ -17,6 +17,8 @@ #include "ash/session/session_controller_impl.h" #include "ash/shell.h" #include "ash/shell_delegate.h" +#include "ash/system/model/system_tray_model.h" +#include "ash/system/model/virtual_keyboard_model.h" #include "ash/wm/desks/desks_util.h" #include "ash/wm/mru_window_tracker.h" #include "ash/wm/overview/overview_controller.h" @@ -166,6 +168,16 @@ if (!window) return false; + // Do not minimize the app if a Android IME is visible. The Android IME will + // eat the back event that follows and close itself. Note that the ChromeOS + // IME does not close itself when it sees a back event so it must be closed + // explicitly. + // TODO(sammiequon): For fullscreen apps, fullscreen is exited first before + // the keyboard is hidden. It should be the other way, but this is done to + // keep the logic simple for merging. + if (Shell::Get()->system_tray_model()->virtual_keyboard()->visible()) + return false; + // Do not minimize the window if it is in overview. This can avoid unnecessary // window minimize animation. OverviewController* overview_controller = Shell::Get()->overview_controller();
diff --git a/base/BUILD.gn b/base/BUILD.gn index e0833b5..3b5f788 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn
@@ -28,6 +28,7 @@ import("//build/config/jumbo.gni") import("//build/config/logging.gni") import("//build/config/nacl/config.gni") +import("//build/config/profiling/profiling.gni") import("//build/config/sysroot.gni") import("//build/config/ui.gni") import("//build/nocompile.gni") @@ -1303,7 +1304,7 @@ ":base_static", ":build_date", ":cfi_buildflags", - ":clang_coverage_buildflags", + ":clang_profiling_buildflags", ":debugging_buildflags", ":logging_buildflags", ":orderfile_buildflags", @@ -1359,11 +1360,11 @@ } } - if (use_clang_coverage) { - # Call-sites use this conditional on the CLANG_COVERAGE macro, for clarity. + if (use_clang_profiling) { + # Call-sites use this conditional on the CLANG_PROFILING macro, for clarity. sources += [ - "test/clang_coverage.cc", - "test/clang_coverage.h", + "test/clang_profiling.cc", + "test/clang_profiling.h", ] } @@ -2166,13 +2167,13 @@ flags = [ "USE_PARTITION_ALLOC=$use_partition_alloc" ] } -buildflag_header("clang_coverage_buildflags") { - header = "clang_coverage_buildflags.h" +buildflag_header("clang_profiling_buildflags") { + header = "clang_profiling_buildflags.h" header_dir = "base" flags = [ - "CLANG_COVERAGE=$use_clang_coverage", - "CLANG_COVERAGE_INSIDE_SANDBOX=$use_clang_coverage_inside_sandbox", + "CLANG_PROFILING=$use_clang_profiling", + "CLANG_PROFILING_INSIDE_SANDBOX=$use_clang_profiling_inside_sandbox", ] }
diff --git a/base/build_time_unittest.cc b/base/build_time_unittest.cc index f032788a..851a184 100644 --- a/base/build_time_unittest.cc +++ b/base/build_time_unittest.cc
@@ -5,6 +5,7 @@ #include "base/build_time.h" #include "base/generated_build_date.h" #include "base/time/time.h" +#include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" @@ -31,7 +32,14 @@ #endif } -TEST(BuildTime, InThePast) { +#if defined(OS_FUCHSIA) +// TODO(https://crbug.com/1060357): Enable when RTC flake is fixed. +#define MAYBE_InThePast DISABLED_InThePast +#else +#define MAYBE_InThePast InThePast +#endif + +TEST(BuildTime, MAYBE_InThePast) { EXPECT_LT(base::GetBuildTime(), base::Time::Now()); EXPECT_LT(base::GetBuildTime(), base::Time::NowFromSystemTime()); }
diff --git a/base/debug/debugger_posix.cc b/base/debug/debugger_posix.cc index 8a7858d9..1982173 100644 --- a/base/debug/debugger_posix.cc +++ b/base/debug/debugger_posix.cc
@@ -17,7 +17,7 @@ #include <memory> #include <vector> -#include "base/clang_coverage_buildflags.h" +#include "base/clang_profiling_buildflags.h" #include "base/stl_util.h" #include "base/threading/platform_thread.h" #include "base/time/time.h" @@ -56,8 +56,8 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" -#if BUILDFLAG(CLANG_COVERAGE) -#include "base/test/clang_coverage.h" +#if BUILDFLAG(CLANG_PROFILING) +#include "base/test/clang_profiling.h" #endif #if defined(USE_SYMBOLIZE) @@ -324,8 +324,8 @@ #endif void BreakDebugger() { -#if BUILDFLAG(CLANG_COVERAGE) - WriteClangCoverageProfile(); +#if BUILDFLAG(CLANG_PROFILING) + WriteClangProfilingProfile(); #endif // NOTE: This code MUST be async-signal safe (it's used by in-process
diff --git a/base/debug/debugger_win.cc b/base/debug/debugger_win.cc index fd10b4b..2e3875b 100644 --- a/base/debug/debugger_win.cc +++ b/base/debug/debugger_win.cc
@@ -7,10 +7,10 @@ #include <stdlib.h> #include <windows.h> -#include "base/clang_coverage_buildflags.h" +#include "base/clang_profiling_buildflags.h" -#if BUILDFLAG(CLANG_COVERAGE) -#include "base/test/clang_coverage.h" +#if BUILDFLAG(CLANG_PROFILING) +#include "base/test/clang_profiling.h" #endif namespace base { @@ -21,8 +21,8 @@ } void BreakDebugger() { -#if BUILDFLAG(CLANG_COVERAGE) - WriteClangCoverageProfile(); +#if BUILDFLAG(CLANG_PROFILING) + WriteClangProfilingProfile(); #endif if (IsDebugUISuppressed())
diff --git a/base/process/process_fuchsia.cc b/base/process/process_fuchsia.cc index f260575..516a067 100644 --- a/base/process/process_fuchsia.cc +++ b/base/process/process_fuchsia.cc
@@ -8,14 +8,14 @@ #include <zircon/process.h> #include <zircon/syscalls.h> -#include "base/clang_coverage_buildflags.h" +#include "base/clang_profiling_buildflags.h" #include "base/debug/activity_tracker.h" #include "base/fuchsia/default_job.h" #include "base/fuchsia/fuchsia_logging.h" #include "base/strings/stringprintf.h" -#if BUILDFLAG(CLANG_COVERAGE) -#include "base/test/clang_coverage.h" +#if BUILDFLAG(CLANG_PROFILING) +#include "base/test/clang_profiling.h" #endif namespace base { @@ -93,8 +93,8 @@ // static void Process::TerminateCurrentProcessImmediately(int exit_code) { -#if BUILDFLAG(CLANG_COVERAGE) - WriteClangCoverageProfile(); +#if BUILDFLAG(CLANG_PROFILING) + WriteClangProfilingProfile(); #endif _exit(exit_code); }
diff --git a/base/process/process_posix.cc b/base/process/process_posix.cc index 9636d44..17dae528 100644 --- a/base/process/process_posix.cc +++ b/base/process/process_posix.cc
@@ -10,7 +10,7 @@ #include <sys/resource.h> #include <sys/wait.h> -#include "base/clang_coverage_buildflags.h" +#include "base/clang_profiling_buildflags.h" #include "base/debug/activity_tracker.h" #include "base/files/scoped_file.h" #include "base/logging.h" @@ -23,8 +23,8 @@ #include <sys/event.h> #endif -#if BUILDFLAG(CLANG_COVERAGE) -#include "base/test/clang_coverage.h" +#if BUILDFLAG(CLANG_PROFILING) +#include "base/test/clang_profiling.h" #endif namespace { @@ -276,8 +276,8 @@ // static void Process::TerminateCurrentProcessImmediately(int exit_code) { -#if BUILDFLAG(CLANG_COVERAGE) - WriteClangCoverageProfile(); +#if BUILDFLAG(CLANG_PROFILING) + WriteClangProfilingProfile(); #endif _exit(exit_code); }
diff --git a/base/process/process_win.cc b/base/process/process_win.cc index 4f2ccf96..85688b7 100644 --- a/base/process/process_win.cc +++ b/base/process/process_win.cc
@@ -4,7 +4,7 @@ #include "base/process/process.h" -#include "base/clang_coverage_buildflags.h" +#include "base/clang_profiling_buildflags.h" #include "base/debug/activity_tracker.h" #include "base/logging.h" #include "base/numerics/safe_conversions.h" @@ -13,8 +13,8 @@ #include <windows.h> -#if BUILDFLAG(CLANG_COVERAGE) -#include "base/test/clang_coverage.h" +#if BUILDFLAG(CLANG_PROFILING) +#include "base/test/clang_profiling.h" #endif namespace { @@ -90,8 +90,8 @@ // static void Process::TerminateCurrentProcessImmediately(int exit_code) { -#if BUILDFLAG(CLANG_COVERAGE) - WriteClangCoverageProfile(); +#if BUILDFLAG(CLANG_PROFILING) + WriteClangProfilingProfile(); #endif ::TerminateProcess(GetCurrentProcess(), exit_code); // There is some ambiguity over whether the call above can return. Rather than
diff --git a/base/test/BUILD.gn b/base/test/BUILD.gn index 712c70899..7a88a66a 100644 --- a/base/test/BUILD.gn +++ b/base/test/BUILD.gn
@@ -26,7 +26,7 @@ ] deps = [ "//base", - "//base:clang_coverage_buildflags", + "//base:clang_profiling_buildflags", ] }
diff --git a/base/test/clang_coverage.cc b/base/test/clang_coverage.cc deleted file mode 100644 index 33f823e..0000000 --- a/base/test/clang_coverage.cc +++ /dev/null
@@ -1,25 +0,0 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "base/test/clang_coverage.h" - -#include "base/no_destructor.h" -#include "base/synchronization/lock.h" - -extern "C" int __llvm_profile_dump(void); - -namespace base { - -void WriteClangCoverageProfile() { - // __llvm_profile_dump() guarantees that it will not dump coverage information - // if it is being called twice or more. However, it is not thread safe, as it - // is supposed to be called from atexit() handler rather than being called - // directly from random places. Since we have to call it ourselves, we must - // ensure thread safety in order to prevent duplication of coverage counters. - static base::NoDestructor<base::Lock> lock; - base::AutoLock auto_lock(*lock); - __llvm_profile_dump(); -} - -} // namespace base
diff --git a/base/test/clang_coverage.h b/base/test/clang_coverage.h deleted file mode 100644 index ed2e3d7..0000000 --- a/base/test/clang_coverage.h +++ /dev/null
@@ -1,26 +0,0 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef BASE_TEST_CLANG_COVERAGE_H_ -#define BASE_TEST_CLANG_COVERAGE_H_ - -#include "base/clang_coverage_buildflags.h" - -#if !BUILDFLAG(CLANG_COVERAGE) -#error "Clang coverage can only be used if CLANG_COVERAGE macro is defined" -#endif - -namespace base { - -// Write out the accumulated code coverage profile to the configured file. -// This is used internally by e.g. base::Process and FATAL logging, to cause -// coverage information to be stored even when performing an "immediate" exit -// (or triggering a debug crash), where the automatic at-exit writer will not -// be invoked. -// This call is thread-safe, and will write profiling data at-most-once. -void WriteClangCoverageProfile(); - -} // namespace base - -#endif // BASE_TEST_CLANG_COVERAGE_H_
diff --git a/base/test/clang_profiling.cc b/base/test/clang_profiling.cc new file mode 100644 index 0000000..5681a10 --- /dev/null +++ b/base/test/clang_profiling.cc
@@ -0,0 +1,26 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "base/test/clang_profiling.h" + +#include "base/no_destructor.h" +#include "base/synchronization/lock.h" + +extern "C" int __llvm_profile_dump(void); + +namespace base { + +void WriteClangProfilingProfile() { + // __llvm_profile_dump() guarantees that it will not dump profiling + // information if it is being called twice or more. However, it is not thread + // safe, as it is supposed to be called from atexit() handler rather than + // being called directly from random places. Since we have to call it + // ourselves, we must ensure thread safety in order to prevent duplication of + // profiling counters. + static base::NoDestructor<base::Lock> lock; + base::AutoLock auto_lock(*lock); + __llvm_profile_dump(); +} + +} // namespace base
diff --git a/base/test/clang_profiling.h b/base/test/clang_profiling.h new file mode 100644 index 0000000..1ecc02d --- /dev/null +++ b/base/test/clang_profiling.h
@@ -0,0 +1,26 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef BASE_TEST_CLANG_PROFILING_H_ +#define BASE_TEST_CLANG_PROFILING_H_ + +#include "base/clang_profiling_buildflags.h" + +#if !BUILDFLAG(CLANG_PROFILING) +#error "Clang profiling can only be used if CLANG_PROFILING macro is defined" +#endif + +namespace base { + +// Write out the accumulated code profiling profile to the configured file. +// This is used internally by e.g. base::Process and FATAL logging, to cause +// profiling information to be stored even when performing an "immediate" exit +// (or triggering a debug crash), where the automatic at-exit writer will not +// be invoked. +// This call is thread-safe, and will write profiling data at-most-once. +void WriteClangProfilingProfile(); + +} // namespace base + +#endif // BASE_TEST_CLANG_PROFILING_H_
diff --git a/base/test/scoped_mock_clock_override_unittest.cc b/base/test/scoped_mock_clock_override_unittest.cc index f4d22b6..ab935e0 100644 --- a/base/test/scoped_mock_clock_override_unittest.cc +++ b/base/test/scoped_mock_clock_override_unittest.cc
@@ -13,7 +13,14 @@ namespace { -TEST(ScopedMockClockOverrideTest, Time) { +#if defined(OS_FUCHSIA) +// TODO(https://crbug.com/1060357): Enable when RTC flake is fixed. +#define MAYBE_Time DISABLED_Time +#else +#define MAYBE_Time Time +#endif + +TEST(ScopedMockClockOverrideTest, MAYBE_Time) { // Choose a reference time that we know to be in the past but close to now. Time build_time = GetBuildTime();
diff --git a/base/test/test_timeouts.cc b/base/test/test_timeouts.cc index ef612bb..e77f175 100644 --- a/base/test/test_timeouts.cc +++ b/base/test/test_timeouts.cc
@@ -7,7 +7,7 @@ #include <algorithm> #include <string> -#include "base/clang_coverage_buildflags.h" +#include "base/clang_profiling_buildflags.h" #include "base/command_line.h" #include "base/debug/debugger.h" #include "base/logging.h" @@ -57,7 +57,7 @@ constexpr int kTimeoutMultiplier = 3; #elif defined(ADDRESS_SANITIZER) || defined(THREAD_SANITIZER) constexpr int kTimeoutMultiplier = 2; -#elif BUILDFLAG(CLANG_COVERAGE) +#elif BUILDFLAG(CLANG_PROFILING) // On coverage build, tests run 3x slower. constexpr int kTimeoutMultiplier = 3; #elif !defined(NDEBUG) && defined(OS_CHROMEOS)
diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h index 2c66390..6833031 100644 --- a/base/threading/thread_restrictions.h +++ b/base/threading/thread_restrictions.h
@@ -222,7 +222,6 @@ class CommandBufferLocal; class DrmThreadProxy; class GpuState; -class MaterialDesignController; } namespace weblayer { class WebLayerPathProvider; @@ -371,7 +370,6 @@ friend class mojo::CoreLibraryInitializer; friend class printing::PrintJobWorker; friend class resource_coordinator::TabManagerDelegate; // crbug.com/778703 - friend class ui::MaterialDesignController; friend class web::WebSubThread; friend class StackSamplingProfiler; friend class weblayer::ProfileImpl;
diff --git a/base/time/time_unittest.cc b/base/time/time_unittest.cc index 439599c..27a8ae1 100644 --- a/base/time/time_unittest.cc +++ b/base/time/time_unittest.cc
@@ -911,7 +911,14 @@ // static Time TimeOverride::now_time_; -TEST_F(TimeTest, NowOverride) { +#if defined(OS_FUCHSIA) +// TODO(https://crbug.com/1060357): Enable when RTC flake is fixed. +#define MAYBE_NowOverride DISABLED_NowOverride +#else +#define MAYBE_NowOverride NowOverride +#endif + +TEST_F(TimeTest, MAYBE_NowOverride) { TimeOverride::now_time_ = Time::UnixEpoch(); // Choose a reference time that we know to be in the past but close to now. @@ -965,6 +972,8 @@ EXPECT_GT(Time::Max(), subtle::TimeNowFromSystemTimeIgnoringOverride()); } +#undef MAYBE_NowOverride + #if defined(OS_FUCHSIA) TEST(ZxTimeTest, ToFromConversions) { Time unix_epoch = Time::UnixEpoch();
diff --git a/build/config/mac/sdk_info.py b/build/config/mac/sdk_info.py index 004679aa..65abd7f 100644 --- a/build/config/mac/sdk_info.py +++ b/build/config/mac/sdk_info.py
@@ -76,13 +76,17 @@ settings['machine_os_build'] = machine_os_build # The reported build number is made up from the kernel major version number, - # a minor version represented as a letter, and a build number. + # a minor version represented as a letter, a build number, and an optional + # packaging version. # # For example, the macOS 10.15.3 GM build is 19D76. # - 19 is the Darwin kernel that ships with 10.15. # - D is minor version 4. 10.15.0 builds had minor version 1. # - 76 is the build number. 75 other builds were stamped before GM came out. - build_match = re.match(r'^(\d+)([A-Z])(\d+)$', machine_os_build) + # + # The macOS 10.15.4 beta 5 build is 19E258a. The trailing "a" means the same + # build output was packaged twice. + build_match = re.match(r'^(\d+)([A-Z])(\d+)([a-z]?)$', machine_os_build) assert build_match, "Unexpected macOS build format: %r" % machine_os_build settings['machine_os_build_major'] = int(build_match.group(1), 10)
diff --git a/build/config/profiling/OWNERS b/build/config/profiling/OWNERS new file mode 100644 index 0000000..225ce18 --- /dev/null +++ b/build/config/profiling/OWNERS
@@ -0,0 +1,3 @@ +liaoyuke@chromium.org +sajjadm@chromium.org +sebmarchand@chromium.org
diff --git a/build/config/profiling/profiling.gni b/build/config/profiling/profiling.gni new file mode 100644 index 0000000..7dca6eac --- /dev/null +++ b/build/config/profiling/profiling.gni
@@ -0,0 +1,12 @@ +# Copyright 2020 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/coverage/coverage.gni") + +declare_args() { + use_clang_profiling = use_clang_coverage +} + +assert(!use_clang_profiling || is_clang, + "Clang Source-based profiling requires clang.")
diff --git a/build/config/sanitizers/sanitizers.gni b/build/config/sanitizers/sanitizers.gni index 262f868..f0cfd8a 100644 --- a/build/config/sanitizers/sanitizers.gni +++ b/build/config/sanitizers/sanitizers.gni
@@ -5,7 +5,7 @@ import("//build/config/chrome_build.gni") import("//build/config/chromecast_build.gni") import("//build/config/chromeos/args.gni") -import("//build/config/coverage/coverage.gni") +import("//build/config/profiling/profiling.gni") import("//build/toolchain/toolchain.gni") declare_args() { @@ -167,7 +167,8 @@ # work well for fuzzing builds. Since fuzzing builds already disable the # sandbox when dumping coverage, limit the sandbox-only path to non-fuzzing # builds. - use_clang_coverage_inside_sandbox = use_clang_coverage && !use_fuzzing_engine + use_clang_profiling_inside_sandbox = + use_clang_profiling && !use_fuzzing_engine # Detect overflow/underflow for global objects. #
diff --git a/build/fuchsia/linux.sdk.sha1 b/build/fuchsia/linux.sdk.sha1 index 6b7d397..6f4b47690 100644 --- a/build/fuchsia/linux.sdk.sha1 +++ b/build/fuchsia/linux.sdk.sha1
@@ -1 +1 @@ -0.20200310.2.1 \ No newline at end of file +0.20200310.3.1 \ No newline at end of file
diff --git a/build/fuchsia/mac.sdk.sha1 b/build/fuchsia/mac.sdk.sha1 index 6b7d397..6f4b47690 100644 --- a/build/fuchsia/mac.sdk.sha1 +++ b/build/fuchsia/mac.sdk.sha1
@@ -1 +1 @@ -0.20200310.2.1 \ No newline at end of file +0.20200310.3.1 \ No newline at end of file
diff --git a/cc/BUILD.gn b/cc/BUILD.gn index 07fb1a0..1e848cf 100644 --- a/cc/BUILD.gn +++ b/cc/BUILD.gn
@@ -42,6 +42,7 @@ "input/page_scale_animation.h", "input/scroll_elasticity_helper.cc", "input/scroll_elasticity_helper.h", + "input/scroll_input_type.h", "input/scroll_snap_data.cc", "input/scroll_snap_data.h", "input/scroll_state.cc",
diff --git a/cc/input/input_handler.h b/cc/input/input_handler.h index f3c4640..d3366ca4 100644 --- a/cc/input/input_handler.h +++ b/cc/input/input_handler.h
@@ -12,6 +12,7 @@ #include "cc/input/event_listener_properties.h" #include "cc/input/main_thread_scrolling_reason.h" #include "cc/input/overscroll_behavior.h" +#include "cc/input/scroll_input_type.h" #include "cc/input/scroll_state.h" #include "cc/input/scrollbar.h" #include "cc/input/touch_action.h" @@ -142,14 +143,6 @@ bool bubble; }; - enum ScrollInputType { - TOUCHSCREEN, - WHEEL, - AUTOSCROLL, - SCROLLBAR, - SCROLL_INPUT_UNKNOWN - }; - enum class TouchStartOrMoveEventListenerType { NO_HANDLER, HANDLER,
diff --git a/cc/input/scroll_input_type.h b/cc/input/scroll_input_type.h new file mode 100644 index 0000000..a2a14051 --- /dev/null +++ b/cc/input/scroll_input_type.h
@@ -0,0 +1,20 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CC_INPUT_SCROLL_INPUT_TYPE_H_ +#define CC_INPUT_SCROLL_INPUT_TYPE_H_ + +namespace cc { + +enum class ScrollInputType { + kTouchscreen, + kWheel, + kAutoscroll, + kScrollbar, + kUnknown, +}; + +} // namespace cc + +#endif // CC_INPUT_SCROLL_INPUT_TYPE_H_
diff --git a/cc/metrics/compositor_timing_history.cc b/cc/metrics/compositor_timing_history.cc index 05c36c2..65f27fc 100644 --- a/cc/metrics/compositor_timing_history.cc +++ b/cc/metrics/compositor_timing_history.cc
@@ -30,8 +30,6 @@ // Latency measurements virtual void AddBeginImplFrameLatency(base::TimeDelta delta) = 0; - virtual void AddBeginMainFrameStartToCommitDuration( - base::TimeDelta duration) = 0; virtual void AddCommitToReadyToActivateDuration(base::TimeDelta duration, TreePriority priority) = 0; virtual void AddInvalidationToReadyToActivateDuration( @@ -327,12 +325,6 @@ "Scheduling.Renderer.BeginImplFrameLatency", delta); } - void AddBeginMainFrameStartToCommitDuration( - base::TimeDelta duration) override { - UMA_HISTOGRAM_CUSTOM_TIMES_DURATION( - "Scheduling.Renderer.BeginMainFrameStartToCommitDuration", duration); - } - void AddCommitToReadyToActivateDuration(base::TimeDelta duration, TreePriority priority) override { UMA_HISTOGRAM_READY_TO_ACTIVATE( @@ -409,12 +401,6 @@ "Scheduling.Browser.BeginImplFrameLatency", delta); } - void AddBeginMainFrameStartToCommitDuration( - base::TimeDelta duration) override { - UMA_HISTOGRAM_CUSTOM_TIMES_DURATION( - "Scheduling.Browser.BeginMainFrameStartToCommitDuration", duration); - } - void AddCommitToReadyToActivateDuration(base::TimeDelta duration, TreePriority priority) override { UMA_HISTOGRAM_READY_TO_ACTIVATE( @@ -468,8 +454,6 @@ void AddDrawIntervalWithCustomPropertyAnimations( base::TimeDelta inverval) override {} void AddBeginImplFrameLatency(base::TimeDelta delta) override {} - void AddBeginMainFrameStartToCommitDuration( - base::TimeDelta duration) override {} void AddCommitToReadyToActivateDuration(base::TimeDelta duration, TreePriority priority) override {} void AddInvalidationToReadyToActivateDuration( @@ -744,15 +728,10 @@ begin_main_frame_end_time - begin_main_frame_sent_time_; base::TimeDelta begin_main_frame_queue_duration = begin_main_frame_start_time_ - begin_main_frame_sent_time_; - base::TimeDelta begin_main_frame_start_to_commit_duration = - begin_main_frame_end_time - begin_main_frame_start_time_; rendering_stats_instrumentation_->AddBeginMainFrameToCommitDuration( begin_main_frame_sent_to_commit_duration); - uma_reporter_->AddBeginMainFrameStartToCommitDuration( - begin_main_frame_start_to_commit_duration); - if (enabled_) { begin_main_frame_queue_duration_history_.InsertSample( begin_main_frame_queue_duration);
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc index 14b6687..6bb6a87 100644 --- a/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc
@@ -37,6 +37,7 @@ #include "cc/input/main_thread_scrolling_reason.h" #include "cc/input/page_scale_animation.h" #include "cc/input/scroll_elasticity_helper.h" +#include "cc/input/scroll_input_type.h" #include "cc/input/scroll_state.h" #include "cc/input/scrollbar.h" #include "cc/input/scrollbar_animation_controller.h" @@ -207,14 +208,14 @@ enum ScrollThread { MAIN_THREAD, CC_THREAD }; -void RecordCompositorSlowScrollMetric(InputHandler::ScrollInputType type, +void RecordCompositorSlowScrollMetric(ScrollInputType type, ScrollThread scroll_thread) { - DCHECK_NE(type, InputHandler::SCROLL_INPUT_UNKNOWN); + DCHECK_NE(type, ScrollInputType::kUnknown); bool scroll_on_main_thread = (scroll_thread == MAIN_THREAD); - if (type == InputHandler::WHEEL) { + if (type == ScrollInputType::kWheel) { UMA_HISTOGRAM_BOOLEAN("Renderer4.CompositorWheelScrollUpdateThread", scroll_on_main_thread); - } else if (type == InputHandler::TOUCHSCREEN) { + } else if (type == ScrollInputType::kTouchscreen) { UMA_HISTOGRAM_BOOLEAN("Renderer4.CompositorTouchScrollUpdateThread", scroll_on_main_thread); } @@ -3883,7 +3884,7 @@ InputHandler::ScrollStatus LayerTreeHostImpl::RootScrollBegin( ScrollState* scroll_state, - InputHandler::ScrollInputType type) { + ScrollInputType type) { TRACE_EVENT0("cc", "LayerTreeHostImpl::RootScrollBegin"); if (!OuterViewportScrollNode()) { ScrollStatus scroll_status; @@ -3900,7 +3901,7 @@ InputHandler::ScrollStatus LayerTreeHostImpl::ScrollBegin( ScrollState* scroll_state, - InputHandler::ScrollInputType type) { + ScrollInputType type) { DCHECK(scroll_state); DCHECK(scroll_state->delta_x() == 0 && scroll_state->delta_y() == 0); @@ -4039,10 +4040,10 @@ // from touch. bool LayerTreeHostImpl::IsTouchDraggingScrollbar( LayerImpl* first_scrolling_layer_or_scrollbar, - InputHandler::ScrollInputType type) { + ScrollInputType type) { return first_scrolling_layer_or_scrollbar && first_scrolling_layer_or_scrollbar->is_scrollbar() && - type == InputHandler::TOUCHSCREEN; + type == ScrollInputType::kTouchscreen; } ScrollNode* LayerTreeHostImpl::GetNodeToScroll(ScrollNode* node) const { @@ -4424,7 +4425,7 @@ // controls if needed. Viewport::ScrollResult result = viewport().ScrollBy( delta, viewport_point, scroll_state->is_direct_manipulation(), - latched_scroll_type_ != InputHandler::WHEEL, + latched_scroll_type_ != ScrollInputType::kWheel, scroll_node.scrolls_outer_viewport); applied_delta = result.consumed_delta; @@ -4478,10 +4479,9 @@ OverscrollBehavior::kOverscrollBehaviorTypeAuto); } -ScrollNode* LayerTreeHostImpl::FindNodeToLatch( - ScrollState* scroll_state, - ScrollNode* starting_node, - InputHandler::ScrollInputType type) { +ScrollNode* LayerTreeHostImpl::FindNodeToLatch(ScrollState* scroll_state, + ScrollNode* starting_node, + ScrollInputType type) { ScrollTree& scroll_tree = active_tree_->property_trees()->scroll_tree; ScrollNode* scroll_node = nullptr; for (ScrollNode* cur_node = starting_node; cur_node; @@ -4499,7 +4499,7 @@ // For UX reasons, autoscrolling should always latch to the top-most // scroller, even if it can't scroll in the initial direction. - if (type == InputHandler::AUTOSCROLL || + if (type == ScrollInputType::kAutoscroll || CanConsumeDelta(*scroll_state, *cur_node)) { scroll_node = cur_node; break; @@ -4526,7 +4526,7 @@ } void LayerTreeHostImpl::DidLatchToScroller(const ScrollState& scroll_state, - InputHandler::ScrollInputType type) { + ScrollInputType type) { DCHECK(CurrentlyScrollingNode()); deferred_scroll_end_ = false; browser_controls_offset_manager_->ScrollBegin(); @@ -4537,7 +4537,7 @@ last_latched_scroller_ = CurrentlyScrollingNode()->element_id; latched_scroll_type_ = type; - frame_trackers_.StartSequence(latched_scroll_type_ == InputHandler::WHEEL + frame_trackers_.StartSequence(latched_scroll_type_ == ScrollInputType::kWheel ? FrameSequenceTrackerType::kWheelScroll : FrameSequenceTrackerType::kTouchScroll); client_->RenewTreePriority(); @@ -4605,7 +4605,7 @@ // Mac does not smooth scroll wheel events (crbug.com/574283). We allow tests // to force it on. - return latched_scroll_type_ == InputHandler::SCROLLBAR + return latched_scroll_type_ == ScrollInputType::kScrollbar ? true : force_smooth_wheel_scrolling_for_testing_; #else @@ -4785,7 +4785,7 @@ DCHECK(last_scroll_update_state_); bool imprecise_wheel_scrolling = - latched_scroll_type_ == InputHandler::WHEEL && + latched_scroll_type_ == ScrollInputType::kWheel && last_scroll_update_state_->delta_granularity() != ui::ScrollGranularity::kScrollByPrecisePixel; gfx::ScrollOffset last_scroll_delta(last_scroll_update_state_->delta_x(), @@ -4937,7 +4937,7 @@ DCHECK(latched_scroll_type_.has_value()); browser_controls_offset_manager_->ScrollEnd(); - frame_trackers_.StopSequence(latched_scroll_type_ == InputHandler::WHEEL + frame_trackers_.StopSequence(latched_scroll_type_ == ScrollInputType::kWheel ? FrameSequenceTrackerType::kWheelScroll : FrameSequenceTrackerType::kTouchScroll); @@ -6126,16 +6126,15 @@ } } -void LayerTreeHostImpl::UpdateScrollSourceInfo( - const ScrollState& scroll_state, - InputHandler::ScrollInputType type) { - if (type == InputHandler::WHEEL && +void LayerTreeHostImpl::UpdateScrollSourceInfo(const ScrollState& scroll_state, + ScrollInputType type) { + if (type == ScrollInputType::kWheel && scroll_state.delta_granularity() == ui::ScrollGranularity::kScrollByPrecisePixel) { has_scrolled_by_precisiontouchpad_ = true; - } else if (type == InputHandler::WHEEL) { + } else if (type == ScrollInputType::kWheel) { has_scrolled_by_wheel_ = true; - } else if (type == InputHandler::TOUCHSCREEN) { + } else if (type == ScrollInputType::kTouchscreen) { has_scrolled_by_touch_ = true; } }
diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h index bfe9817..4b0df440 100644 --- a/cc/trees/layer_tree_host_impl.h +++ b/cc/trees/layer_tree_host_impl.h
@@ -25,6 +25,7 @@ #include "cc/cc_export.h" #include "cc/input/browser_controls_offset_manager_client.h" #include "cc/input/input_handler.h" +#include "cc/input/scroll_input_type.h" #include "cc/input/scrollbar_animation_controller.h" #include "cc/input/scrollbar_controller.h" #include "cc/layers/layer_collections.h" @@ -260,12 +261,10 @@ // InputHandler implementation void BindToClient(InputHandlerClient* client) override; - InputHandler::ScrollStatus ScrollBegin( - ScrollState* scroll_state, - InputHandler::ScrollInputType type) override; - InputHandler::ScrollStatus RootScrollBegin( - ScrollState* scroll_state, - InputHandler::ScrollInputType type) override; + InputHandler::ScrollStatus ScrollBegin(ScrollState* scroll_state, + ScrollInputType type) override; + InputHandler::ScrollStatus RootScrollBegin(ScrollState* scroll_state, + ScrollInputType type) override; InputHandlerScrollResult ScrollUpdate( ScrollState* scroll_state, base::TimeDelta delayed_by = base::TimeDelta()) override; @@ -938,7 +937,7 @@ bool IsTouchDraggingScrollbar( LayerImpl* first_scrolling_layer_or_drawn_scrollbar, - InputHandler::ScrollInputType type); + ScrollInputType type); bool IsInitialScrollHitTestReliable( LayerImpl* layer, LayerImpl* first_scrolling_layer_or_drawn_scrollbar); @@ -949,7 +948,7 @@ // starting_node is nullptr, returns nullptr; ScrollNode* FindNodeToLatch(ScrollState* scroll_state, ScrollNode* starting_node, - InputHandler::ScrollInputType type); + ScrollInputType type); // Called during ScrollBegin once a scroller was successfully latched to // (i.e. it can and will consume scroll delta on the compositor thread). The @@ -958,7 +957,7 @@ // get consensus on terminology to use and apply it consistently. // https://crrev.com/c/1981336/9/cc/trees/layer_tree_host_impl.cc#4520 void DidLatchToScroller(const ScrollState& scroll_state, - InputHandler::ScrollInputType type); + ScrollInputType type); // Applies the scroll_state to the currently latched scroller. See comment in // InputHandler::ScrollUpdate declaration for the meaning of |delayed_by|. @@ -1032,7 +1031,7 @@ // sources per page load. TODO(crbug.com/691886): Use GRC API to plumb the // scroll source info for Use Counters. void UpdateScrollSourceInfo(const ScrollState& scroll_state, - InputHandler::ScrollInputType type); + ScrollInputType type); bool IsScrolledBy(LayerImpl* child, ScrollNode* ancestor); void ShowScrollbarsForImplScroll(ElementId element_id); @@ -1323,7 +1322,7 @@ // The source device type that started the scroll gesture. Only set between a // ScrollBegin and ScrollEnd. - base::Optional<InputHandler::ScrollInputType> latched_scroll_type_; + base::Optional<ScrollInputType> latched_scroll_type_; // Scroll animation can finish either before or after GSE arrival. // deferred_scroll_end_ is set when the GSE has arrvied before scroll
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc index 275f5f2..141caf0 100644 --- a/cc/trees/layer_tree_host_impl_unittest.cc +++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -31,6 +31,7 @@ #include "cc/input/browser_controls_offset_manager.h" #include "cc/input/main_thread_scrolling_reason.h" #include "cc/input/page_scale_animation.h" +#include "cc/input/scroll_input_type.h" #include "cc/layers/append_quads_data.h" #include "cc/layers/heads_up_display_layer_impl.h" #include "cc/layers/layer_impl.h" @@ -497,9 +498,9 @@ // is not an ancestor of squash1 layer, we cannot scroll on impl thread. InputHandler::ScrollStatus status = host_impl_->ScrollBegin( BeginState(gfx::Point(230, 150), gfx::Vector2dF(0, 10), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL); + ScrollInputType::kWheel); ASSERT_EQ(InputHandler::SCROLL_UNKNOWN, status.thread); ASSERT_EQ(MainThreadScrollingReason::kFailedHitTest, status.main_thread_scrolling_reasons); @@ -507,9 +508,9 @@ // The point hits squash1 layer and also scrollbar layer. status = host_impl_->ScrollBegin( BeginState(gfx::Point(350, 150), gfx::Vector2dF(0, 10), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL); + ScrollInputType::kWheel); ASSERT_EQ(InputHandler::SCROLL_UNKNOWN, status.thread); ASSERT_EQ(MainThreadScrollingReason::kFailedHitTest, status.main_thread_scrolling_reasons); @@ -518,9 +519,9 @@ // is an ancestor of squash2 layer, we should scroll on impl. status = host_impl_->ScrollBegin( BeginState(gfx::Point(230, 450), gfx::Vector2dF(0, 10), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL); + ScrollInputType::kWheel); ASSERT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, status.thread); } @@ -580,7 +581,7 @@ std::unique_ptr<ScrollState> BeginState(const gfx::Point& point, const gfx::Vector2dF& delta_hint, - InputHandler::ScrollInputType type) { + ScrollInputType type) { ScrollStateData scroll_state_data; scroll_state_data.is_beginning = true; scroll_state_data.position_x = point.x(); @@ -588,7 +589,7 @@ scroll_state_data.delta_x_hint = delta_hint.x(); scroll_state_data.delta_y_hint = delta_hint.y(); scroll_state_data.is_direct_manipulation = - type == InputHandler::TOUCHSCREEN; + type == ScrollInputType::kTouchscreen; std::unique_ptr<ScrollState> scroll_state( new ScrollState(scroll_state_data)); return scroll_state; @@ -596,14 +597,14 @@ std::unique_ptr<ScrollState> UpdateState(const gfx::Point& point, const gfx::Vector2dF& delta, - InputHandler::ScrollInputType type) { + ScrollInputType type) { ScrollStateData scroll_state_data; scroll_state_data.delta_x = delta.x(); scroll_state_data.delta_y = delta.y(); scroll_state_data.position_x = point.x(); scroll_state_data.position_y = point.y(); scroll_state_data.is_direct_manipulation = - type == InputHandler::TOUCHSCREEN; + type == ScrollInputType::kTouchscreen; std::unique_ptr<ScrollState> scroll_state( new ScrollState(scroll_state_data)); return scroll_state; @@ -612,7 +613,7 @@ std::unique_ptr<ScrollState> AnimatedUpdateState( const gfx::Point& point, const gfx::Vector2dF& delta) { - auto state = UpdateState(point, delta, InputHandler::WHEEL); + auto state = UpdateState(point, delta, ScrollInputType::kWheel); state->data()->delta_granularity = ui::ScrollGranularity::kScrollByPixel; return state; } @@ -1075,15 +1076,17 @@ TEST_F(LayerTreeHostImplTest, ScrollBeforeRootLayerAttached) { InputHandler::ScrollStatus status = host_impl_->ScrollBegin( - BeginState(gfx::Point(), gfx::Vector2dF(0, 1), InputHandler::WHEEL).get(), - InputHandler::WHEEL); + BeginState(gfx::Point(), gfx::Vector2dF(0, 1), ScrollInputType::kWheel) + .get(), + ScrollInputType::kWheel); EXPECT_EQ(InputHandler::SCROLL_IGNORED, status.thread); EXPECT_EQ(MainThreadScrollingReason::kNoScrollingLayer, status.main_thread_scrolling_reasons); status = host_impl_->RootScrollBegin( - BeginState(gfx::Point(), gfx::Vector2dF(0, 1), InputHandler::WHEEL).get(), - InputHandler::WHEEL); + BeginState(gfx::Point(), gfx::Vector2dF(0, 1), ScrollInputType::kWheel) + .get(), + ScrollInputType::kWheel); EXPECT_EQ(InputHandler::SCROLL_IGNORED, status.thread); EXPECT_EQ(MainThreadScrollingReason::kNoScrollingLayer, status.main_thread_scrolling_reasons); @@ -1103,10 +1106,10 @@ { EXPECT_FALSE(host_impl_->CurrentlyScrollingNode()); host_impl_->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(0, 10), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); host_impl_->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(0, 10), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); EXPECT_FALSE(host_impl_->CurrentlyScrollingNode()); host_impl_->ScrollEnd(); @@ -1116,14 +1119,14 @@ { InputHandler::ScrollStatus status = host_impl_->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2dF(0, 10), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, status.thread); EXPECT_TRUE(host_impl_->CurrentlyScrollingNode()); host_impl_->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(0, 10), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 10), CurrentScrollOffset(OuterViewportScrollLayer())); @@ -1146,7 +1149,7 @@ // Try on a node that should scroll on the compositor. Confirm it works. { InputHandler::ScrollStatus status = - host_impl_->ScrollBegin(scroll_state.get(), InputHandler::WHEEL); + host_impl_->ScrollBegin(scroll_state.get(), ScrollInputType::kWheel); EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, status.thread); EXPECT_EQ(host_impl_->OuterViewportScrollNode(), host_impl_->CurrentlyScrollingNode()); @@ -1160,7 +1163,7 @@ { InputHandler::ScrollStatus status = - host_impl_->ScrollBegin(scroll_state.get(), InputHandler::WHEEL); + host_impl_->ScrollBegin(scroll_state.get(), ScrollInputType::kWheel); EXPECT_EQ(InputHandler::SCROLL_ON_MAIN_THREAD, status.thread); EXPECT_EQ( host_impl_->OuterViewportScrollNode()->main_thread_scrolling_reasons, @@ -1174,17 +1177,17 @@ DrawFrame(); InputHandler::ScrollStatus status = host_impl_->ScrollBegin( - BeginState(gfx::Point(), gfx::Vector2dF(0, 10), InputHandler::WHEEL) + BeginState(gfx::Point(), gfx::Vector2dF(0, 10), ScrollInputType::kWheel) .get(), - InputHandler::WHEEL); + ScrollInputType::kWheel); EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, status.thread); EXPECT_EQ(MainThreadScrollingReason::kNotScrollingOnMain, status.main_thread_scrolling_reasons); EXPECT_TRUE(host_impl_->IsCurrentlyScrollingLayerAt(gfx::Point())); - host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), gfx::Vector2d(0, 10), InputHandler::TOUCHSCREEN) - .get()); + host_impl_->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(0, 10), + ScrollInputType::kTouchscreen) + .get()); EXPECT_TRUE(host_impl_->IsCurrentlyScrollingLayerAt(gfx::Point(0, 10))); host_impl_->ScrollEnd(); EXPECT_FALSE(host_impl_->IsCurrentlyScrollingLayerAt(gfx::Point())); @@ -1209,9 +1212,9 @@ { InputHandler::ScrollStatus status = host_impl_->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2dF(0, 10), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, status.thread); EXPECT_EQ(MainThreadScrollingReason::kNotScrollingOnMain, status.main_thread_scrolling_reasons); @@ -1219,13 +1222,13 @@ // There is no extent upwards so the scroll won't consume any delta. host_impl_->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(0, -10), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); EXPECT_FALSE(host_impl_->IsActivelyPrecisionScrolling()); // This should scroll so ensure the bit flips to true. host_impl_->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(0, 10), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); EXPECT_TRUE(host_impl_->IsActivelyPrecisionScrolling()); host_impl_->ScrollEnd(); @@ -1238,9 +1241,9 @@ // scrolling occurs. { InputHandler::ScrollStatus status = host_impl_->ScrollBegin( - BeginState(gfx::Point(), gfx::Vector2dF(0, 10), InputHandler::WHEEL) + BeginState(gfx::Point(), gfx::Vector2dF(0, 10), ScrollInputType::kWheel) .get(), - InputHandler::WHEEL); + ScrollInputType::kWheel); EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, status.thread); EXPECT_FALSE(host_impl_->IsActivelyPrecisionScrolling()); @@ -1283,9 +1286,9 @@ TEST_F(LayerTreeHostImplTest, ScrollWithoutRootLayer) { // We should not crash when trying to scroll an empty layer tree. InputHandler::ScrollStatus status = host_impl_->ScrollBegin( - BeginState(gfx::Point(), gfx::Vector2dF(0, 10), InputHandler::WHEEL) + BeginState(gfx::Point(), gfx::Vector2dF(0, 10), ScrollInputType::kWheel) .get(), - InputHandler::WHEEL); + ScrollInputType::kWheel); EXPECT_EQ(InputHandler::SCROLL_IGNORED, status.thread); EXPECT_EQ(MainThreadScrollingReason::kNoScrollingLayer, status.main_thread_scrolling_reasons); @@ -1306,9 +1309,9 @@ // We should not crash when trying to scroll after the renderer initialization // fails. InputHandler::ScrollStatus status = host_impl_->ScrollBegin( - BeginState(gfx::Point(), gfx::Vector2dF(0, 10), InputHandler::WHEEL) + BeginState(gfx::Point(), gfx::Vector2dF(0, 10), ScrollInputType::kWheel) .get(), - InputHandler::WHEEL); + ScrollInputType::kWheel); EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, status.thread); EXPECT_EQ(MainThreadScrollingReason::kNotScrollingOnMain, status.main_thread_scrolling_reasons); @@ -1325,9 +1328,9 @@ host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::ScrollOffsetToVector2dF(scroll_delta), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); ClearLayersAndPropertyTrees(host_impl_->active_tree()); @@ -1338,7 +1341,7 @@ // new tree. host_impl_->ScrollUpdate( UpdateState(gfx::Point(), gfx::ScrollOffsetToVector2dF(scroll_delta), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get()); host_impl_->ScrollEnd(); std::unique_ptr<ScrollAndScaleSet> scroll_info = @@ -1351,14 +1354,15 @@ SetupViewportLayersOuterScrolls(gfx::Size(100, 100), gfx::Size(1000, 1000)); auto status = host_impl_->ScrollBegin( - BeginState(gfx::Point(30, 30), gfx::Vector2d(0, 10), InputHandler::WHEEL) + BeginState(gfx::Point(30, 30), gfx::Vector2d(0, 10), + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL); + ScrollInputType::kWheel); EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, status.thread); EXPECT_EQ(MainThreadScrollingReason::kNotScrollingOnMain, status.main_thread_scrolling_reasons); host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), gfx::Vector2d(0, 10), InputHandler::WHEEL) + UpdateState(gfx::Point(), gfx::Vector2d(0, 10), ScrollInputType::kWheel) .get()); EXPECT_TRUE(host_impl_->active_tree()->CurrentlyScrollingNode()); @@ -1395,8 +1399,9 @@ // But they don't influence the actual handling of the scroll gestures. InputHandler::ScrollStatus status = host_impl_->ScrollBegin( - BeginState(gfx::Point(), gfx::Vector2d(0, 10), InputHandler::WHEEL).get(), - InputHandler::WHEEL); + BeginState(gfx::Point(), gfx::Vector2d(0, 10), ScrollInputType::kWheel) + .get(), + ScrollInputType::kWheel); EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, status.thread); EXPECT_EQ(MainThreadScrollingReason::kNotScrollingOnMain, status.main_thread_scrolling_reasons); @@ -1428,10 +1433,11 @@ EXPECT_EQ(TouchAction::kPanLeft, touch_action); // But they don't influence the actual handling of the scroll gestures. - InputHandler::ScrollStatus status = host_impl_->ScrollBegin( - BeginState(gfx::Point(), gfx::Vector2d(0, 10), InputHandler::TOUCHSCREEN) - .get(), - InputHandler::TOUCHSCREEN); + InputHandler::ScrollStatus status = + host_impl_->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2d(0, 10), + ScrollInputType::kTouchscreen) + .get(), + ScrollInputType::kTouchscreen); EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, status.thread); EXPECT_EQ(MainThreadScrollingReason::kNotScrollingOnMain, status.main_thread_scrolling_reasons); @@ -1461,16 +1467,18 @@ DrawFrame(); InputHandler::ScrollStatus status = host_impl_->ScrollBegin( - BeginState(gfx::Point(), gfx::Vector2d(0, 10), InputHandler::WHEEL).get(), - InputHandler::WHEEL); + BeginState(gfx::Point(), gfx::Vector2d(0, 10), ScrollInputType::kWheel) + .get(), + ScrollInputType::kWheel); EXPECT_EQ(InputHandler::SCROLL_ON_MAIN_THREAD, status.thread); EXPECT_EQ(MainThreadScrollingReason::kHasBackgroundAttachmentFixedObjects, status.main_thread_scrolling_reasons); - status = host_impl_->ScrollBegin( - BeginState(gfx::Point(), gfx::Vector2d(0, 10), InputHandler::TOUCHSCREEN) - .get(), - InputHandler::TOUCHSCREEN); + status = + host_impl_->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2d(0, 10), + ScrollInputType::kTouchscreen) + .get(), + ScrollInputType::kTouchscreen); EXPECT_EQ(InputHandler::SCROLL_ON_MAIN_THREAD, status.thread); EXPECT_EQ(MainThreadScrollingReason::kHasBackgroundAttachmentFixedObjects, status.main_thread_scrolling_reasons); @@ -1515,9 +1523,9 @@ // scrollbar layer is a drawn scrollbar, we cannot scroll on the impl thread. auto status = host_impl_->ScrollBegin( BeginState(gfx::Point(350, 150), gfx::Vector2d(0, 10), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL); + ScrollInputType::kWheel); EXPECT_EQ(InputHandler::SCROLL_UNKNOWN, status.thread); EXPECT_EQ(MainThreadScrollingReason::kFailedHitTest, status.main_thread_scrolling_reasons); @@ -1526,9 +1534,9 @@ // the impl thread. status = host_impl_->ScrollBegin( BeginState(gfx::Point(350, 500), gfx::Vector2d(0, 10), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL); + ScrollInputType::kWheel); EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, status.thread); EXPECT_EQ(MainThreadScrollingReason::kNotScrollingOnMain, status.main_thread_scrolling_reasons); @@ -1617,9 +1625,10 @@ // All scroll types inside the non-fast scrollable region should fail. InputHandler::ScrollStatus status = host_impl_->ScrollBegin( - BeginState(gfx::Point(25, 25), gfx::Vector2d(0, 10), InputHandler::WHEEL) + BeginState(gfx::Point(25, 25), gfx::Vector2d(0, 10), + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL); + ScrollInputType::kWheel); EXPECT_EQ(InputHandler::SCROLL_ON_MAIN_THREAD, status.thread); EXPECT_EQ(MainThreadScrollingReason::kNonFastScrollableRegion, status.main_thread_scrolling_reasons); @@ -1627,9 +1636,9 @@ status = host_impl_->ScrollBegin( BeginState(gfx::Point(25, 25), gfx::Vector2d(0, 10), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); EXPECT_EQ(InputHandler::SCROLL_ON_MAIN_THREAD, status.thread); EXPECT_EQ(MainThreadScrollingReason::kNonFastScrollableRegion, status.main_thread_scrolling_reasons); @@ -1637,16 +1646,17 @@ // All scroll types outside this region should succeed. status = host_impl_->ScrollBegin( - BeginState(gfx::Point(75, 75), gfx::Vector2d(0, 10), InputHandler::WHEEL) + BeginState(gfx::Point(75, 75), gfx::Vector2d(0, 10), + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL); + ScrollInputType::kWheel); EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, status.thread); EXPECT_EQ(MainThreadScrollingReason::kNotScrollingOnMain, status.main_thread_scrolling_reasons); EXPECT_TRUE(host_impl_->IsCurrentlyScrollingLayerAt(gfx::Point(75, 75))); host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), gfx::Vector2d(0, 10), InputHandler::WHEEL) + UpdateState(gfx::Point(), gfx::Vector2d(0, 10), ScrollInputType::kWheel) .get()); EXPECT_FALSE(host_impl_->IsCurrentlyScrollingLayerAt(gfx::Point(25, 25))); host_impl_->ScrollEnd(); @@ -1654,16 +1664,16 @@ status = host_impl_->ScrollBegin( BeginState(gfx::Point(75, 75), gfx::Vector2d(0, 10), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, status.thread); EXPECT_EQ(MainThreadScrollingReason::kNotScrollingOnMain, status.main_thread_scrolling_reasons); EXPECT_TRUE(host_impl_->IsCurrentlyScrollingLayerAt(gfx::Point(75, 75))); - host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), gfx::Vector2d(0, 10), InputHandler::TOUCHSCREEN) - .get()); + host_impl_->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(0, 10), + ScrollInputType::kTouchscreen) + .get()); host_impl_->ScrollEnd(); EXPECT_FALSE(host_impl_->IsCurrentlyScrollingLayerAt(gfx::Point(75, 75))); } @@ -1681,24 +1691,26 @@ // This point would fall into the non-fast scrollable region except that we've // moved the layer left by 25 pixels. InputHandler::ScrollStatus status = host_impl_->ScrollBegin( - BeginState(gfx::Point(40, 10), gfx::Vector2d(0, 1), InputHandler::WHEEL) + BeginState(gfx::Point(40, 10), gfx::Vector2d(0, 1), + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL); + ScrollInputType::kWheel); EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, status.thread); EXPECT_EQ(MainThreadScrollingReason::kNotScrollingOnMain, status.main_thread_scrolling_reasons); EXPECT_TRUE(host_impl_->IsCurrentlyScrollingLayerAt(gfx::Point(40, 10))); host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), gfx::Vector2d(0, 1), InputHandler::WHEEL) + UpdateState(gfx::Point(), gfx::Vector2d(0, 1), ScrollInputType::kWheel) .get()); host_impl_->ScrollEnd(); // This point is still inside the non-fast region. status = host_impl_->ScrollBegin( - BeginState(gfx::Point(10, 10), gfx::Vector2d(0, 1), InputHandler::WHEEL) + BeginState(gfx::Point(10, 10), gfx::Vector2d(0, 1), + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL); + ScrollInputType::kWheel); EXPECT_EQ(InputHandler::SCROLL_ON_MAIN_THREAD, status.thread); EXPECT_EQ(MainThreadScrollingReason::kNonFastScrollableRegion, status.main_thread_scrolling_reasons); @@ -1710,10 +1722,10 @@ DrawFrame(); EXPECT_FALSE(host_impl_->scroll_affects_scroll_handler()); - host_impl_->ScrollBegin( - BeginState(gfx::Point(), gfx::Vector2d(0, 10), InputHandler::TOUCHSCREEN) - .get(), - InputHandler::TOUCHSCREEN); + host_impl_->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2d(0, 10), + ScrollInputType::kTouchscreen) + .get(), + ScrollInputType::kTouchscreen); EXPECT_FALSE(host_impl_->scroll_affects_scroll_handler()); host_impl_->ScrollEnd(); EXPECT_FALSE(host_impl_->scroll_affects_scroll_handler()); @@ -1725,10 +1737,10 @@ DrawFrame(); EXPECT_FALSE(host_impl_->scroll_affects_scroll_handler()); - host_impl_->ScrollBegin( - BeginState(gfx::Point(), gfx::Vector2d(0, 10), InputHandler::TOUCHSCREEN) - .get(), - InputHandler::TOUCHSCREEN); + host_impl_->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2d(0, 10), + ScrollInputType::kTouchscreen) + .get(), + ScrollInputType::kTouchscreen); EXPECT_TRUE(host_impl_->scroll_affects_scroll_handler()); host_impl_->ScrollEnd(); EXPECT_FALSE(host_impl_->scroll_affects_scroll_handler()); @@ -1738,10 +1750,11 @@ SetupViewportLayersInnerScrolls(gfx::Size(100, 100), gfx::Size(200, 200)); DrawFrame(); - InputHandler::ScrollStatus status = host_impl_->ScrollBegin( - BeginState(gfx::Point(), gfx::Vector2d(-10, 0), InputHandler::TOUCHSCREEN) - .get(), - InputHandler::TOUCHSCREEN); + InputHandler::ScrollStatus status = + host_impl_->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2d(-10, 0), + ScrollInputType::kTouchscreen) + .get(), + ScrollInputType::kTouchscreen); EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, status.thread); EXPECT_EQ(MainThreadScrollingReason::kNotScrollingOnMain, status.main_thread_scrolling_reasons); @@ -1750,37 +1763,37 @@ EXPECT_FALSE( host_impl_ ->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(-10, 0), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()) .did_scroll); EXPECT_FALSE( host_impl_ ->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(0, -10), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()) .did_scroll); EXPECT_FALSE( host_impl_ ->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(-10, -10), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()) .did_scroll); // Scrolling to the right/bottom will succeed. EXPECT_TRUE(host_impl_ ->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(10, 0), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()) .did_scroll); EXPECT_TRUE(host_impl_ ->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(0, 10), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()) .did_scroll); EXPECT_TRUE( host_impl_ ->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(10, 10), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()) .did_scroll); @@ -1788,19 +1801,19 @@ EXPECT_TRUE( host_impl_ ->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(-10, 0), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()) .did_scroll); EXPECT_TRUE( host_impl_ ->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(0, -10), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()) .did_scroll); EXPECT_TRUE( host_impl_ ->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(-10, -10), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()) .did_scroll); @@ -1808,19 +1821,19 @@ EXPECT_TRUE( host_impl_ ->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(10, -10), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()) .did_scroll); EXPECT_TRUE( host_impl_ ->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(-10, 0), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()) .did_scroll); EXPECT_TRUE( host_impl_ ->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(-10, 10), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()) .did_scroll); @@ -1828,7 +1841,7 @@ EXPECT_TRUE( host_impl_ ->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(5000, 5000), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()) .did_scroll); } @@ -1840,19 +1853,19 @@ gfx::Point pointer_position(10, 10); gfx::Vector2dF x_delta(20, 0); - EXPECT_EQ( - InputHandler::SCROLL_ON_IMPL_THREAD, - host_impl_ - ->ScrollBegin( - BeginState(pointer_position, x_delta, InputHandler::WHEEL).get(), - InputHandler::WHEEL) - .thread); + EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, + host_impl_ + ->ScrollBegin(BeginState(pointer_position, x_delta, + ScrollInputType::kWheel) + .get(), + ScrollInputType::kWheel) + .thread); EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 0), CurrentScrollOffset(overflow)); EXPECT_EQ(TargetSnapAreaElementIds(), GetSnapContainerData(overflow)->GetTargetSnapAreaElementIds()); host_impl_->ScrollUpdate( - UpdateState(pointer_position, x_delta, InputHandler::WHEEL).get()); + UpdateState(pointer_position, x_delta, ScrollInputType::kWheel).get()); EXPECT_EQ(TargetSnapAreaElementIds(), GetSnapContainerData(overflow)->GetTargetSnapAreaElementIds()); @@ -1884,19 +1897,19 @@ gfx::Point pointer_position(10, 10); gfx::Vector2dF y_delta(0, 20); - EXPECT_EQ( - InputHandler::SCROLL_ON_IMPL_THREAD, - host_impl_ - ->ScrollBegin( - BeginState(pointer_position, y_delta, InputHandler::WHEEL).get(), - InputHandler::WHEEL) - .thread); + EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, + host_impl_ + ->ScrollBegin(BeginState(pointer_position, y_delta, + ScrollInputType::kWheel) + .get(), + ScrollInputType::kWheel) + .thread); EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 0), CurrentScrollOffset(overflow)); EXPECT_EQ(TargetSnapAreaElementIds(), GetSnapContainerData(overflow)->GetTargetSnapAreaElementIds()); host_impl_->ScrollUpdate( - UpdateState(pointer_position, y_delta, InputHandler::WHEEL).get()); + UpdateState(pointer_position, y_delta, ScrollInputType::kWheel).get()); EXPECT_EQ(TargetSnapAreaElementIds(), GetSnapContainerData(overflow)->GetTargetSnapAreaElementIds()); @@ -1928,19 +1941,19 @@ gfx::Point pointer_position(10, 10); gfx::Vector2dF delta(20, 20); - EXPECT_EQ( - InputHandler::SCROLL_ON_IMPL_THREAD, - host_impl_ - ->ScrollBegin( - BeginState(pointer_position, delta, InputHandler::WHEEL).get(), - InputHandler::WHEEL) - .thread); + EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, + host_impl_ + ->ScrollBegin( + BeginState(pointer_position, delta, ScrollInputType::kWheel) + .get(), + ScrollInputType::kWheel) + .thread); EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 0), CurrentScrollOffset(overflow)); EXPECT_EQ(TargetSnapAreaElementIds(), GetSnapContainerData(overflow)->GetTargetSnapAreaElementIds()); host_impl_->ScrollUpdate( - UpdateState(pointer_position, delta, InputHandler::WHEEL).get()); + UpdateState(pointer_position, delta, ScrollInputType::kWheel).get()); EXPECT_EQ(TargetSnapAreaElementIds(), GetSnapContainerData(overflow)->GetTargetSnapAreaElementIds()); @@ -1973,13 +1986,13 @@ gfx::Point pointer_position(10, 10); gfx::Vector2dF delta(20, 20); - EXPECT_EQ( - InputHandler::SCROLL_ON_IMPL_THREAD, - host_impl_ - ->ScrollBegin( - BeginState(pointer_position, delta, InputHandler::WHEEL).get(), - InputHandler::WHEEL) - .thread); + EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, + host_impl_ + ->ScrollBegin( + BeginState(pointer_position, delta, ScrollInputType::kWheel) + .get(), + ScrollInputType::kWheel) + .thread); host_impl_->ScrollUpdate(AnimatedUpdateState(pointer_position, delta).get()); host_impl_->ScrollEnd(); @@ -2030,17 +2043,17 @@ gfx::Point pointer_position(10, 10); gfx::Vector2dF y_delta(0, 20); - EXPECT_EQ( - InputHandler::SCROLL_ON_IMPL_THREAD, - host_impl_ - ->ScrollBegin( - BeginState(pointer_position, y_delta, InputHandler::WHEEL).get(), - InputHandler::WHEEL) - .thread); + EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, + host_impl_ + ->ScrollBegin(BeginState(pointer_position, y_delta, + ScrollInputType::kWheel) + .get(), + ScrollInputType::kWheel) + .thread); EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 0), CurrentScrollOffset(overflow)); host_impl_->ScrollUpdate( - UpdateState(pointer_position, y_delta, InputHandler::WHEEL).get()); + UpdateState(pointer_position, y_delta, ScrollInputType::kWheel).get()); EXPECT_FALSE(host_impl_->IsAnimatingForSnap()); viz::BeginFrameArgs begin_frame_args = @@ -2092,17 +2105,17 @@ gfx::Point pointer_position(10, 10); gfx::Vector2dF x_delta(20, 0); - EXPECT_EQ( - InputHandler::SCROLL_ON_IMPL_THREAD, - host_impl_ - ->ScrollBegin( - BeginState(pointer_position, x_delta, InputHandler::WHEEL).get(), - InputHandler::WHEEL) - .thread); + EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, + host_impl_ + ->ScrollBegin(BeginState(pointer_position, x_delta, + ScrollInputType::kWheel) + .get(), + ScrollInputType::kWheel) + .thread); EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 0), CurrentScrollOffset(overflow)); host_impl_->ScrollUpdate( - UpdateState(pointer_position, x_delta, InputHandler::WHEEL).get()); + UpdateState(pointer_position, x_delta, ScrollInputType::kWheel).get()); EXPECT_FALSE(host_impl_->IsAnimatingForSnap()); viz::BeginFrameArgs begin_frame_args = @@ -2125,12 +2138,13 @@ EXPECT_EQ(0, current_offset.y()); // Interrupt the snap animation with ScrollBegin. - auto begin_state = BeginState(pointer_position, x_delta, InputHandler::WHEEL); + auto begin_state = + BeginState(pointer_position, x_delta, ScrollInputType::kWheel); begin_state->data()->delta_granularity = ui::ScrollGranularity::kScrollByPrecisePixel; - EXPECT_EQ( - InputHandler::SCROLL_ON_IMPL_THREAD, - host_impl_->ScrollBegin(begin_state.get(), InputHandler::WHEEL).thread); + EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, + host_impl_->ScrollBegin(begin_state.get(), ScrollInputType::kWheel) + .thread); EXPECT_FALSE(host_impl_->IsAnimatingForSnap()); EXPECT_EQ(TargetSnapAreaElementIds(), GetSnapContainerData(overflow)->GetTargetSnapAreaElementIds()); @@ -2153,18 +2167,18 @@ gfx::Point pointer_position(10, 10); gfx::Vector2dF x_delta(50, 0); - EXPECT_EQ( - InputHandler::SCROLL_ON_IMPL_THREAD, - host_impl_ - ->ScrollBegin( - BeginState(pointer_position, x_delta, InputHandler::WHEEL).get(), - InputHandler::WHEEL) - .thread); + EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, + host_impl_ + ->ScrollBegin(BeginState(pointer_position, x_delta, + ScrollInputType::kWheel) + .get(), + ScrollInputType::kWheel) + .thread); EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 0), CurrentScrollOffset(overflow)); // There is a snap target at 50, scroll to it directly. host_impl_->ScrollUpdate( - UpdateState(pointer_position, x_delta, InputHandler::WHEEL).get()); + UpdateState(pointer_position, x_delta, ScrollInputType::kWheel).get()); EXPECT_FALSE(host_impl_->IsAnimatingForSnap()); viz::BeginFrameArgs begin_frame_args = @@ -2202,18 +2216,18 @@ // Should be (10, 10) in the scroller's coordinate. gfx::Point pointer_position(2, 2); gfx::Vector2dF delta(4, 4); - EXPECT_EQ( - InputHandler::SCROLL_ON_IMPL_THREAD, - host_impl_ - ->ScrollBegin( - BeginState(pointer_position, delta, InputHandler::WHEEL).get(), - InputHandler::WHEEL) - .thread); + EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, + host_impl_ + ->ScrollBegin( + BeginState(pointer_position, delta, ScrollInputType::kWheel) + .get(), + ScrollInputType::kWheel) + .thread); EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 0), CurrentScrollOffset(overflow)); // Should be (20, 20) in the scroller's coordinate. InputHandlerScrollResult result = host_impl_->ScrollUpdate( - UpdateState(pointer_position, delta, InputHandler::WHEEL).get()); + UpdateState(pointer_position, delta, ScrollInputType::kWheel).get()); EXPECT_VECTOR_EQ(gfx::Vector2dF(20, 20), CurrentScrollOffset(overflow)); EXPECT_VECTOR_EQ(gfx::Vector2dF(4, 4), result.current_visual_offset); @@ -2241,18 +2255,18 @@ // Should be (10, 10) in the scroller's coordinate. gfx::Point pointer_position(2, 2); gfx::Vector2dF delta(4, 4); - EXPECT_EQ( - InputHandler::SCROLL_ON_IMPL_THREAD, - host_impl_ - ->ScrollBegin( - BeginState(pointer_position, delta, InputHandler::WHEEL).get(), - InputHandler::WHEEL) - .thread); + EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, + host_impl_ + ->ScrollBegin( + BeginState(pointer_position, delta, ScrollInputType::kWheel) + .get(), + ScrollInputType::kWheel) + .thread); EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 0), CurrentScrollOffset(overflow)); // Should be (20, 20) in the scroller's coordinate. InputHandlerScrollResult result = host_impl_->ScrollUpdate( - UpdateState(pointer_position, delta, InputHandler::WHEEL).get()); + UpdateState(pointer_position, delta, ScrollInputType::kWheel).get()); EXPECT_VECTOR_EQ(gfx::Vector2dF(20, 20), CurrentScrollOffset(overflow)); EXPECT_VECTOR_EQ(gfx::Vector2dF(4, 4), result.current_visual_offset); @@ -2292,18 +2306,18 @@ gfx::Vector2dF diagonal_delta(-10, -10); // OverscrollBehaviorTypeAuto shouldn't prevent scroll propagation. - EXPECT_EQ( - InputHandler::SCROLL_ON_IMPL_THREAD, - host_impl_ - ->ScrollBegin( - BeginState(pointer_position, x_delta, InputHandler::WHEEL).get(), - InputHandler::WHEEL) - .thread); + EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, + host_impl_ + ->ScrollBegin(BeginState(pointer_position, x_delta, + ScrollInputType::kWheel) + .get(), + ScrollInputType::kWheel) + .thread); EXPECT_VECTOR_EQ(gfx::Vector2dF(30, 30), CurrentScrollOffset(scroll_layer)); EXPECT_VECTOR_EQ(gfx::Vector2dF(), CurrentScrollOffset(overflow)); host_impl_->ScrollUpdate( - UpdateState(pointer_position, x_delta, InputHandler::WHEEL).get()); + UpdateState(pointer_position, x_delta, ScrollInputType::kWheel).get()); host_impl_->ScrollEnd(); EXPECT_VECTOR_EQ(gfx::Vector2dF(20, 30), CurrentScrollOffset(scroll_layer)); EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 0), CurrentScrollOffset(overflow)); @@ -2316,36 +2330,36 @@ // OverscrollBehaviorContain on x should prevent propagations of scroll // on x. - EXPECT_EQ( - InputHandler::SCROLL_ON_IMPL_THREAD, - host_impl_ - ->ScrollBegin( - BeginState(pointer_position, x_delta, InputHandler::WHEEL).get(), - InputHandler::WHEEL) - .thread); + EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, + host_impl_ + ->ScrollBegin(BeginState(pointer_position, x_delta, + ScrollInputType::kWheel) + .get(), + ScrollInputType::kWheel) + .thread); EXPECT_VECTOR_EQ(gfx::Vector2dF(20, 30), CurrentScrollOffset(scroll_layer)); EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 0), CurrentScrollOffset(overflow)); host_impl_->ScrollUpdate( - UpdateState(pointer_position, x_delta, InputHandler::WHEEL).get()); + UpdateState(pointer_position, x_delta, ScrollInputType::kWheel).get()); host_impl_->ScrollEnd(); EXPECT_VECTOR_EQ(gfx::Vector2dF(20, 30), CurrentScrollOffset(scroll_layer)); EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 0), CurrentScrollOffset(overflow)); // OverscrollBehaviorContain on x shouldn't prevent propagations of // scroll on y. - EXPECT_EQ( - InputHandler::SCROLL_ON_IMPL_THREAD, - host_impl_ - ->ScrollBegin( - BeginState(pointer_position, y_delta, InputHandler::WHEEL).get(), - InputHandler::WHEEL) - .thread); + EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, + host_impl_ + ->ScrollBegin(BeginState(pointer_position, y_delta, + ScrollInputType::kWheel) + .get(), + ScrollInputType::kWheel) + .thread); EXPECT_VECTOR_EQ(gfx::Vector2dF(20, 30), CurrentScrollOffset(scroll_layer)); EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 0), CurrentScrollOffset(overflow)); host_impl_->ScrollUpdate( - UpdateState(pointer_position, y_delta, InputHandler::WHEEL).get()); + UpdateState(pointer_position, y_delta, ScrollInputType::kWheel).get()); host_impl_->ScrollEnd(); EXPECT_VECTOR_EQ(gfx::Vector2dF(20, 20), CurrentScrollOffset(scroll_layer)); EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 0), CurrentScrollOffset(overflow)); @@ -2355,15 +2369,16 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(pointer_position, diagonal_delta, - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); EXPECT_VECTOR_EQ(gfx::Vector2dF(20, 20), CurrentScrollOffset(scroll_layer)); EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 0), CurrentScrollOffset(overflow)); host_impl_->ScrollUpdate( - UpdateState(pointer_position, diagonal_delta, InputHandler::WHEEL).get()); + UpdateState(pointer_position, diagonal_delta, ScrollInputType::kWheel) + .get()); host_impl_->ScrollEnd(); EXPECT_VECTOR_EQ(gfx::Vector2dF(20, 20), CurrentScrollOffset(scroll_layer)); EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 0), CurrentScrollOffset(overflow)); @@ -2377,36 +2392,36 @@ // OverscrollBehaviorContain on y shouldn't prevent propagations of // scroll on x. - EXPECT_EQ( - InputHandler::SCROLL_ON_IMPL_THREAD, - host_impl_ - ->ScrollBegin( - BeginState(pointer_position, x_delta, InputHandler::WHEEL).get(), - InputHandler::WHEEL) - .thread); + EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, + host_impl_ + ->ScrollBegin(BeginState(pointer_position, x_delta, + ScrollInputType::kWheel) + .get(), + ScrollInputType::kWheel) + .thread); EXPECT_VECTOR_EQ(gfx::Vector2dF(20, 20), CurrentScrollOffset(scroll_layer)); EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 0), CurrentScrollOffset(overflow)); host_impl_->ScrollUpdate( - UpdateState(pointer_position, x_delta, InputHandler::WHEEL).get()); + UpdateState(pointer_position, x_delta, ScrollInputType::kWheel).get()); host_impl_->ScrollEnd(); EXPECT_VECTOR_EQ(gfx::Vector2dF(10, 20), CurrentScrollOffset(scroll_layer)); EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 0), CurrentScrollOffset(overflow)); // OverscrollBehaviorContain on y should prevent propagations of scroll // on y. - EXPECT_EQ( - InputHandler::SCROLL_ON_IMPL_THREAD, - host_impl_ - ->ScrollBegin( - BeginState(pointer_position, y_delta, InputHandler::WHEEL).get(), - InputHandler::WHEEL) - .thread); + EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, + host_impl_ + ->ScrollBegin(BeginState(pointer_position, y_delta, + ScrollInputType::kWheel) + .get(), + ScrollInputType::kWheel) + .thread); EXPECT_VECTOR_EQ(gfx::Vector2dF(10, 20), CurrentScrollOffset(scroll_layer)); EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 0), CurrentScrollOffset(overflow)); host_impl_->ScrollUpdate( - UpdateState(pointer_position, y_delta, InputHandler::WHEEL).get()); + UpdateState(pointer_position, y_delta, ScrollInputType::kWheel).get()); host_impl_->ScrollEnd(); EXPECT_VECTOR_EQ(gfx::Vector2dF(10, 20), CurrentScrollOffset(scroll_layer)); EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 0), CurrentScrollOffset(overflow)); @@ -2416,15 +2431,16 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(pointer_position, diagonal_delta, - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); EXPECT_VECTOR_EQ(gfx::Vector2dF(10, 20), CurrentScrollOffset(scroll_layer)); EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 0), CurrentScrollOffset(overflow)); host_impl_->ScrollUpdate( - UpdateState(pointer_position, diagonal_delta, InputHandler::WHEEL).get()); + UpdateState(pointer_position, diagonal_delta, ScrollInputType::kWheel) + .get()); host_impl_->ScrollEnd(); EXPECT_VECTOR_EQ(gfx::Vector2dF(10, 20), CurrentScrollOffset(scroll_layer)); EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 0), CurrentScrollOffset(overflow)); @@ -2437,24 +2453,24 @@ DrawFrame(); - EXPECT_EQ( - InputHandler::SCROLL_ON_IMPL_THREAD, - host_impl_ - ->ScrollBegin( - BeginState(pointer_position, x_delta, InputHandler::WHEEL).get(), - InputHandler::WHEEL) - .thread); + EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, + host_impl_ + ->ScrollBegin(BeginState(pointer_position, x_delta, + ScrollInputType::kWheel) + .get(), + ScrollInputType::kWheel) + .thread); EXPECT_VECTOR_EQ(gfx::Vector2dF(10, 20), CurrentScrollOffset(scroll_layer)); EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 0), CurrentScrollOffset(overflow)); host_impl_->ScrollUpdate( - UpdateState(pointer_position, x_delta, InputHandler::WHEEL).get()); + UpdateState(pointer_position, x_delta, ScrollInputType::kWheel).get()); host_impl_->ScrollUpdate( - UpdateState(pointer_position, -x_delta, InputHandler::WHEEL).get()); + UpdateState(pointer_position, -x_delta, ScrollInputType::kWheel).get()); host_impl_->ScrollUpdate( - UpdateState(pointer_position, y_delta, InputHandler::WHEEL).get()); + UpdateState(pointer_position, y_delta, ScrollInputType::kWheel).get()); host_impl_->ScrollUpdate( - UpdateState(pointer_position, -y_delta, InputHandler::WHEEL).get()); + UpdateState(pointer_position, -y_delta, ScrollInputType::kWheel).get()); host_impl_->ScrollEnd(); EXPECT_VECTOR_EQ(gfx::Vector2dF(10, 20), CurrentScrollOffset(scroll_layer)); EXPECT_VECTOR_EQ(gfx::Vector2dF(10, 10), CurrentScrollOffset(overflow)); @@ -2478,15 +2494,16 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(scroll_position, scroll_delta, - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); EXPECT_VECTOR_EQ(gfx::Vector2dF(), CurrentScrollOffset(scroll_layer)); EXPECT_VECTOR_EQ(gfx::Vector2dF(), CurrentScrollOffset(overflow)); host_impl_->ScrollUpdate( - UpdateState(scroll_position, scroll_delta, InputHandler::WHEEL).get()); + UpdateState(scroll_position, scroll_delta, ScrollInputType::kWheel) + .get()); host_impl_->ScrollEnd(); EXPECT_VECTOR_EQ(gfx::Vector2dF(), CurrentScrollOffset(scroll_layer)); EXPECT_VECTOR_EQ(gfx::Vector2dF(10, 10), CurrentScrollOffset(overflow)); @@ -2498,15 +2515,16 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(scroll_position, scroll_delta, - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); EXPECT_VECTOR_EQ(gfx::Vector2dF(), CurrentScrollOffset(scroll_layer)); EXPECT_VECTOR_EQ(gfx::Vector2dF(10, 10), CurrentScrollOffset(overflow)); host_impl_->ScrollUpdate( - UpdateState(scroll_position, scroll_delta, InputHandler::WHEEL).get()); + UpdateState(scroll_position, scroll_delta, ScrollInputType::kWheel) + .get()); host_impl_->ScrollEnd(); EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 0), CurrentScrollOffset(scroll_layer)); EXPECT_VECTOR_EQ(gfx::Vector2dF(10, 20), CurrentScrollOffset(overflow)); @@ -2517,15 +2535,16 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(scroll_position, scroll_delta, - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 0), CurrentScrollOffset(scroll_layer)); EXPECT_VECTOR_EQ(gfx::Vector2dF(10, 20), CurrentScrollOffset(overflow)); host_impl_->ScrollUpdate( - UpdateState(scroll_position, scroll_delta, InputHandler::WHEEL).get()); + UpdateState(scroll_position, scroll_delta, ScrollInputType::kWheel) + .get()); host_impl_->ScrollEnd(); EXPECT_VECTOR_EQ(gfx::Vector2dF(10, 10), CurrentScrollOffset(scroll_layer)); EXPECT_VECTOR_EQ(gfx::Vector2dF(10, 20), CurrentScrollOffset(overflow)); @@ -2540,9 +2559,10 @@ DrawFrame(); InputHandler::ScrollStatus status = host_impl_->ScrollBegin( - BeginState(gfx::Point(25, 25), gfx::Vector2dF(0, 10), InputHandler::WHEEL) + BeginState(gfx::Point(25, 25), gfx::Vector2dF(0, 10), + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL); + ScrollInputType::kWheel); EXPECT_EQ(InputHandler::SCROLL_ON_MAIN_THREAD, status.thread); EXPECT_EQ(MainThreadScrollingReason::kNonFastScrollableRegion, status.main_thread_scrolling_reasons); @@ -2799,9 +2819,9 @@ // gesture that doesn't cause (initial) scrolling? // https://crbug.com/1030262 host_impl_->ScrollBegin(BeginState(gfx::Point(50, 50), gfx::Vector2dF(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); host_impl_->PinchGestureBegin(); host_impl_->PinchGestureUpdate(page_scale_delta, gfx::Point(50, 50)); host_impl_->PinchGestureEnd(gfx::Point(50, 50), true); @@ -2827,10 +2847,10 @@ SetScrollOffsetDelta(scroll_layer, gfx::Vector2d()); float page_scale_delta = 2; - host_impl_->ScrollBegin( - BeginState(gfx::Point(), gfx::Vector2dF(), InputHandler::TOUCHSCREEN) - .get(), - InputHandler::TOUCHSCREEN); + host_impl_->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2dF(), + ScrollInputType::kTouchscreen) + .get(), + ScrollInputType::kTouchscreen); host_impl_->PinchGestureBegin(); host_impl_->PinchGestureUpdate(page_scale_delta, gfx::Point()); host_impl_->PinchGestureEnd(gfx::Point(), true); @@ -2840,12 +2860,12 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(5, 5), scroll_delta, - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), scroll_delta, InputHandler::WHEEL).get()); + UpdateState(gfx::Point(), scroll_delta, ScrollInputType::kWheel).get()); host_impl_->ScrollEnd(); std::unique_ptr<ScrollAndScaleSet> scroll_info = @@ -2932,9 +2952,9 @@ MaxScrollOffset(outer_scroll_layer)); host_impl_->ScrollBegin(BeginState(gfx::Point(250, 250), gfx::Vector2dF(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); host_impl_->PinchGestureBegin(); host_impl_->PinchGestureUpdate(2, gfx::Point(0, 0)); host_impl_->PinchGestureEnd(gfx::Point(0, 0), true); @@ -2948,12 +2968,12 @@ // Scroll down - only the inner viewport should scroll. host_impl_->ScrollBegin(BeginState(gfx::Point(0, 0), gfx::Vector2dF(100, 100), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); host_impl_->ScrollUpdate(UpdateState(gfx::Point(0, 0), gfx::Vector2dF(100, 100), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); host_impl_->ScrollEnd(); @@ -2966,12 +2986,12 @@ // its maximum. host_impl_->ScrollBegin( BeginState(gfx::Point(0, 0), gfx::Vector2dF(1000, 1000), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); host_impl_->ScrollUpdate(UpdateState(gfx::Point(0, 0), gfx::Vector2dF(1000, 1000), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); host_impl_->ScrollEnd(); @@ -3005,12 +3025,12 @@ // Scroll only the layout viewport. host_impl_->ScrollBegin( BeginState(gfx::Point(250, 250), gfx::Vector2dF(0.125f, 0.125f), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); host_impl_->ScrollUpdate(UpdateState(gfx::Point(250, 250), gfx::Vector2dF(0.125f, 0.125f), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); EXPECT_VECTOR2DF_EQ(gfx::Vector2dF(0.125f, 0.125f), CurrentScrollOffset(outer_scroll_layer)); @@ -3023,12 +3043,12 @@ // Now that we zoomed in, the scroll should be applied to the inner viewport. host_impl_->ScrollBegin( BeginState(gfx::Point(250, 250), gfx::Vector2dF(0.5f, 0.5f), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); host_impl_->ScrollUpdate(UpdateState(gfx::Point(250, 250), gfx::Vector2dF(0.5f, 0.5f), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); EXPECT_VECTOR2DF_EQ(gfx::Vector2dF(0.125f, 0.125f), CurrentScrollOffset(outer_scroll_layer)); @@ -3059,9 +3079,9 @@ MaxScrollOffset(outer_scroll_layer)); host_impl_->ScrollBegin(BeginState(gfx::Point(250, 250), gfx::Vector2dF(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); host_impl_->PinchGestureBegin(); host_impl_->PinchGestureUpdate(2, gfx::Point(250, 250)); @@ -3075,7 +3095,7 @@ host_impl_->ScrollUpdate(UpdateState(gfx::Point(250, 250), gfx::Vector2dF(10, 10), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 0), CurrentScrollOffset(outer_scroll_layer)); @@ -3086,7 +3106,7 @@ host_impl_->ScrollUpdate(UpdateState(gfx::Point(250, 250), gfx::Vector2dF(400, 400), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); EXPECT_VECTOR_EQ(gfx::Vector2dF(80, 80), CurrentScrollOffset(outer_scroll_layer)); @@ -3116,8 +3136,8 @@ // Pinch in within the margins. The scroll should stay exactly locked to the // bottom and right. host_impl_->ScrollBegin( - BeginState(anchor, gfx::Vector2dF(), InputHandler::TOUCHSCREEN).get(), - InputHandler::TOUCHSCREEN); + BeginState(anchor, gfx::Vector2dF(), ScrollInputType::kTouchscreen).get(), + ScrollInputType::kTouchscreen); host_impl_->PinchGestureBegin(); host_impl_->PinchGestureUpdate(2, anchor); host_impl_->PinchGestureEnd(anchor, true); @@ -3135,8 +3155,8 @@ // top and left. anchor = gfx::Point(offsetFromEdge, offsetFromEdge); host_impl_->ScrollBegin( - BeginState(anchor, gfx::Vector2dF(), InputHandler::TOUCHSCREEN).get(), - InputHandler::TOUCHSCREEN); + BeginState(anchor, gfx::Vector2dF(), ScrollInputType::kTouchscreen).get(), + ScrollInputType::kTouchscreen); host_impl_->PinchGestureBegin(); host_impl_->PinchGestureUpdate(2, anchor); host_impl_->PinchGestureEnd(anchor, true); @@ -3154,8 +3174,8 @@ offsetFromEdge = Viewport::kPinchZoomSnapMarginDips; anchor = gfx::Point(offsetFromEdge, offsetFromEdge); host_impl_->ScrollBegin( - BeginState(anchor, gfx::Vector2dF(), InputHandler::TOUCHSCREEN).get(), - InputHandler::TOUCHSCREEN); + BeginState(anchor, gfx::Vector2dF(), ScrollInputType::kTouchscreen).get(), + ScrollInputType::kTouchscreen); host_impl_->PinchGestureBegin(); host_impl_->PinchGestureUpdate(2, anchor); host_impl_->PinchGestureEnd(anchor, true); @@ -3174,8 +3194,8 @@ anchor = gfx::Point(viewport_size.width() - offsetFromEdge, viewport_size.height() - offsetFromEdge); host_impl_->ScrollBegin( - BeginState(anchor, gfx::Vector2dF(), InputHandler::TOUCHSCREEN).get(), - InputHandler::TOUCHSCREEN); + BeginState(anchor, gfx::Vector2dF(), ScrollInputType::kTouchscreen).get(), + ScrollInputType::kTouchscreen); host_impl_->PinchGestureBegin(); host_impl_->PinchGestureUpdate(2, anchor); host_impl_->PinchGestureEnd(anchor, true); @@ -3202,13 +3222,13 @@ // Scroll by a small amount, there should be no bubbling to the outer // viewport. - host_impl_->ScrollBegin( - BeginState(gfx::Point(0, 0), gfx::Vector2dF(10, 20), InputHandler::WHEEL) - .get(), - InputHandler::WHEEL); - host_impl_->ScrollUpdate( - UpdateState(gfx::Point(0, 0), gfx::Vector2dF(10, 20), InputHandler::WHEEL) - .get()); + host_impl_->ScrollBegin(BeginState(gfx::Point(0, 0), gfx::Vector2dF(10, 20), + ScrollInputType::kWheel) + .get(), + ScrollInputType::kWheel); + host_impl_->ScrollUpdate(UpdateState(gfx::Point(0, 0), gfx::Vector2dF(10, 20), + ScrollInputType::kWheel) + .get()); host_impl_->ScrollEnd(); EXPECT_VECTOR_EQ(gfx::Vector2dF(5, 10), @@ -3218,12 +3238,12 @@ // Scroll by the inner viewport's max scroll extent, the remainder // should bubble up to the outer viewport. host_impl_->ScrollBegin(BeginState(gfx::Point(0, 0), gfx::Vector2dF(100, 100), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL); + ScrollInputType::kWheel); host_impl_->ScrollUpdate(UpdateState(gfx::Point(0, 0), gfx::Vector2dF(100, 100), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get()); host_impl_->ScrollEnd(); @@ -3235,12 +3255,12 @@ // Scroll by the outer viewport's max scroll extent, it should all go to the // outer viewport. host_impl_->ScrollBegin(BeginState(gfx::Point(0, 0), gfx::Vector2dF(190, 180), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL); + ScrollInputType::kWheel); host_impl_->ScrollUpdate(UpdateState(gfx::Point(0, 0), gfx::Vector2dF(190, 180), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get()); host_impl_->ScrollEnd(); @@ -3261,13 +3281,13 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2d(0, 10), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); - host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), gfx::Vector2d(0, 10), InputHandler::TOUCHSCREEN) - .get()); + host_impl_->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(0, 10), + ScrollInputType::kTouchscreen) + .get()); host_impl_->QueueSwapPromiseForMainThreadScrollUpdate( std::move(swap_promise)); host_impl_->ScrollEnd(); @@ -3303,16 +3323,16 @@ { host_impl_->ScrollBegin(BeginState(gfx::Point(21, 21), gfx::Vector2d(5, 5), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); host_impl_->ScrollUpdate(UpdateState(gfx::Point(21, 21), gfx::Vector2d(5, 5), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); host_impl_->ScrollUpdate(UpdateState(gfx::Point(21, 21), gfx::Vector2d(100, 100), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); host_impl_->ScrollEnd(); @@ -3331,24 +3351,24 @@ { host_impl_->ScrollBegin(BeginState(gfx::Point(21, 21), gfx::Vector2d(3, 4), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); host_impl_->ScrollUpdate(UpdateState(gfx::Point(21, 21), gfx::Vector2d(3, 4), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); host_impl_->ScrollUpdate(UpdateState(gfx::Point(21, 21), gfx::Vector2d(2, 1), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); host_impl_->ScrollUpdate(UpdateState(gfx::Point(21, 21), gfx::Vector2d(2, 1), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); host_impl_->ScrollUpdate(UpdateState(gfx::Point(21, 21), gfx::Vector2d(2, 1), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); host_impl_->ScrollEnd(); @@ -3381,9 +3401,9 @@ float page_scale_delta = 2; host_impl_->ScrollBegin(BeginState(gfx::Point(50, 50), gfx::Vector2dF(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); host_impl_->PinchGestureBegin(); host_impl_->PinchGestureUpdate(page_scale_delta, gfx::Point(50, 50)); host_impl_->PinchGestureEnd(gfx::Point(50, 50), true); @@ -3405,9 +3425,9 @@ float page_scale_delta = 10; host_impl_->ScrollBegin(BeginState(gfx::Point(50, 50), gfx::Vector2dF(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); host_impl_->PinchGestureBegin(); host_impl_->PinchGestureUpdate(page_scale_delta, gfx::Point(50, 50)); host_impl_->PinchGestureEnd(gfx::Point(50, 50), true); @@ -3432,10 +3452,10 @@ scroll_layer->element_id(), gfx::ScrollOffset(50, 50)); float page_scale_delta = 0.1f; - host_impl_->ScrollBegin( - BeginState(gfx::Point(), gfx::Vector2dF(), InputHandler::TOUCHSCREEN) - .get(), - InputHandler::TOUCHSCREEN); + host_impl_->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2dF(), + ScrollInputType::kTouchscreen) + .get(), + ScrollInputType::kTouchscreen); host_impl_->PinchGestureBegin(); host_impl_->PinchGestureUpdate(page_scale_delta, gfx::Point()); host_impl_->PinchGestureEnd(gfx::Point(), true); @@ -3463,9 +3483,9 @@ float page_scale_delta = 1; host_impl_->ScrollBegin(BeginState(gfx::Point(10, 10), gfx::Vector2dF(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); host_impl_->PinchGestureBegin(); host_impl_->PinchGestureUpdate(page_scale_delta, gfx::Point(10, 10)); host_impl_->PinchGestureUpdate(page_scale_delta, gfx::Point(20, 20)); @@ -3494,14 +3514,14 @@ float page_scale_delta = 1; host_impl_->ScrollBegin( BeginState(gfx::Point(10, 10), gfx::Vector2dF(-10, -10), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); host_impl_->PinchGestureBegin(); host_impl_->PinchGestureUpdate(page_scale_delta, gfx::Point(10, 10)); host_impl_->ScrollUpdate(UpdateState(gfx::Point(10, 10), gfx::Vector2d(-10, -10), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); host_impl_->PinchGestureUpdate(page_scale_delta, gfx::Point(20, 20)); host_impl_->PinchGestureEnd(gfx::Point(20, 20), true); @@ -3527,9 +3547,9 @@ scroll_layer->element_id(), gfx::ScrollOffset(0, 0)); host_impl_->ScrollBegin(BeginState(gfx::Point(0, 0), gfx::Vector2dF(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); host_impl_->PinchGestureBegin(); host_impl_->PinchGestureUpdate(2, gfx::Point(0, 0)); host_impl_->PinchGestureUpdate(1, gfx::Point(0, 0)); @@ -3539,7 +3559,7 @@ host_impl_->ScrollUpdate(UpdateState(gfx::Point(0, 0), gfx::Vector2d(10, 10), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); host_impl_->PinchGestureUpdate(1, gfx::Point(10, 10)); host_impl_->PinchGestureEnd(gfx::Point(10, 10), true); @@ -3576,14 +3596,14 @@ float page_scale_delta = 1; host_impl_->ScrollBegin(BeginState(gfx::Point(10, 10), gfx::Vector2dF(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); host_impl_->PinchGestureBegin(); host_impl_->PinchGestureUpdate(page_scale_delta, gfx::Point(10, 10)); host_impl_->ScrollUpdate(UpdateState(gfx::Point(10, 10), gfx::Vector2dF(0, -1.001f), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); host_impl_->PinchGestureUpdate(page_scale_delta, gfx::Point(10, 9)); host_impl_->PinchGestureEnd(gfx::Point(10, 9), true); @@ -3619,13 +3639,13 @@ ->scroll_tree.UpdateScrollOffsetBaseForTesting( scroll_layer->element_id(), gfx::ScrollOffset(0, 20.5f)); - host_impl_->ScrollBegin( - BeginState(gfx::Point(10, 10), gfx::Vector2dF(0, -1), InputHandler::WHEEL) - .get(), - InputHandler::WHEEL); + host_impl_->ScrollBegin(BeginState(gfx::Point(10, 10), gfx::Vector2dF(0, -1), + ScrollInputType::kWheel) + .get(), + ScrollInputType::kWheel); host_impl_->ScrollUpdate(UpdateState(gfx::Point(10, 10), gfx::Vector2dF(0, -1), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get()); host_impl_->ScrollEnd(); @@ -4161,10 +4181,10 @@ // TODO(bokan): Unfortunately, Mac currently doesn't support smooth scrolling // wheel events. https://crbug.com/574283. #if defined(OS_MACOSX) - std::vector<InputHandler::ScrollInputType> types = {InputHandler::SCROLLBAR}; + std::vector<ScrollInputType> types = {ScrollInputType::kScrollbar}; #else - std::vector<InputHandler::ScrollInputType> types = {InputHandler::SCROLLBAR, - InputHandler::WHEEL}; + std::vector<ScrollInputType> types = {ScrollInputType::kScrollbar, + ScrollInputType::kWheel}; #endif for (auto type : types) { auto begin_state = BeginState(position, offset, type); @@ -4231,8 +4251,8 @@ gfx::Point position(295, 195); gfx::Vector2dF offset(0, 50); - std::vector<InputHandler::ScrollInputType> types = {InputHandler::SCROLLBAR, - InputHandler::WHEEL}; + std::vector<ScrollInputType> types = {ScrollInputType::kScrollbar, + ScrollInputType::kWheel}; for (auto type : types) { auto begin_state = BeginState(position, offset, type); begin_state->data()->set_current_native_scrolling_element( @@ -4361,8 +4381,9 @@ // If no scroll happened during a scroll gesture, it should have no effect. host_impl_->ScrollBegin( - BeginState(gfx::Point(), gfx::Vector2dF(), InputHandler::WHEEL).get(), - InputHandler::WHEEL); + BeginState(gfx::Point(), gfx::Vector2dF(), ScrollInputType::kWheel) + .get(), + ScrollInputType::kWheel); host_impl_->ScrollEnd(); EXPECT_FALSE(did_request_next_frame_); EXPECT_FALSE(did_request_redraw_); @@ -4372,10 +4393,11 @@ // For Aura Overlay Scrollbar, if no scroll happened during a scroll // gesture, shows scrollbars and schedules a delay fade out. host_impl_->ScrollBegin( - BeginState(gfx::Point(), gfx::Vector2dF(), InputHandler::WHEEL).get(), - InputHandler::WHEEL); + BeginState(gfx::Point(), gfx::Vector2dF(), ScrollInputType::kWheel) + .get(), + ScrollInputType::kWheel); host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), gfx::Vector2dF(0, 0), InputHandler::WHEEL) + UpdateState(gfx::Point(), gfx::Vector2dF(0, 0), ScrollInputType::kWheel) .get()); host_impl_->ScrollEnd(); EXPECT_FALSE(did_request_next_frame_); @@ -4407,11 +4429,11 @@ // After a scroll, a scrollbar animation should be scheduled about 20ms from // now. host_impl_->ScrollBegin( - BeginState(gfx::Point(), gfx::Vector2dF(0, 5), InputHandler::WHEEL) + BeginState(gfx::Point(), gfx::Vector2dF(0, 5), ScrollInputType::kWheel) .get(), - InputHandler::WHEEL); + ScrollInputType::kWheel); host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), gfx::Vector2dF(0, 5), InputHandler::WHEEL) + UpdateState(gfx::Point(), gfx::Vector2dF(0, 5), ScrollInputType::kWheel) .get()); EXPECT_FALSE(did_request_next_frame_); EXPECT_TRUE(did_request_redraw_); @@ -4559,11 +4581,11 @@ scroll->element_id())); } host_impl_->ScrollBegin( - BeginState(gfx::Point(), gfx::Vector2dF(0, 5), InputHandler::WHEEL) + BeginState(gfx::Point(), gfx::Vector2dF(0, 5), ScrollInputType::kWheel) .get(), - InputHandler::WHEEL); + ScrollInputType::kWheel); host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), gfx::Vector2dF(0, 5), InputHandler::WHEEL) + UpdateState(gfx::Point(), gfx::Vector2dF(0, 5), ScrollInputType::kWheel) .get()); host_impl_->ScrollEnd(); @@ -4688,12 +4710,13 @@ // Scroll on root should flash all scrollbars. host_impl_->RootScrollBegin( - BeginState(gfx::Point(20, 20), gfx::Vector2dF(0, 10), InputHandler::WHEEL) + BeginState(gfx::Point(20, 20), gfx::Vector2dF(0, 10), + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL); - host_impl_->ScrollUpdate( - UpdateState(gfx::Point(20, 20), gfx::Vector2d(0, 10), InputHandler::WHEEL) - .get()); + ScrollInputType::kWheel); + host_impl_->ScrollUpdate(UpdateState(gfx::Point(20, 20), gfx::Vector2d(0, 10), + ScrollInputType::kWheel) + .get()); host_impl_->ScrollEnd(); EXPECT_TRUE(scrollbar_1_->Opacity()); @@ -4704,9 +4727,9 @@ // Scroll on child should flash all scrollbars. host_impl_->ScrollBegin(BeginState(gfx::Point(70, 70), gfx::Vector2dF(0, 100), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL); + ScrollInputType::kWheel); host_impl_->ScrollUpdate( AnimatedUpdateState(gfx::Point(70, 70), gfx::Vector2d(0, 100)).get()); host_impl_->ScrollEnd(); @@ -4786,9 +4809,9 @@ // Wheel scroll on root scrollbar should process on impl thread. { InputHandler::ScrollStatus status = host_impl_->ScrollBegin( - BeginState(gfx::Point(1, 1), gfx::Vector2dF(), InputHandler::WHEEL) + BeginState(gfx::Point(1, 1), gfx::Vector2dF(), ScrollInputType::kWheel) .get(), - InputHandler::WHEEL); + ScrollInputType::kWheel); EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, status.thread); host_impl_->ScrollEnd(); } @@ -4797,9 +4820,9 @@ { InputHandler::ScrollStatus status = host_impl_->ScrollBegin(BeginState(gfx::Point(1, 1), gfx::Vector2dF(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); EXPECT_EQ(InputHandler::SCROLL_ON_MAIN_THREAD, status.thread); EXPECT_EQ(MainThreadScrollingReason::kScrollbarScrolling, status.main_thread_scrolling_reasons); @@ -4807,10 +4830,11 @@ // Wheel scroll on scrollbar should process on impl thread. { - InputHandler::ScrollStatus status = host_impl_->ScrollBegin( - BeginState(gfx::Point(51, 51), gfx::Vector2dF(), InputHandler::WHEEL) - .get(), - InputHandler::WHEEL); + InputHandler::ScrollStatus status = + host_impl_->ScrollBegin(BeginState(gfx::Point(51, 51), gfx::Vector2dF(), + ScrollInputType::kWheel) + .get(), + ScrollInputType::kWheel); EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, status.thread); EXPECT_EQ(MainThreadScrollingReason::kNotScrollingOnMain, status.main_thread_scrolling_reasons); @@ -4821,9 +4845,9 @@ { InputHandler::ScrollStatus status = host_impl_->ScrollBegin(BeginState(gfx::Point(51, 51), gfx::Vector2dF(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); EXPECT_EQ(InputHandler::SCROLL_ON_MAIN_THREAD, status.thread); EXPECT_EQ(MainThreadScrollingReason::kScrollbarScrolling, status.main_thread_scrolling_reasons); @@ -4969,11 +4993,11 @@ // Scrolling the viewport should result in a scrollbar animation update. animation_task_.Reset(); host_impl_->ScrollBegin( - BeginState(gfx::Point(), gfx::Vector2dF(10, 10), InputHandler::WHEEL) + BeginState(gfx::Point(), gfx::Vector2dF(10, 10), ScrollInputType::kWheel) .get(), - InputHandler::WHEEL); + ScrollInputType::kWheel); host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), gfx::Vector2d(10, 10), InputHandler::WHEEL) + UpdateState(gfx::Point(), gfx::Vector2d(10, 10), ScrollInputType::kWheel) .get()); host_impl_->ScrollEnd(); EXPECT_FALSE(animation_task_.is_null()); @@ -5056,11 +5080,11 @@ // Scroll the page down which moves the thumb down. host_impl_->ScrollBegin( - BeginState(gfx::Point(), gfx::Vector2dF(0, 100), InputHandler::WHEEL) + BeginState(gfx::Point(), gfx::Vector2dF(0, 100), ScrollInputType::kWheel) .get(), - InputHandler::WHEEL); + ScrollInputType::kWheel); host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), gfx::Vector2d(0, 100), InputHandler::WHEEL) + UpdateState(gfx::Point(), gfx::Vector2d(0, 100), ScrollInputType::kWheel) .get()); host_impl_->ScrollEnd(); @@ -5070,11 +5094,11 @@ // Scroll the page up which moves the thumb back up. host_impl_->ScrollBegin( - BeginState(gfx::Point(), gfx::Vector2dF(0, -100), InputHandler::WHEEL) + BeginState(gfx::Point(), gfx::Vector2dF(0, -100), ScrollInputType::kWheel) .get(), - InputHandler::WHEEL); + ScrollInputType::kWheel); host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), gfx::Vector2d(0, -100), InputHandler::WHEEL) + UpdateState(gfx::Point(), gfx::Vector2d(0, -100), ScrollInputType::kWheel) .get()); host_impl_->ScrollEnd(); @@ -5292,12 +5316,12 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2dF(0, 10), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), gfx::Vector2d(0, 10), InputHandler::WHEEL) + UpdateState(gfx::Point(), gfx::Vector2d(0, 10), ScrollInputType::kWheel) .get()); { viz::CompositorFrameMetadata metadata = @@ -5313,9 +5337,9 @@ // Page scale should update metadata correctly (shrinking only the viewport). host_impl_->ScrollBegin( - BeginState(gfx::Point(), gfx::Vector2dF(), InputHandler::TOUCHSCREEN) + BeginState(gfx::Point(), gfx::Vector2dF(), ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); host_impl_->PinchGestureBegin(); host_impl_->PinchGestureUpdate(2, gfx::Point()); host_impl_->PinchGestureEnd(gfx::Point(), true); @@ -5847,9 +5871,9 @@ // Scroll event is ignored because layer is not scrollable. InputHandler::ScrollStatus status = host_impl_->ScrollBegin( - BeginState(gfx::Point(), gfx::Vector2dF(0, 10), InputHandler::WHEEL) + BeginState(gfx::Point(), gfx::Vector2dF(0, 10), ScrollInputType::kWheel) .get(), - InputHandler::WHEEL); + ScrollInputType::kWheel); EXPECT_EQ(InputHandler::SCROLL_IGNORED, status.thread); EXPECT_EQ(MainThreadScrollingReason::kNoScrollingLayer, status.main_thread_scrolling_reasons); @@ -5981,9 +6005,9 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2dF(0, 25), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); host_impl_->browser_controls_manager()->ScrollBegin(); @@ -6038,9 +6062,9 @@ ASSERT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2dF(0, 25), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); // Hide the browser controls by 25px. The outer clip should expand by 50px as @@ -6048,7 +6072,7 @@ // case 0.5. Therefore, changes to the outer viewport need to be divided by // the minimum scale as well. host_impl_->ScrollUpdate(UpdateState(gfx::Point(0, 0), gfx::Vector2dF(0, 25), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); EXPECT_VIEWPORT_GEOMETRIES(0.5f); @@ -6088,9 +6112,9 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2dF(0, 25), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); host_impl_->browser_controls_manager()->ScrollBegin(); @@ -6143,9 +6167,9 @@ InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), top_controls_scroll_delta, - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); // Make the test scroll delta a fractional amount, to verify that the @@ -6183,12 +6207,12 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2dF(0, 50), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); host_impl_->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2dF(0, 50), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); // The entire scroll delta should have been used to hide the browser controls. @@ -6200,7 +6224,7 @@ // The inner viewport should be scrollable by 50px * page_scale. host_impl_->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2dF(0, 100), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); EXPECT_EQ(50, CurrentScrollOffset(inner_scroll).y()); EXPECT_EQ(0, CurrentScrollOffset(outer_scroll).y()); @@ -6211,15 +6235,15 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2dF(0, -50), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); EXPECT_EQ(host_impl_->CurrentlyScrollingNode()->id, outer_scroll->scroll_tree_index()); host_impl_->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2dF(0, -50), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); // The entire scroll delta should have been used to show the browser controls. @@ -6234,19 +6258,19 @@ // Now when we continue scrolling, make sure the outer viewport gets scrolled // since it wasn't scrollable when the scroll began. host_impl_->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2dF(0, -20), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); EXPECT_EQ(25, CurrentScrollOffset(outer_scroll).y()); EXPECT_EQ(15, CurrentScrollOffset(inner_scroll).y()); host_impl_->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2dF(0, -30), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); EXPECT_EQ(25, CurrentScrollOffset(outer_scroll).y()); EXPECT_EQ(0, CurrentScrollOffset(inner_scroll).y()); host_impl_->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2dF(0.f, -50), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); host_impl_->ScrollEnd(); @@ -6272,9 +6296,9 @@ InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), top_controls_scroll_delta, - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); // Scroll down, the browser controls hiding should expand the viewport size so @@ -6295,9 +6319,9 @@ InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), top_controls_scroll_delta, - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); host_impl_->browser_controls_manager()->ScrollBegin(); host_impl_->browser_controls_manager()->ScrollBy(top_controls_scroll_delta); @@ -6313,9 +6337,9 @@ InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), -top_controls_scroll_delta, - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); host_impl_->browser_controls_manager()->ScrollBegin(); host_impl_->browser_controls_manager()->ScrollBy(-top_controls_scroll_delta); @@ -6386,12 +6410,13 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), scroll_delta, - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), scroll_delta, InputHandler::TOUCHSCREEN).get()); + UpdateState(gfx::Point(), scroll_delta, ScrollInputType::kTouchscreen) + .get()); host_impl_->ScrollEnd(); // Browser controls should be hidden @@ -6586,12 +6611,13 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), scroll_delta, - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), scroll_delta, InputHandler::TOUCHSCREEN).get()); + UpdateState(gfx::Point(), scroll_delta, ScrollInputType::kTouchscreen) + .get()); // scrolling down at the max extents no longer hides the browser controls EXPECT_EQ(1, host_impl_->active_tree()->CurrentTopControlsShownRatio()); @@ -6616,12 +6642,13 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), scroll_delta, - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), scroll_delta, InputHandler::TOUCHSCREEN).get()); + UpdateState(gfx::Point(), scroll_delta, ScrollInputType::kTouchscreen) + .get()); host_impl_->ScrollEnd(); // The viewport offset shouldn't have changed. @@ -6649,12 +6676,13 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), scroll_delta, - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), scroll_delta, InputHandler::TOUCHSCREEN).get()); + UpdateState(gfx::Point(), scroll_delta, ScrollInputType::kTouchscreen) + .get()); host_impl_->ScrollEnd(); EXPECT_FLOAT_EQ( @@ -6690,12 +6718,13 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), scroll_delta, - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), scroll_delta, InputHandler::TOUCHSCREEN).get()); + UpdateState(gfx::Point(), scroll_delta, ScrollInputType::kTouchscreen) + .get()); EXPECT_EQ(OuterViewportScrollLayer()->scroll_tree_index(), host_impl_->CurrentlyScrollingNode()->id); @@ -6710,12 +6739,13 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), scroll_delta, - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), scroll_delta, InputHandler::TOUCHSCREEN).get()); + UpdateState(gfx::Point(), scroll_delta, ScrollInputType::kTouchscreen) + .get()); EXPECT_EQ(0, host_impl_->browser_controls_manager()->ContentTopOffset()); EXPECT_EQ(OuterViewportScrollLayer()->scroll_tree_index(), @@ -6732,12 +6762,13 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), scroll_delta, - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), scroll_delta, InputHandler::TOUCHSCREEN).get()); + UpdateState(gfx::Point(), scroll_delta, ScrollInputType::kTouchscreen) + .get()); EXPECT_EQ(top_controls_height_, host_impl_->browser_controls_manager()->ContentTopOffset()); @@ -6757,9 +6788,9 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2dF(0, 50), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); host_impl_->browser_controls_manager()->ScrollBegin(); @@ -6776,9 +6807,9 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2dF(0, -25), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); float scroll_increment_y = -25; @@ -6808,9 +6839,9 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2dF(0, 10), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); } @@ -6847,11 +6878,11 @@ // Fully scroll the viewport. host_impl_->ScrollBegin( BeginState(gfx::Point(75, 75), gfx::Vector2dF(0, 2000), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); host_impl_->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(0, 2000), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); host_impl_->ScrollEnd(); } @@ -6969,12 +7000,12 @@ InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(5, 5), gfx::Vector2dF(0, 10), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), gfx::Vector2d(0, 10), InputHandler::WHEEL) + UpdateState(gfx::Point(), gfx::Vector2d(0, 10), ScrollInputType::kWheel) .get()); host_impl_->ScrollEnd(); EXPECT_TRUE(did_request_redraw_); @@ -6998,12 +7029,12 @@ InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(5, 5), gfx::Vector2dF(0, 10), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), gfx::Vector2d(0, 10), InputHandler::WHEEL) + UpdateState(gfx::Point(), gfx::Vector2d(0, 10), ScrollInputType::kWheel) .get()); host_impl_->ScrollEnd(); EXPECT_TRUE(did_request_redraw_); @@ -7020,9 +7051,10 @@ // Scroll event is ignored because the input coordinate is outside the layer // boundaries. InputHandler::ScrollStatus status = host_impl_->ScrollBegin( - BeginState(gfx::Point(15, 5), gfx::Vector2dF(0, 10), InputHandler::WHEEL) + BeginState(gfx::Point(15, 5), gfx::Vector2dF(0, 10), + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL); + ScrollInputType::kWheel); EXPECT_EQ(InputHandler::SCROLL_IGNORED, status.thread); EXPECT_EQ(MainThreadScrollingReason::kNoScrollingLayer, status.main_thread_scrolling_reasons); @@ -7047,9 +7079,10 @@ // Scroll event is ignored because the scrollable layer is not facing the // viewer and there is nothing scrollable behind it. InputHandler::ScrollStatus status = host_impl_->ScrollBegin( - BeginState(gfx::Point(5, 5), gfx::Vector2dF(0, 10), InputHandler::WHEEL) + BeginState(gfx::Point(5, 5), gfx::Vector2dF(0, 10), + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL); + ScrollInputType::kWheel); EXPECT_EQ(InputHandler::SCROLL_IGNORED, status.thread); EXPECT_EQ(MainThreadScrollingReason::kNoScrollingLayer, status.main_thread_scrolling_reasons); @@ -7076,9 +7109,10 @@ // Scrolling fails because the content layer is asking to be scrolled on the // main thread. InputHandler::ScrollStatus status = host_impl_->ScrollBegin( - BeginState(gfx::Point(5, 5), gfx::Vector2dF(0, 10), InputHandler::WHEEL) + BeginState(gfx::Point(5, 5), gfx::Vector2dF(0, 10), + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL); + ScrollInputType::kWheel); EXPECT_EQ(InputHandler::SCROLL_ON_MAIN_THREAD, status.thread); EXPECT_EQ(MainThreadScrollingReason::kHasBackgroundAttachmentFixedObjects, status.main_thread_scrolling_reasons); @@ -7100,12 +7134,12 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(5, 5), scroll_delta, - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), scroll_delta, InputHandler::WHEEL).get()); + UpdateState(gfx::Point(), scroll_delta, ScrollInputType::kWheel).get()); host_impl_->ScrollEnd(); // Set new page scale from main thread. @@ -7142,20 +7176,20 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(5, 5), scroll_delta, - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), scroll_delta, InputHandler::WHEEL).get()); + UpdateState(gfx::Point(), scroll_delta, ScrollInputType::kWheel).get()); host_impl_->ScrollEnd(); // Set new page scale on impl thread by pinching. float page_scale = 2; host_impl_->ScrollBegin( - BeginState(gfx::Point(), gfx::Vector2dF(), InputHandler::TOUCHSCREEN) + BeginState(gfx::Point(), gfx::Vector2dF(), ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); host_impl_->PinchGestureBegin(); host_impl_->PinchGestureUpdate(page_scale, gfx::Point()); host_impl_->PinchGestureEnd(gfx::Point(), true); @@ -7202,9 +7236,9 @@ // Set new page scale on impl thread by pinching. host_impl_->ScrollBegin( - BeginState(gfx::Point(), gfx::Vector2dF(), InputHandler::TOUCHSCREEN) + BeginState(gfx::Point(), gfx::Vector2dF(), ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); host_impl_->PinchGestureBegin(); host_impl_->PinchGestureUpdate(new_page_scale, gfx::Point()); host_impl_->PinchGestureEnd(gfx::Point(), true); @@ -7240,12 +7274,12 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(5, 5), scroll_delta, - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), scroll_delta, InputHandler::WHEEL).get()); + UpdateState(gfx::Point(), scroll_delta, ScrollInputType::kWheel).get()); host_impl_->ScrollEnd(); float page_scale = 2; @@ -7297,12 +7331,12 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), scroll_delta, - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), scroll_delta, InputHandler::WHEEL).get()); + UpdateState(gfx::Point(), scroll_delta, ScrollInputType::kWheel).get()); host_impl_->ScrollEnd(); std::unique_ptr<ScrollAndScaleSet> scroll_info = @@ -7354,9 +7388,9 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2d(0, -100), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); host_impl_->ScrollUpdate( AnimatedUpdateState(gfx::Point(), gfx::Vector2d(0, -100)).get()); @@ -7438,12 +7472,12 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), scroll_delta, - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), scroll_delta, InputHandler::TOUCHSCREEN) + UpdateState(gfx::Point(), scroll_delta, ScrollInputType::kTouchscreen) .get()); host_impl_->ScrollEnd(); @@ -7463,14 +7497,14 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(5, 5), scroll_delta, - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); EXPECT_EQ(host_impl_->CurrentlyScrollingNode()->id, child_layer->scroll_tree_index()); host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), scroll_delta, InputHandler::TOUCHSCREEN) + UpdateState(gfx::Point(), scroll_delta, ScrollInputType::kTouchscreen) .get()); EXPECT_EQ(host_impl_->CurrentlyScrollingNode()->id, child_layer->scroll_tree_index()); @@ -7494,14 +7528,14 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(5, 5), scroll_delta, - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); EXPECT_EQ(host_impl_->CurrentlyScrollingNode()->id, grand_child_layer->scroll_tree_index()); host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), scroll_delta, InputHandler::TOUCHSCREEN) + UpdateState(gfx::Point(), scroll_delta, ScrollInputType::kTouchscreen) .get()); EXPECT_EQ(host_impl_->CurrentlyScrollingNode()->id, grand_child_layer->scroll_tree_index()); @@ -7527,14 +7561,14 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(1, 1), scroll_delta, - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); EXPECT_EQ(grand_child_layer->scroll_tree_index(), host_impl_->CurrentlyScrollingNode()->id); host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), scroll_delta, InputHandler::TOUCHSCREEN) + UpdateState(gfx::Point(), scroll_delta, ScrollInputType::kTouchscreen) .get()); host_impl_->ScrollEnd(); @@ -7572,13 +7606,13 @@ host_impl_ ->ScrollBegin(BeginState(gfx::Point(5, 5), gfx::ScrollOffsetToVector2dF(scroll_delta), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); host_impl_->ScrollUpdate( UpdateState(gfx::Point(), gfx::ScrollOffsetToVector2dF(scroll_delta), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get()); host_impl_->ScrollEnd(); @@ -7615,13 +7649,13 @@ host_impl_ ->ScrollBegin(BeginState(gfx::Point(5, 5), gfx::ScrollOffsetToVector2dF(scroll_delta), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); host_impl_->ScrollUpdate( UpdateState(gfx::Point(), gfx::ScrollOffsetToVector2dF(scroll_delta), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get()); host_impl_->ScrollEnd(); @@ -7654,9 +7688,9 @@ InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(5, 5), gfx::Vector2dF(0, 10), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); } @@ -7677,13 +7711,13 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gesture_scroll_delta, - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); - host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), gesture_scroll_delta, InputHandler::TOUCHSCREEN) - .get()); + host_impl_->ScrollUpdate(UpdateState(gfx::Point(), gesture_scroll_delta, + ScrollInputType::kTouchscreen) + .get()); host_impl_->ScrollEnd(); // The layer should have scrolled down in its local coordinates. @@ -7701,14 +7735,14 @@ ->ScrollBegin( BeginState(gfx::Point(), gfx::ScrollOffsetToVector2dF(wheel_scroll_delta), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); host_impl_->ScrollUpdate( UpdateState(gfx::Point(), gfx::ScrollOffsetToVector2dF(wheel_scroll_delta), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get()); host_impl_->ScrollEnd(); @@ -7756,12 +7790,12 @@ InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(1, 1), gesture_scroll_delta, - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); host_impl_->ScrollUpdate(UpdateState(gfx::Point(), gesture_scroll_delta, - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); host_impl_->ScrollEnd(); @@ -7787,12 +7821,12 @@ InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(1, 1), gesture_scroll_delta, - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); host_impl_->ScrollUpdate(UpdateState(gfx::Point(), gesture_scroll_delta, - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); host_impl_->ScrollEnd(); @@ -7870,14 +7904,14 @@ ->ScrollBegin(BeginState(viewport_point, gfx::ScrollOffsetToVector2dF( gesture_scroll_deltas[i]), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); host_impl_->ScrollUpdate( UpdateState(viewport_point, gfx::ScrollOffsetToVector2dF(gesture_scroll_deltas[i]), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); viewport_point += gfx::ScrollOffsetToFlooredVector2d(gesture_scroll_deltas[i]); @@ -7910,12 +7944,13 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), scroll_delta, - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), scroll_delta, InputHandler::TOUCHSCREEN).get()); + UpdateState(gfx::Point(), scroll_delta, ScrollInputType::kTouchscreen) + .get()); host_impl_->ScrollEnd(); // The layer should have scrolled down in its local coordinates, but half the @@ -7934,14 +7969,14 @@ ->ScrollBegin( BeginState(gfx::Point(), gfx::ScrollOffsetToVector2dF(wheel_scroll_delta), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); host_impl_->ScrollUpdate( UpdateState(gfx::Point(), gfx::ScrollOffsetToVector2dF(wheel_scroll_delta), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get()); host_impl_->ScrollEnd(); @@ -8021,9 +8056,9 @@ // offset is outside of the scroll range. (this is verified by DCHECKs in the // delegate). host_impl_->ScrollBegin( - BeginState(gfx::Point(), gfx::Vector2dF(), InputHandler::TOUCHSCREEN) + BeginState(gfx::Point(), gfx::Vector2dF(), ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); host_impl_->PinchGestureBegin(); host_impl_->PinchGestureUpdate(2, gfx::Point()); host_impl_->PinchGestureUpdate(.5f, gfx::Point()); @@ -8037,21 +8072,23 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), scroll_delta, - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); host_impl_->SetSynchronousInputHandlerRootScrollOffset(current_offset); host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), scroll_delta, InputHandler::TOUCHSCREEN).get()); + UpdateState(gfx::Point(), scroll_delta, ScrollInputType::kTouchscreen) + .get()); EXPECT_EQ(ScrollOffsetWithDelta(current_offset, scroll_delta), scroll_watcher.last_set_scroll_offset()); current_offset = gfx::ScrollOffset(42, 41); host_impl_->SetSynchronousInputHandlerRootScrollOffset(current_offset); host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), scroll_delta, InputHandler::TOUCHSCREEN).get()); + UpdateState(gfx::Point(), scroll_delta, ScrollInputType::kTouchscreen) + .get()); EXPECT_EQ(current_offset + gfx::ScrollOffset(scroll_delta), scroll_watcher.last_set_scroll_offset()); host_impl_->ScrollEnd(); @@ -8146,15 +8183,16 @@ gfx::Vector2dF scroll_delta(30 * page_scale_factor, 0); { auto begin_state = - BeginState(gfx::Point(), scroll_delta, InputHandler::TOUCHSCREEN); + BeginState(gfx::Point(), scroll_delta, ScrollInputType::kTouchscreen); EXPECT_EQ( InputHandler::SCROLL_ON_IMPL_THREAD, - host_impl_->ScrollBegin(begin_state.get(), InputHandler::TOUCHSCREEN) + host_impl_ + ->ScrollBegin(begin_state.get(), ScrollInputType::kTouchscreen) .thread); // Try scrolling right, the inner viewport should be allowed to scroll. auto update_state = - UpdateState(gfx::Point(), scroll_delta, InputHandler::TOUCHSCREEN); + UpdateState(gfx::Point(), scroll_delta, ScrollInputType::kTouchscreen); host_impl_->ScrollUpdate(update_state.get()); EXPECT_VECTOR_EQ(gfx::ScrollOffset(30, 0), @@ -8165,13 +8203,13 @@ // Continue scrolling. The inner viewport should scroll until its extent, // however, the outer viewport should not accept any scroll. update_state = - UpdateState(gfx::Point(), scroll_delta, InputHandler::TOUCHSCREEN); + UpdateState(gfx::Point(), scroll_delta, ScrollInputType::kTouchscreen); host_impl_->ScrollUpdate(update_state.get()); update_state = - UpdateState(gfx::Point(), scroll_delta, InputHandler::TOUCHSCREEN); + UpdateState(gfx::Point(), scroll_delta, ScrollInputType::kTouchscreen); host_impl_->ScrollUpdate(update_state.get()); update_state = - UpdateState(gfx::Point(), scroll_delta, InputHandler::TOUCHSCREEN); + UpdateState(gfx::Point(), scroll_delta, ScrollInputType::kTouchscreen); host_impl_->ScrollUpdate(update_state.get()); EXPECT_VECTOR_EQ(gfx::ScrollOffset(50, 0), @@ -8188,10 +8226,11 @@ { auto begin_state = - BeginState(gfx::Point(), scroll_delta, InputHandler::WHEEL); + BeginState(gfx::Point(), scroll_delta, ScrollInputType::kWheel); EXPECT_EQ( InputHandler::SCROLL_ON_IMPL_THREAD, - host_impl_->ScrollBegin(begin_state.get(), InputHandler::WHEEL).thread); + host_impl_->ScrollBegin(begin_state.get(), ScrollInputType::kWheel) + .thread); // Try scrolling right, the inner viewport should be allowed to scroll. auto update_state = AnimatedUpdateState(gfx::Point(), scroll_delta); @@ -8414,12 +8453,12 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2dF(0, 10), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); scroll_result = host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), gfx::Vector2d(0, 10), InputHandler::WHEEL) + UpdateState(gfx::Point(), gfx::Vector2d(0, 10), ScrollInputType::kWheel) .get()); EXPECT_TRUE(scroll_result.did_scroll); EXPECT_FALSE(scroll_result.did_overscroll_root); @@ -8428,7 +8467,7 @@ // Overscroll events are reflected immediately. scroll_result = host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), gfx::Vector2d(0, 50), InputHandler::WHEEL) + UpdateState(gfx::Point(), gfx::Vector2d(0, 50), ScrollInputType::kWheel) .get()); EXPECT_TRUE(scroll_result.did_scroll); EXPECT_TRUE(scroll_result.did_overscroll_root); @@ -8439,7 +8478,7 @@ // In-bounds scrolling resets accumulated overscroll for the scrolled axes. scroll_result = host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), gfx::Vector2d(0, -50), InputHandler::WHEEL) + UpdateState(gfx::Point(), gfx::Vector2d(0, -50), ScrollInputType::kWheel) .get()); EXPECT_TRUE(scroll_result.did_scroll); EXPECT_FALSE(scroll_result.did_overscroll_root); @@ -8449,7 +8488,7 @@ host_impl_->accumulated_root_overscroll()); scroll_result = host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), gfx::Vector2d(0, -10), InputHandler::WHEEL) + UpdateState(gfx::Point(), gfx::Vector2d(0, -10), ScrollInputType::kWheel) .get()); EXPECT_FALSE(scroll_result.did_scroll); EXPECT_TRUE(scroll_result.did_overscroll_root); @@ -8459,7 +8498,7 @@ host_impl_->accumulated_root_overscroll()); scroll_result = host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), gfx::Vector2d(10, 0), InputHandler::WHEEL) + UpdateState(gfx::Point(), gfx::Vector2d(10, 0), ScrollInputType::kWheel) .get()); EXPECT_TRUE(scroll_result.did_scroll); EXPECT_FALSE(scroll_result.did_overscroll_root); @@ -8469,7 +8508,7 @@ host_impl_->accumulated_root_overscroll()); scroll_result = host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), gfx::Vector2d(-15, 0), InputHandler::WHEEL) + UpdateState(gfx::Point(), gfx::Vector2d(-15, 0), ScrollInputType::kWheel) .get()); EXPECT_TRUE(scroll_result.did_scroll); EXPECT_TRUE(scroll_result.did_overscroll_root); @@ -8479,7 +8518,7 @@ host_impl_->accumulated_root_overscroll()); scroll_result = host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), gfx::Vector2d(0, 60), InputHandler::WHEEL) + UpdateState(gfx::Point(), gfx::Vector2d(0, 60), ScrollInputType::kWheel) .get()); EXPECT_TRUE(scroll_result.did_scroll); EXPECT_TRUE(scroll_result.did_overscroll_root); @@ -8489,7 +8528,7 @@ host_impl_->accumulated_root_overscroll()); scroll_result = host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), gfx::Vector2d(10, -60), InputHandler::WHEEL) + UpdateState(gfx::Point(), gfx::Vector2d(10, -60), ScrollInputType::kWheel) .get()); EXPECT_TRUE(scroll_result.did_scroll); EXPECT_TRUE(scroll_result.did_overscroll_root); @@ -8501,7 +8540,7 @@ // Overscroll accumulates within the scope of ScrollBegin/ScrollEnd as long // as no scroll occurs. scroll_result = host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), gfx::Vector2d(0, -20), InputHandler::WHEEL) + UpdateState(gfx::Point(), gfx::Vector2d(0, -20), ScrollInputType::kWheel) .get()); EXPECT_FALSE(scroll_result.did_scroll); EXPECT_TRUE(scroll_result.did_overscroll_root); @@ -8511,7 +8550,7 @@ host_impl_->accumulated_root_overscroll()); scroll_result = host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), gfx::Vector2d(0, -20), InputHandler::WHEEL) + UpdateState(gfx::Point(), gfx::Vector2d(0, -20), ScrollInputType::kWheel) .get()); EXPECT_FALSE(scroll_result.did_scroll); EXPECT_TRUE(scroll_result.did_overscroll_root); @@ -8522,7 +8561,7 @@ // Overscroll resets on valid scroll. scroll_result = host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), gfx::Vector2d(0, 10), InputHandler::WHEEL) + UpdateState(gfx::Point(), gfx::Vector2d(0, 10), ScrollInputType::kWheel) .get()); EXPECT_TRUE(scroll_result.did_scroll); EXPECT_FALSE(scroll_result.did_overscroll_root); @@ -8532,7 +8571,7 @@ host_impl_->accumulated_root_overscroll()); scroll_result = host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), gfx::Vector2d(0, -20), InputHandler::WHEEL) + UpdateState(gfx::Point(), gfx::Vector2d(0, -20), ScrollInputType::kWheel) .get()); EXPECT_TRUE(scroll_result.did_scroll); EXPECT_TRUE(scroll_result.did_overscroll_root); @@ -8576,12 +8615,12 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), scroll_delta, - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); scroll_result = host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), scroll_delta, InputHandler::TOUCHSCREEN) + UpdateState(gfx::Point(), scroll_delta, ScrollInputType::kTouchscreen) .get()); EXPECT_EQ(host_impl_->CurrentlyScrollingNode()->id, grand_child_layer->scroll_tree_index()); @@ -8596,9 +8635,9 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(5, 5), scroll_delta, - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); EXPECT_EQ(host_impl_->CurrentlyScrollingNode()->id, child_layer->scroll_tree_index()); @@ -8608,12 +8647,12 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(5, 5), scroll_delta, - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); scroll_result = host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), scroll_delta, InputHandler::TOUCHSCREEN) + UpdateState(gfx::Point(), scroll_delta, ScrollInputType::kTouchscreen) .get()); EXPECT_TRUE(scroll_result.did_scroll); EXPECT_FALSE(scroll_result.did_overscroll_root); @@ -8628,14 +8667,14 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(5, 5), scroll_delta, - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); EXPECT_EQ(host_impl_->CurrentlyScrollingNode()->id, grand_child_layer->scroll_tree_index()); scroll_result = host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), scroll_delta, InputHandler::TOUCHSCREEN) + UpdateState(gfx::Point(), scroll_delta, ScrollInputType::kTouchscreen) .get()); EXPECT_TRUE(scroll_result.did_scroll); EXPECT_FALSE(scroll_result.did_overscroll_root); @@ -8658,22 +8697,22 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(5, 5), scroll_delta, - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); scroll_result = host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), scroll_delta, InputHandler::WHEEL).get()); + UpdateState(gfx::Point(), scroll_delta, ScrollInputType::kWheel).get()); EXPECT_TRUE(scroll_result.did_scroll); EXPECT_FALSE(scroll_result.did_overscroll_root); EXPECT_EQ(gfx::Vector2dF(), host_impl_->accumulated_root_overscroll()); scroll_result = host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), scroll_delta, InputHandler::WHEEL).get()); + UpdateState(gfx::Point(), scroll_delta, ScrollInputType::kWheel).get()); EXPECT_TRUE(scroll_result.did_scroll); EXPECT_TRUE(scroll_result.did_overscroll_root); EXPECT_EQ(gfx::Vector2dF(0, 6), host_impl_->accumulated_root_overscroll()); scroll_result = host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), scroll_delta, InputHandler::WHEEL).get()); + UpdateState(gfx::Point(), scroll_delta, ScrollInputType::kWheel).get()); EXPECT_FALSE(scroll_result.did_scroll); EXPECT_TRUE(scroll_result.did_overscroll_root); EXPECT_EQ(gfx::Vector2dF(0, 14), host_impl_->accumulated_root_overscroll()); @@ -8697,12 +8736,12 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2dF(0, 10), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); scroll_result = host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), gfx::Vector2d(0, 10), InputHandler::WHEEL) + UpdateState(gfx::Point(), gfx::Vector2d(0, 10), ScrollInputType::kWheel) .get()); EXPECT_FALSE(scroll_result.did_scroll); EXPECT_TRUE(scroll_result.did_overscroll_root); @@ -8723,12 +8762,13 @@ InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(0, 0), gfx::Vector2dF(0, 100), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); scroll_result = host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), gfx::Vector2dF(0, 100), InputHandler::WHEEL) + UpdateState(gfx::Point(), gfx::Vector2dF(0, 100), + ScrollInputType::kWheel) .get()); EXPECT_TRUE(scroll_result.did_scroll); EXPECT_FALSE(scroll_result.did_overscroll_root); @@ -8736,7 +8776,7 @@ host_impl_->accumulated_root_overscroll().ToString()); scroll_result = host_impl_->ScrollUpdate( UpdateState(gfx::Point(), gfx::Vector2dF(0, -2.30f), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get()); EXPECT_TRUE(scroll_result.did_scroll); EXPECT_FALSE(scroll_result.did_overscroll_root); @@ -8749,13 +8789,13 @@ InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(0, 0), gfx::Vector2dF(0, 20), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); scroll_result = host_impl_->ScrollUpdate( UpdateState(gfx::Point(), gfx::Vector2dF(0, 20), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); EXPECT_TRUE(scroll_result.did_scroll); EXPECT_TRUE(scroll_result.did_overscroll_root); @@ -8764,7 +8804,7 @@ scroll_result = host_impl_->ScrollUpdate( UpdateState(gfx::Point(), gfx::Vector2dF(0.02f, -0.01f), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); EXPECT_FALSE(scroll_result.did_scroll); EXPECT_FALSE(scroll_result.did_overscroll_root); @@ -8777,13 +8817,13 @@ host_impl_ ->ScrollBegin( BeginState(gfx::Point(0, 0), gfx::Vector2dF(-0.12f, 0.1f), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); scroll_result = host_impl_->ScrollUpdate( UpdateState(gfx::Point(), gfx::Vector2dF(-0.12f, 0.1f), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get()); EXPECT_FALSE(scroll_result.did_scroll); EXPECT_FALSE(scroll_result.did_overscroll_root); @@ -8811,12 +8851,12 @@ { host_impl_->ScrollBegin( BeginState(gfx::Point(0, 0), gfx::Vector2dF(100, 100), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); host_impl_->ScrollUpdate(UpdateState(gfx::Point(0, 0), gfx::Vector2dF(100, 100), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); EXPECT_VECTOR_EQ(gfx::Vector2dF(100, 100), @@ -8830,7 +8870,7 @@ { InputHandlerScrollResult result = host_impl_->ScrollUpdate( UpdateState(gfx::Point(0, 0), gfx::Vector2dF(120, 140), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); EXPECT_VECTOR_EQ(gfx::Vector2dF(200, 200), @@ -8845,7 +8885,7 @@ { InputHandlerScrollResult result = host_impl_->ScrollUpdate( UpdateState(gfx::Point(0, 0), gfx::Vector2dF(20, 40), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); EXPECT_VECTOR_EQ(gfx::Vector2dF(200, 200), @@ -8880,9 +8920,9 @@ InputHandler::SCROLL_ON_MAIN_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(0, 60), gfx::Vector2dF(0, 10), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); // Overscroll initiated inside layers will be handled by the main thread. @@ -8892,9 +8932,9 @@ InputHandler::SCROLL_ON_MAIN_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(0, 0), gfx::Vector2dF(0, 10), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); } @@ -8928,12 +8968,12 @@ { host_impl_->ScrollBegin( BeginState(gfx::Point(0, 0), gfx::Vector2dF(1000, 1000), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); host_impl_->ScrollUpdate(UpdateState(gfx::Point(0, 0), gfx::Vector2dF(1000, 1000), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); host_impl_->ScrollEnd(); @@ -8949,21 +8989,21 @@ // should not be affected. { gfx::Vector2d scroll_delta(0, 10); - host_impl_->ScrollBegin( - BeginState(gfx::Point(0, 0), scroll_delta, InputHandler::TOUCHSCREEN) - .get(), - InputHandler::TOUCHSCREEN); + host_impl_->ScrollBegin(BeginState(gfx::Point(0, 0), scroll_delta, + ScrollInputType::kTouchscreen) + .get(), + ScrollInputType::kTouchscreen); host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), scroll_delta, InputHandler::TOUCHSCREEN) + UpdateState(gfx::Point(), scroll_delta, ScrollInputType::kTouchscreen) .get()); EXPECT_EQ(0, host_impl_->active_tree()->CurrentTopControlsShownRatio()); EXPECT_VECTOR_EQ(gfx::Vector2dF(), CurrentScrollOffset(inner_scroll_layer)); host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), scroll_delta, InputHandler::TOUCHSCREEN) + UpdateState(gfx::Point(), scroll_delta, ScrollInputType::kTouchscreen) .get()); host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), scroll_delta, InputHandler::TOUCHSCREEN) + UpdateState(gfx::Point(), scroll_delta, ScrollInputType::kTouchscreen) .get()); EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 10), @@ -9007,12 +9047,12 @@ { host_impl_->ScrollBegin( BeginState(gfx::Point(0, 0), gfx::Vector2dF(200, 200), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); host_impl_->ScrollUpdate(UpdateState(gfx::Point(0, 0), gfx::Vector2dF(200, 200), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); host_impl_->ScrollEnd(); @@ -9021,12 +9061,12 @@ host_impl_->ScrollBegin( BeginState(gfx::Point(0, 0), gfx::Vector2dF(200, 200), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); host_impl_->ScrollUpdate(UpdateState(gfx::Point(0, 0), gfx::Vector2dF(200, 200), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); host_impl_->ScrollEnd(); @@ -9043,12 +9083,12 @@ { host_impl_->ScrollBegin( BeginState(gfx::Point(0, 0), gfx::Vector2dF(100, 100), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); host_impl_->ScrollUpdate(UpdateState(gfx::Point(0, 0), gfx::Vector2dF(100, 100), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); host_impl_->ScrollEnd(); @@ -9073,12 +9113,12 @@ { host_impl_->ScrollBegin( BeginState(gfx::Point(0, 0), gfx::Vector2dF(100, 100), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); host_impl_->ScrollUpdate(UpdateState(gfx::Point(0, 0), gfx::Vector2dF(100, 100), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); host_impl_->ScrollEnd(); @@ -9087,12 +9127,12 @@ host_impl_->ScrollBegin( BeginState(gfx::Point(0, 0), gfx::Vector2dF(100, 100), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); host_impl_->ScrollUpdate(UpdateState(gfx::Point(0, 0), gfx::Vector2dF(100, 100), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); host_impl_->ScrollEnd(); @@ -9141,12 +9181,12 @@ // This should fully scroll the layer. host_impl_->ScrollBegin( BeginState(gfx::Point(0, 0), gfx::Vector2dF(1000, 1000), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); host_impl_->ScrollUpdate(UpdateState(gfx::Point(0, 0), gfx::Vector2dF(1000, 1000), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); host_impl_->ScrollEnd(); @@ -9158,12 +9198,12 @@ // rather than an ancestor, we shouldn't chain to it. host_impl_->ScrollBegin( BeginState(gfx::Point(0, 0), gfx::Vector2dF(1000, 1000), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); host_impl_->ScrollUpdate(UpdateState(gfx::Point(0, 0), gfx::Vector2dF(1000, 1000), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); host_impl_->ScrollEnd(); @@ -9191,8 +9231,9 @@ page_scale_factor = 2; gfx::Point anchor(viewport_size.width() / 2, viewport_size.height() / 2); host_impl_->ScrollBegin( - BeginState(anchor, gfx::Vector2dF(), InputHandler::TOUCHSCREEN).get(), - InputHandler::TOUCHSCREEN); + BeginState(anchor, gfx::Vector2dF(), ScrollInputType::kTouchscreen) + .get(), + ScrollInputType::kTouchscreen); host_impl_->PinchGestureBegin(); host_impl_->PinchGestureUpdate(page_scale_factor, anchor); host_impl_->PinchGestureEnd(anchor, true); @@ -9201,7 +9242,7 @@ CurrentScrollOffset(inner_scroll_layer)); host_impl_->ScrollUpdate( - UpdateState(anchor, viewport_size_vec, InputHandler::TOUCHSCREEN) + UpdateState(anchor, viewport_size_vec, ScrollInputType::kTouchscreen) .get()); EXPECT_VECTOR_EQ(ScaleVector2d(viewport_size_vec, 1 / page_scale_factor), @@ -9230,12 +9271,12 @@ // scroller, it shouldn't chain up to the inner viewport yet. host_impl_->ScrollBegin( BeginState(gfx::Point(0, 0), gfx::Vector2dF(2000, 2000), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); host_impl_->ScrollUpdate(UpdateState(gfx::Point(0, 0), gfx::Vector2dF(2000, 2000), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); host_impl_->ScrollEnd(); @@ -9246,12 +9287,12 @@ // Scrolling now should chain up to the inner viewport. host_impl_->ScrollBegin( BeginState(gfx::Point(0, 0), gfx::Vector2dF(2000, 2000), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); host_impl_->ScrollUpdate(UpdateState(gfx::Point(0, 0), gfx::Vector2dF(2000, 2000), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); host_impl_->ScrollEnd(); @@ -9262,12 +9303,12 @@ // No more scrolling should be possible. host_impl_->ScrollBegin( BeginState(gfx::Point(0, 0), gfx::Vector2dF(2000, 2000), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); host_impl_->ScrollUpdate(UpdateState(gfx::Point(0, 0), gfx::Vector2dF(2000, 2000), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); host_impl_->ScrollEnd(); @@ -9298,9 +9339,9 @@ InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(0, 60), gfx::Vector2dF(0, 10), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); host_impl_->ScrollEnd(); @@ -9312,9 +9353,9 @@ InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(0, 0), gfx::Vector2dF(0, 10), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); } @@ -10753,9 +10794,9 @@ DrawFrame(); InputHandler::ScrollStatus status = host_impl_->ScrollBegin( - BeginState(gfx::Point(), gfx::Vector2dF(0, 10), InputHandler::WHEEL) + BeginState(gfx::Point(), gfx::Vector2dF(0, 10), ScrollInputType::kWheel) .get(), - InputHandler::WHEEL); + ScrollInputType::kWheel); EXPECT_EQ(InputHandler::SCROLL_UNKNOWN, status.thread); EXPECT_EQ(MainThreadScrollingReason::kFailedHitTest, status.main_thread_scrolling_reasons); @@ -10788,9 +10829,9 @@ DrawFrame(); InputHandler::ScrollStatus status = host_impl_->ScrollBegin( - BeginState(gfx::Point(), gfx::Vector2dF(0, 10), InputHandler::WHEEL) + BeginState(gfx::Point(), gfx::Vector2dF(0, 10), ScrollInputType::kWheel) .get(), - InputHandler::WHEEL); + ScrollInputType::kWheel); EXPECT_EQ(InputHandler::SCROLL_UNKNOWN, status.thread); EXPECT_EQ(MainThreadScrollingReason::kFailedHitTest, status.main_thread_scrolling_reasons); @@ -10813,9 +10854,9 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2dF(0, 10), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); EXPECT_EQ(child_scroll->scroll_tree_index(), @@ -11000,14 +11041,14 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2dF(0, 10), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); EXPECT_TRUE( host_impl_ ->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(0, 10), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()) .did_scroll); host_impl_->ScrollEnd(); @@ -11021,14 +11062,14 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2dF(0, 10), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); EXPECT_TRUE( host_impl_ ->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(0, 10), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()) .did_scroll); host_impl_->ScrollEnd(); @@ -11130,9 +11171,9 @@ InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2dF(0, offset), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); EXPECT_EQ(0, host_impl_->browser_controls_manager()->ControlsTopOffset()); EXPECT_EQ(gfx::Vector2dF().ToString(), @@ -11140,7 +11181,7 @@ result = host_impl_->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(0, offset), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); EXPECT_EQ(result.unused_scroll_delta, gfx::Vector2d(0, 0)); EXPECT_TRUE(result.did_scroll); @@ -11154,7 +11195,7 @@ offset = residue + content_scroll; result = host_impl_->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(0, offset), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); EXPECT_TRUE(result.did_scroll); EXPECT_EQ(result.unused_scroll_delta, gfx::Vector2d(0, 0)); @@ -11167,7 +11208,7 @@ offset = -content_scroll; result = host_impl_->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(0, offset), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); EXPECT_TRUE(result.did_scroll); EXPECT_EQ(result.unused_scroll_delta, gfx::Vector2d(0, 0)); @@ -11180,7 +11221,7 @@ offset = -top_controls_height_; result = host_impl_->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(0, offset), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); EXPECT_TRUE(result.did_scroll); EXPECT_EQ(result.unused_scroll_delta, gfx::Vector2d(0, 0)); @@ -11191,7 +11232,7 @@ // And attempt to scroll past the end result = host_impl_->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(0, offset), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); EXPECT_FALSE(result.did_scroll); EXPECT_EQ(result.unused_scroll_delta, gfx::Vector2d(0, -50)); @@ -11217,9 +11258,9 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2dF(0, delta), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); EXPECT_EQ(0, host_impl_->browser_controls_manager()->ControlsTopOffset()); EXPECT_VECTOR_EQ(gfx::Vector2dF(), CurrentScrollOffset(viewport_layer)); @@ -11229,7 +11270,7 @@ EXPECT_TRUE( host_impl_ ->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(0, delta), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get()) .did_scroll); EXPECT_FLOAT_EQ(0, @@ -11240,7 +11281,7 @@ EXPECT_TRUE( host_impl_ ->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(0, delta), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get()) .did_scroll); EXPECT_FLOAT_EQ(0, @@ -11265,9 +11306,9 @@ InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2dF(0, offset), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); EXPECT_EQ(0, host_impl_->browser_controls_manager()->ControlsTopOffset()); EXPECT_EQ(gfx::Vector2dF().ToString(), @@ -11277,7 +11318,7 @@ EXPECT_TRUE( host_impl_ ->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(0, offset), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()) .did_scroll); EXPECT_FLOAT_EQ(-offset, @@ -11356,9 +11397,9 @@ InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2dF(0, offset), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); EXPECT_EQ(0, host_impl_->browser_controls_manager()->ControlsTopOffset()); EXPECT_EQ(gfx::Vector2dF(0, initial_scroll_offset).ToString(), @@ -11368,7 +11409,7 @@ EXPECT_TRUE( host_impl_ ->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(0, offset), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()) .did_scroll); EXPECT_FLOAT_EQ(-offset, @@ -11434,16 +11475,16 @@ InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2dF(0, offset), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); EXPECT_EQ(0, host_impl_->browser_controls_manager()->ControlsTopOffset()); EXPECT_TRUE( host_impl_ ->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(0, offset), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()) .did_scroll); EXPECT_EQ(-offset, @@ -11454,7 +11495,7 @@ EXPECT_TRUE( host_impl_ ->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(0, offset), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()) .did_scroll); EXPECT_EQ(gfx::Vector2dF(0, offset).ToString(), @@ -11463,7 +11504,7 @@ EXPECT_TRUE( host_impl_ ->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(0, offset), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()) .did_scroll); @@ -11478,7 +11519,7 @@ host_impl_ ->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(0, overscrollamount), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()) .did_scroll); EXPECT_EQ(gfx::Vector2dF(0, 2 * offset).ToString(), @@ -11489,7 +11530,7 @@ EXPECT_TRUE(host_impl_ ->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(0, -2 * offset), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()) .did_scroll); EXPECT_EQ(gfx::Vector2dF(0, 0).ToString(), @@ -11500,7 +11541,7 @@ EXPECT_TRUE( host_impl_ ->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2d(0, -offset), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()) .did_scroll); EXPECT_EQ(gfx::Vector2dF(0, 0).ToString(), @@ -11550,12 +11591,12 @@ { host_impl_->ScrollBegin( BeginState(gfx::Point(0, 0), gfx::Vector2dF(100, 100), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); host_impl_->ScrollUpdate(UpdateState(gfx::Point(0, 0), gfx::Vector2dF(100, 100), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); host_impl_->ScrollEnd(); @@ -11625,15 +11666,15 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), scroll_delta, - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); EXPECT_TRUE(host_impl_->IsCurrentlyScrollingLayerAt(gfx::Point())); // Scroll near the edge of the outer viewport. host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), scroll_delta, InputHandler::TOUCHSCREEN) + UpdateState(gfx::Point(), scroll_delta, ScrollInputType::kTouchscreen) .get()); inner_expected += scroll_delta; EXPECT_TRUE(host_impl_->IsCurrentlyScrollingLayerAt(gfx::Point())); @@ -11646,7 +11687,7 @@ // and outer viewport layers is perfect. host_impl_->ScrollUpdate(UpdateState(gfx::Point(), gfx::ScaleVector2d(scroll_delta, 2), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); EXPECT_TRUE(host_impl_->IsCurrentlyScrollingLayerAt(gfx::Point())); outer_expected += scroll_delta; @@ -11679,9 +11720,9 @@ InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->RootScrollBegin(BeginState(gfx::Point(), gfx::Vector2dF(0, 10), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); EXPECT_EQ(host_impl_->CurrentlyScrollingNode(), host_impl_->OuterViewportScrollNode()); @@ -11689,9 +11730,9 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2dF(0, 10), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); EXPECT_EQ(host_impl_->CurrentlyScrollingNode()->id, child_scroll->scroll_tree_index()); @@ -11718,13 +11759,13 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2dF(0, 100), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); scroll_result = host_impl_->ScrollUpdate(UpdateState(gfx::Point(), gfx::Vector2dF(0, 100), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get()); EXPECT_VECTOR_EQ(gfx::Vector2dF(), CurrentScrollOffset(inner_scroll)); @@ -12102,9 +12143,9 @@ ASSERT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2d(0, 50), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); host_impl_->ScrollUpdate( AnimatedUpdateState(gfx::Point(), gfx::Vector2d(0, 50)).get()); @@ -12140,9 +12181,9 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2d(0, 50), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); host_impl_->ScrollUpdate( AnimatedUpdateState(gfx::Point(), gfx::Vector2d(0, 50)).get()); @@ -12242,8 +12283,8 @@ { gfx::Point position(40, 40); auto begin_state = - BeginState(position, gfx::Vector2d(0, 50), InputHandler::WHEEL); - host_impl_->ScrollBegin(begin_state.get(), InputHandler::WHEEL); + BeginState(position, gfx::Vector2d(0, 50), ScrollInputType::kWheel); + host_impl_->ScrollBegin(begin_state.get(), ScrollInputType::kWheel); auto update_state = AnimatedUpdateState(position, gfx::Vector2d(0, 50)); host_impl_->ScrollUpdate(update_state.get()); EXPECT_EQ(outer_scroll->scroll_tree_index(), @@ -12288,8 +12329,8 @@ { gfx::Point position(10, 10); auto begin_state = - BeginState(position, gfx::Vector2d(0, 50), InputHandler::WHEEL); - host_impl_->ScrollBegin(begin_state.get(), InputHandler::WHEEL); + BeginState(position, gfx::Vector2d(0, 50), ScrollInputType::kWheel); + host_impl_->ScrollBegin(begin_state.get(), ScrollInputType::kWheel); EXPECT_EQ(outer_scroll->scroll_tree_index(), host_impl_->CurrentlyScrollingNode()->id); } @@ -12347,9 +12388,9 @@ InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(10, 10), gfx::Vector2d(0, 10), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); host_impl_->ScrollUpdate( AnimatedUpdateState(gfx::Point(10, 10), gfx::Vector2d(0, 10)).get()); @@ -12425,10 +12466,10 @@ scrollbar->SetOffsetToTransformParent(gfx::Vector2dF(345, 0)); // Set up the scroll node and other state required for scrolling. - host_impl_->ScrollBegin( - BeginState(gfx::Point(350, 18), gfx::Vector2dF(), InputHandler::SCROLLBAR) - .get(), - InputHandler::SCROLLBAR); + host_impl_->ScrollBegin(BeginState(gfx::Point(350, 18), gfx::Vector2dF(), + ScrollInputType::kScrollbar) + .get(), + ScrollInputType::kScrollbar); TestInputHandlerClient input_handler_client; host_impl_->BindToClient(&input_handler_client); @@ -12512,10 +12553,10 @@ begin_frame_args.frame_time = base::TimeTicks::Now(); begin_frame_args.frame_id.sequence_number++; host_impl_->WillBeginImplFrame(begin_frame_args); - host_impl_->ScrollBegin( - BeginState(gfx::Point(350, 18), gfx::Vector2dF(), InputHandler::SCROLLBAR) - .get(), - InputHandler::SCROLLBAR); + host_impl_->ScrollBegin(BeginState(gfx::Point(350, 18), gfx::Vector2dF(), + ScrollInputType::kScrollbar) + .get(), + ScrollInputType::kScrollbar); EXPECT_TRUE(host_impl_->CurrentlyScrollingNode()); // The PointerMove(s) that follow should be handled and are expected to have a @@ -12615,10 +12656,10 @@ scrollbar->SetOffsetToTransformParent(gfx::Vector2dF(345, 0)); - host_impl_->ScrollBegin( - BeginState(gfx::Point(350, 18), gfx::Vector2dF(), InputHandler::SCROLLBAR) - .get(), - InputHandler::SCROLLBAR); + host_impl_->ScrollBegin(BeginState(gfx::Point(350, 18), gfx::Vector2dF(), + ScrollInputType::kScrollbar) + .get(), + ScrollInputType::kScrollbar); TestInputHandlerClient input_handler_client; host_impl_->BindToClient(&input_handler_client); @@ -12677,9 +12718,9 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2dF(0, 10), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); host_impl_->ScrollEnd(); @@ -12688,9 +12729,9 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2dF(0, 10), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); } @@ -12717,9 +12758,9 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2d(0, 50), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); host_impl_->ScrollUpdate( AnimatedUpdateState(gfx::Point(), gfx::Vector2d(0, 50)).get()); @@ -12770,9 +12811,9 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2d(0, 100), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); host_impl_->ScrollUpdate( AnimatedUpdateState(gfx::Point(), gfx::Vector2d(0, 100)).get(), @@ -12836,9 +12877,9 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2d(0, 50), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); host_impl_->ScrollUpdate( AnimatedUpdateState(gfx::Point(), gfx::Vector2d(0, 50)).get()); @@ -12873,16 +12914,16 @@ // Perform instant scroll. // Use "precise pixel" granularity to avoid animating. - auto begin_state = - BeginState(gfx::Point(0, y), gfx::Vector2dF(0, 50), InputHandler::WHEEL); + auto begin_state = BeginState(gfx::Point(0, y), gfx::Vector2dF(0, 50), + ScrollInputType::kWheel); begin_state->data()->delta_granularity = ui::ScrollGranularity::kScrollByPrecisePixel; - EXPECT_EQ( - InputHandler::SCROLL_ON_IMPL_THREAD, - host_impl_->ScrollBegin(begin_state.get(), InputHandler::WHEEL).thread); + EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, + host_impl_->ScrollBegin(begin_state.get(), ScrollInputType::kWheel) + .thread); EXPECT_TRUE(host_impl_->IsCurrentlyScrollingLayerAt(gfx::Point(0, y))); - auto update_state = - UpdateState(gfx::Point(0, y), gfx::Vector2d(0, 50), InputHandler::WHEEL); + auto update_state = UpdateState(gfx::Point(0, y), gfx::Vector2d(0, 50), + ScrollInputType::kWheel); // Use "precise pixel" granularity to avoid animating. update_state->data()->delta_granularity = ui::ScrollGranularity::kScrollByPrecisePixel; @@ -12919,9 +12960,9 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2d(0, 50), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); host_impl_->ScrollUpdate( AnimatedUpdateState(gfx::Point(), gfx::Vector2d(0, 50)).get()); @@ -13009,9 +13050,9 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2d(10, 20), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); host_impl_->ScrollUpdate( AnimatedUpdateState(gfx::Point(), gfx::Vector2d(10, 20)).get()); @@ -13105,9 +13146,9 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2d(90, 90), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); host_impl_->ScrollUpdate( AnimatedUpdateState(gfx::Point(), gfx::Vector2d(90, 90)).get()); @@ -13169,9 +13210,9 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2d(50, 50), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); host_impl_->ScrollUpdate( AnimatedUpdateState(gfx::Point(), gfx::Vector2d(50, 50)).get()); @@ -13254,9 +13295,9 @@ viz::CreateBeginFrameArgsForTesting(BEGINFRAME_FROM_HERE, 0, 1); host_impl_->ScrollBegin( - BeginState(gfx::Point(), gfx::Vector2d(500, 500), InputHandler::WHEEL) + BeginState(gfx::Point(), gfx::Vector2d(500, 500), ScrollInputType::kWheel) .get(), - InputHandler::WHEEL); + ScrollInputType::kWheel); host_impl_->ScrollUpdate( AnimatedUpdateState(gfx::Point(), gfx::Vector2d(500, 500)).get()); @@ -13371,10 +13412,10 @@ SetScrollOffsetDelta(scroll_layer, gfx::Vector2d()); float page_scale_delta = 2; - host_impl_->ScrollBegin( - BeginState(gfx::Point(), gfx::Vector2dF(), InputHandler::TOUCHSCREEN) - .get(), - InputHandler::TOUCHSCREEN); + host_impl_->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2dF(), + ScrollInputType::kTouchscreen) + .get(), + ScrollInputType::kTouchscreen); host_impl_->PinchGestureBegin(); host_impl_->PinchGestureUpdate(page_scale_delta, gfx::Point()); host_impl_->PinchGestureEnd(gfx::Point(), true); @@ -13384,14 +13425,14 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), scroll_delta, - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); EXPECT_VECTOR_EQ(gfx::Vector2dF(), CurrentScrollOffset(scroll_layer)); host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), scroll_delta, InputHandler::WHEEL).get()); + UpdateState(gfx::Point(), scroll_delta, ScrollInputType::kWheel).get()); host_impl_->ScrollEnd(); EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 2.5), CurrentScrollOffset(scroll_layer)); } @@ -14452,12 +14493,12 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2dF(0, 10), - InputHandler::WHEEL) + ScrollInputType::kWheel) .get(), - InputHandler::WHEEL) + ScrollInputType::kWheel) .thread); host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), gfx::Vector2d(0, 10), InputHandler::WHEEL) + UpdateState(gfx::Point(), gfx::Vector2d(0, 10), ScrollInputType::kWheel) .get()); { RenderFrameMetadata metadata = StartDrawAndProduceRenderFrameMetadata(); @@ -14520,9 +14561,9 @@ // Page scale should update metadata correctly (shrinking only the viewport). host_impl_->ScrollBegin( - BeginState(gfx::Point(), gfx::Vector2dF(), InputHandler::TOUCHSCREEN) + BeginState(gfx::Point(), gfx::Vector2dF(), ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); host_impl_->PinchGestureBegin(); host_impl_->PinchGestureUpdate(2, gfx::Point()); host_impl_->PinchGestureEnd(gfx::Point(), true); @@ -14675,13 +14716,13 @@ for (auto& test_leg : test_legs) { // If the test leg contains a scroll, perform it. if (!test_leg.scroll_delta.IsZero()) { - host_impl_->ScrollBegin( - BeginState(gfx::Point(), test_leg.scroll_delta, InputHandler::WHEEL) - .get(), - InputHandler::WHEEL); - host_impl_->ScrollUpdate( - UpdateState(gfx::Point(), test_leg.scroll_delta, InputHandler::WHEEL) - .get()); + host_impl_->ScrollBegin(BeginState(gfx::Point(), test_leg.scroll_delta, + ScrollInputType::kWheel) + .get(), + ScrollInputType::kWheel); + host_impl_->ScrollUpdate(UpdateState(gfx::Point(), test_leg.scroll_delta, + ScrollInputType::kWheel) + .get()); } // Trigger draw. @@ -14713,9 +14754,9 @@ EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, host_impl_ ->ScrollBegin(BeginState(gfx::Point(), gfx::Vector2dF(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .thread); ScrollNode* scroll_node = scroll_tree.CurrentlyScrollingNode(); @@ -15139,9 +15180,9 @@ // scrollbar should not be hit. InputHandler::ScrollStatus status = host_impl_->ScrollBegin( BeginState(gfx::Point(350, 50), gfx::Vector2dF(0, 10), - InputHandler::TOUCHSCREEN) + ScrollInputType::kTouchscreen) .get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, status.thread); }
diff --git a/cc/trees/layer_tree_host_unittest_scroll.cc b/cc/trees/layer_tree_host_unittest_scroll.cc index 52bb401..80fc33f53 100644 --- a/cc/trees/layer_tree_host_unittest_scroll.cc +++ b/cc/trees/layer_tree_host_unittest_scroll.cc
@@ -14,6 +14,7 @@ #include "cc/base/completion_event.h" #include "cc/input/main_thread_scrolling_reason.h" #include "cc/input/scroll_elasticity_helper.h" +#include "cc/input/scroll_input_type.h" #include "cc/layers/layer.h" #include "cc/layers/layer_impl.h" #include "cc/layers/picture_layer.h" @@ -685,7 +686,7 @@ gfx::PointF(-0.5f, -0.5f) + GetTransformNode(expected_scroll_layer_impl)->post_translation); InputHandler::ScrollStatus status = impl->ScrollBegin( - BeginState(scroll_point).get(), InputHandler::TOUCHSCREEN); + BeginState(scroll_point).get(), ScrollInputType::kTouchscreen); EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, status.thread); impl->ScrollUpdate(UpdateState(gfx::Point(), scroll_amount_).get()); auto* scrolling_node = impl->CurrentlyScrollingNode(); @@ -708,7 +709,7 @@ gfx::PointF(0.5f, 0.5f) + GetTransformNode(expected_scroll_layer_impl)->post_translation); InputHandler::ScrollStatus status = impl->ScrollBegin( - BeginState(scroll_point).get(), InputHandler::WHEEL); + BeginState(scroll_point).get(), ScrollInputType::kWheel); EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, status.thread); impl->ScrollUpdate(UpdateState(gfx::Point(), scroll_amount_).get()); impl->ScrollEnd(); @@ -1068,7 +1069,7 @@ std::unique_ptr<ScrollState> begin_scroll_state( new ScrollState(begin_scroll_state_data)); auto scroll_status = host_impl->ScrollBegin(begin_scroll_state.get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, scroll_status.thread); auto* scrolling_node = host_impl->CurrentlyScrollingNode(); EXPECT_TRUE(scrolling_node); @@ -1452,13 +1453,13 @@ // checking whether the screen space point is inside the non-fast // scrollable region. InputHandler::ScrollStatus status = impl->ScrollBegin( - BeginState(gfx::Point(0, 0)).get(), InputHandler::TOUCHSCREEN); + BeginState(gfx::Point(0, 0)).get(), ScrollInputType::kTouchscreen); EXPECT_EQ(InputHandler::SCROLL_ON_MAIN_THREAD, status.thread); EXPECT_EQ(MainThreadScrollingReason::kNonFastScrollableRegion, status.main_thread_scrolling_reasons); status = impl->ScrollBegin(BeginState(gfx::Point(21, 21)).get(), - InputHandler::TOUCHSCREEN); + ScrollInputType::kTouchscreen); EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, status.thread); EXPECT_EQ(MainThreadScrollingReason::kNotScrollingOnMain, status.main_thread_scrolling_reasons); @@ -2461,7 +2462,7 @@ // The top-left hit should immediately hit the top layer's non-fast region // which forces main-thread scrolling. auto top_left_status = impl->ScrollBegin( - BeginState(gfx::Point(20, 20)).get(), InputHandler::TOUCHSCREEN); + BeginState(gfx::Point(20, 20)).get(), ScrollInputType::kTouchscreen); EXPECT_EQ(InputHandler::SCROLL_ON_MAIN_THREAD, top_left_status.thread); EXPECT_EQ(MainThreadScrollingReason::kNonFastScrollableRegion, top_left_status.main_thread_scrolling_reasons); @@ -2469,7 +2470,7 @@ // The top-right hit should hit the top layer but not the non-fast region so // the scroll should continue to scroll on the impl. InputHandler::ScrollStatus top_right_status = impl->ScrollBegin( - BeginState(gfx::Point(80, 20)).get(), InputHandler::TOUCHSCREEN); + BeginState(gfx::Point(80, 20)).get(), ScrollInputType::kTouchscreen); EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, top_right_status.thread); EXPECT_EQ(MainThreadScrollingReason::kNotScrollingOnMain, top_right_status.main_thread_scrolling_reasons); @@ -2480,7 +2481,7 @@ // a fast scroll because an ancestor on the scroll chain has hit a non-fast // region. InputHandler::ScrollStatus bottom_right_status = impl->ScrollBegin( - BeginState(gfx::Point(80, 80)).get(), InputHandler::TOUCHSCREEN); + BeginState(gfx::Point(80, 80)).get(), ScrollInputType::kTouchscreen); EXPECT_EQ(InputHandler::SCROLL_ON_MAIN_THREAD, bottom_right_status.thread); EXPECT_EQ(MainThreadScrollingReason::kNonFastScrollableRegion, bottom_right_status.main_thread_scrolling_reasons);
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn index 8a399e3..71a9e6e 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn
@@ -2692,7 +2692,6 @@ "java/src/org/chromium/chrome/browser/feedback/ScreenshotTask.java", "java/src/org/chromium/chrome/browser/feedback/SystemInfoFeedbackSource.java", "java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java", - "java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java", "java/src/org/chromium/chrome/browser/flags/ChromeSessionState.java", "java/src/org/chromium/chrome/browser/gesturenav/CompositorNavigationGlow.java", "java/src/org/chromium/chrome/browser/history/BrowsingHistoryBridge.java",
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni index 11d30f2..f461563 100644 --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni
@@ -745,7 +745,6 @@ "java/src/org/chromium/chrome/browser/firstrun/TabbedModeFirstRunActivity.java", "java/src/org/chromium/chrome/browser/firstrun/ToSAckedReceiver.java", "java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java", - "java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java", "java/src/org/chromium/chrome/browser/flags/ChromeSessionState.java", "java/src/org/chromium/chrome/browser/fullscreen/BrowserStateBrowserControlsVisibilityDelegate.java", "java/src/org/chromium/chrome/browser/fullscreen/ChromeFullscreenManager.java", @@ -1565,7 +1564,6 @@ "java/src/org/chromium/chrome/browser/sync/ui/PassphraseTypeDialogFragment.java", "java/src/org/chromium/chrome/browser/tab/AccessibilityVisibilityHandler.java", "java/src/org/chromium/chrome/browser/tab/AuthenticatorNavigationInterceptor.java", - "java/src/org/chromium/chrome/browser/tab/ChildBackgroundTabShowObserver.java", "java/src/org/chromium/chrome/browser/tab/EmptyTabObserver.java", "java/src/org/chromium/chrome/browser/tab/InterceptNavigationDelegateImpl.java", "java/src/org/chromium/chrome/browser/tab/SadTab.java",
diff --git a/chrome/android/chrome_junit_test_java_sources.gni b/chrome/android/chrome_junit_test_java_sources.gni index a238958..ca12389 100644 --- a/chrome/android/chrome_junit_test_java_sources.gni +++ b/chrome/android/chrome_junit_test_java_sources.gni
@@ -77,8 +77,6 @@ "junit/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencerTest.java", "junit/src/org/chromium/chrome/browser/firstrun/FirstRunIntegrationUnitTest.java", "junit/src/org/chromium/chrome/browser/firstrun/ToSAckedReceiverTest.java", - "junit/src/org/chromium/chrome/browser/flags/CachedFeatureFlagsAnnotationUnitTest.java", - "junit/src/org/chromium/chrome/browser/flags/CachedFeatureFlagsUnitTest.java", "junit/src/org/chromium/chrome/browser/fullscreen/BrowserStateBrowserControlsVisibilityDelegateTest.java", "junit/src/org/chromium/chrome/browser/gcore/GoogleApiClientHelperTest.java", "junit/src/org/chromium/chrome/browser/gsa/GSAStateUnitTest.java",
diff --git a/chrome/android/features/cablev2_authenticator/config.gni b/chrome/android/features/cablev2_authenticator/config.gni index 1868223..3e91dd8 100644 --- a/chrome/android/features/cablev2_authenticator/config.gni +++ b/chrome/android/features/cablev2_authenticator/config.gni
@@ -5,6 +5,5 @@ import("//build/config/android/channel.gni") declare_args() { - enable_android_cablev2_authenticator = - android_channel == "default" || android_channel == "canary" + enable_android_cablev2_authenticator = false }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java index c8d8e2a..fbc42e6b 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
@@ -589,9 +589,6 @@ if (mTabModelsInitialized) return; mTabModelSelector = createTabModelSelector(); - mTabModelSelectorSupplier.set(mTabModelSelector); - mActivityTabProvider.setTabModelSelector(mTabModelSelector); - getStatusBarColorController().setTabModelSelector(mTabModelSelector); if (mTabModelSelector == null) { assert isFinishing(); @@ -599,6 +596,10 @@ return; } + mTabModelSelectorSupplier.set(mTabModelSelector); + mActivityTabProvider.setTabModelSelector(mTabModelSelector); + getStatusBarColorController().setTabModelSelector(mTabModelSelector); + Pair<? extends TabCreator, ? extends TabCreator> tabCreators = createTabCreators(); mRegularTabCreator = tabCreators.first; mIncognitoTabCreator = tabCreators.second;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/send_tab_to_self/DevicePickerBottomSheetContent.java b/chrome/android/java/src/org/chromium/chrome/browser/send_tab_to_self/DevicePickerBottomSheetContent.java index a7e1f7c..2faa469 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/send_tab_to_self/DevicePickerBottomSheetContent.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/send_tab_to_self/DevicePickerBottomSheetContent.java
@@ -16,6 +16,7 @@ import org.chromium.base.ContextUtils; import org.chromium.base.metrics.RecordHistogram; +import org.chromium.base.metrics.RecordUserAction; import org.chromium.chrome.R; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.send_tab_to_self.SendTabToSelfMetrics.SendTabToSelfShareClickResult; @@ -79,11 +80,13 @@ SendTabToSelfAndroidBridgeJni.get().getAllTargetDeviceInfos(mProfile, targetDeviceList); if (!AndroidSyncSettings.get().isChromeSyncEnabled()) { + RecordUserAction.record("SharingHubAndroid.SendTabToSelf.NotSyncing"); mContentView = (ViewGroup) LayoutInflater.from(mContext).inflate( R.layout.send_tab_to_self_feature_unavailable_prompt, null); mToolbarView.setVisibility(View.GONE); enableSettingsButton(); } else if (targetDeviceList.isEmpty()) { + RecordUserAction.record("SharingHubAndroid.SendTabToSelf.NoTargetDevices"); mContentView = (ViewGroup) LayoutInflater.from(mContext).inflate( R.layout.send_tab_to_self_feature_unavailable_prompt, null); mToolbarView.setVisibility(View.GONE); @@ -103,6 +106,7 @@ ButtonCompat chromeSettingsButton = mContentView.findViewById(R.id.chrome_settings); chromeSettingsButton.setVisibility(View.VISIBLE); chromeSettingsButton.setOnClickListener(view -> { + RecordUserAction.record("SharingHubAndroid.SendTabToSelf.ChromeSettingsClicked"); SettingsLauncher.getInstance().launchSettingsPage(ContextUtils.getApplicationContext()); }); }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareSheetBottomSheetContent.java b/chrome/android/java/src/org/chromium/chrome/browser/share/ShareSheetBottomSheetContent.java index a2a73b6..a0ccfe113 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareSheetBottomSheetContent.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/share/ShareSheetBottomSheetContent.java
@@ -19,6 +19,7 @@ import org.chromium.base.ApiCompatibilityUtils; import org.chromium.base.ContextUtils; +import org.chromium.base.metrics.RecordUserAction; import org.chromium.chrome.R; import org.chromium.chrome.browser.widget.bottomsheet.BottomSheetContent; import org.chromium.ui.modelutil.LayoutViewBuilder; @@ -64,10 +65,14 @@ */ public void createRecyclerViews( ArrayList<PropertyModel> topRowModels, ArrayList<PropertyModel> bottomRowModels) { - populateView( - topRowModels, this.getContentView().findViewById(R.id.share_sheet_chrome_apps)); + RecyclerView topRow = this.getContentView().findViewById(R.id.share_sheet_chrome_apps); + populateView(topRowModels, topRow); + topRow.addOnScrollListener(new ScrollEventReporter("SharingHubAndroid.TopRowScrolled")); + RecyclerView bottomRow = this.getContentView().findViewById(R.id.share_sheet_other_apps); populateView( bottomRowModels, this.getContentView().findViewById(R.id.share_sheet_other_apps)); + bottomRow.addOnScrollListener( + new ScrollEventReporter("SharingHubAndroid.BottomRowScrolled")); } private void populateView(ArrayList<PropertyModel> models, RecyclerView view) { @@ -103,6 +108,27 @@ } } + /** + * One-shot reporter that records the first time the user scrolls a {@link RecyclerView}. + */ + private static class ScrollEventReporter extends RecyclerView.OnScrollListener { + private boolean mFired; + private String mActionName; + + public ScrollEventReporter(String actionName) { + mActionName = actionName; + } + + @Override + public void onScrollStateChanged(RecyclerView recyclerView, int newState) { + if (mFired) return; + if (newState != RecyclerView.SCROLL_STATE_DRAGGING) return; + + RecordUserAction.record(mActionName); + mFired = true; + } + } + @Override public View getContentView() { return mContentView;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareSheetPropertyModelBuilder.java b/chrome/android/java/src/org/chromium/chrome/browser/share/ShareSheetPropertyModelBuilder.java index 0dc9ec88..66be45a 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareSheetPropertyModelBuilder.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/share/ShareSheetPropertyModelBuilder.java
@@ -13,6 +13,7 @@ import android.graphics.drawable.Drawable; import android.view.View.OnClickListener; +import org.chromium.base.metrics.RecordHistogram; import org.chromium.base.metrics.RecordUserAction; import org.chromium.chrome.browser.widget.bottomsheet.BottomSheetController; import org.chromium.ui.modelutil.PropertyModel; @@ -30,6 +31,7 @@ class ShareSheetPropertyModelBuilder { private final BottomSheetController mBottomSheetController; private final PackageManager mPackageManager; + private static final int MAX_NUM_APPS = 8; ShareSheetPropertyModelBuilder( BottomSheetController bottomSheetController, PackageManager packageManager) { @@ -50,12 +52,16 @@ } ArrayList<PropertyModel> models = new ArrayList<>(); - for (int i = 0; i < 7 && i < thirdPartyActivities.size(); ++i) { + for (int i = 0; i < MAX_NUM_APPS && i < thirdPartyActivities.size(); ++i) { ResolveInfo info = thirdPartyActivities.get(i); + final int logIndex = i; PropertyModel propertyModel = createPropertyModel(ShareHelper.loadIconForResolveInfo(info, mPackageManager), (String) info.loadLabel(mPackageManager), (shareParams) -> { RecordUserAction.record("SharingHubAndroid.ThirdPartyAppSelected"); + RecordHistogram.recordEnumeratedHistogram( + "Sharing.SharingHubAndroid.ThirdPartyAppUsage", logIndex, + MAX_NUM_APPS + 1); ActivityInfo ai = info.activityInfo; ComponentName component =
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/ChildBackgroundTabShowObserver.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/ChildBackgroundTabShowObserver.java deleted file mode 100644 index 7fa1a36..0000000 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/ChildBackgroundTabShowObserver.java +++ /dev/null
@@ -1,69 +0,0 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -package org.chromium.chrome.browser.tab; - -import org.chromium.base.metrics.RecordHistogram; - -import java.util.ArrayList; - -/** - * Observes background tabs opened from the tab with {@link #mParentId}. Records to UMA which of the - * background tabs the user switches to first. - */ -class ChildBackgroundTabShowObserver extends EmptyTabObserver { - /** - * The ID of the parent tab of the background tabs. - */ - private int mParentTabId; - - /** - * List of tabs opened from {@link #mParentId} sorted according to their - * creation order. The oldest tab is at index 0. - */ - private final ArrayList<Tab> mTabCreationOrder = new ArrayList<Tab>(); - - /** - * Creates an instance of {@link ChildBackgroundTabShowObserver}. - * @param parentTabId The id of the parent tab of the background tabs. - */ - public ChildBackgroundTabShowObserver(int parentTabId) { - mParentTabId = parentTabId; - } - - /** - * Called when a background tab is opened from {@link #mParentId}. - * @param tab The background tab which was opened. - */ - public void onBackgroundTabOpened(Tab tab) { - assert mParentTabId == tab.getParentId(); - - mTabCreationOrder.add(tab); - tab.addObserver(this); - } - - @Override - public void onShown(Tab tab, @TabSelectionType int type) { - int rank = mTabCreationOrder.indexOf(tab); - int reverseRank = mTabCreationOrder.size() - rank - 1; - - // Record which tab the user switches to first by recording the creation order of the tab - // that the user switches to. Record both the "Creation Rank" and the - // "Reverse Creation Rank" because we want to know whether most users switch to the - // newest background tab or oldest background tab first. - RecordHistogram.recordCount100Histogram("Tabs.FirstSwitchedToForegroundCreationRank", rank); - RecordHistogram.recordCount100Histogram( - "Tabs.FirstSwitchedToForegroundCreationReverseRank", reverseRank); - - for (Tab stopObservingTab : mTabCreationOrder) { - stopObservingTab.removeObserver(this); - } - mTabCreationOrder.clear(); - } - - @Override - public void onDestroyed(Tab tab) { - mTabCreationOrder.remove(tab); - } -}
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabUma.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabUma.java index 2759b3d5..550e8ea 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabUma.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabUma.java
@@ -10,7 +10,6 @@ import org.chromium.base.UserData; import org.chromium.base.metrics.RecordHistogram; import org.chromium.chrome.browser.tabmodel.EmptyTabModelSelectorObserver; -import org.chromium.chrome.browser.tabmodel.TabModel; import org.chromium.chrome.browser.tabmodel.TabModelSelector; import org.chromium.chrome.browser.tabmodel.TabModelSelectorObserver; import org.chromium.net.NetError; @@ -32,12 +31,6 @@ static final int TAB_STATUS_LAZY_LOAD_FOR_BG_TAB = 8; static final int TAB_STATUS_LIM = 9; - // TabBackgroundLoadStatus defined in tools/metrics/histograms/histograms.xml. - static final int TAB_BACKGROUND_LOAD_SHOWN = 0; - static final int TAB_BACKGROUND_LOAD_LOST = 1; - static final int TAB_BACKGROUND_LOAD_SKIPPED = 2; - static final int TAB_BACKGROUND_LOAD_LIM = 3; - // The enum values for the Tab.RestoreResult histogram. The unusual order is to // keep compatibility with the previous instance of the histogram that was using // a boolean. @@ -75,23 +68,15 @@ // "Open in a new tab" from the context menu. private int mNumBackgroundTabsOpened; - // Records histogram about which background tab opened from this tab the user switches to - // first. - private ChildBackgroundTabShowObserver mChildBackgroundTabShowObserver; - private TabModelSelectorObserver mNewTabObserver; static TabUma create(Tab tab, @TabCreationState int creationState) { - TabUma tabUma = get(tab); + TabUma tabUma = tab.getUserDataHost().getUserData(USER_DATA_KEY); if (tabUma != null) tabUma.removeObservers(tab); return tab.getUserDataHost().setUserData(USER_DATA_KEY, new TabUma(tab, creationState)); } - private static TabUma get(Tab tab) { - return tab.getUserDataHost().getUserData(USER_DATA_KEY); - } - /** * Constructs a new UMA tracker for a specific tab. * @param Tab The Tab being monitored for stats. @@ -155,14 +140,6 @@ * @param delta Time elapsed from the last state transition in milliseconds. */ private void recordTabStateTransition(int prevState, int newState, long delta) { - if (prevState == TAB_STATE_ACTIVE && newState == TAB_STATE_INACTIVE) { - RecordHistogram.recordLongTimesHistogram100( - "Tabs.StateTransfer.Time_Active_Inactive", delta); - } else if (prevState == TAB_STATE_ACTIVE && newState == TAB_STATE_CLOSED) { - RecordHistogram.recordLongTimesHistogram100( - "Tabs.StateTransfer.Time_Active_Closed", delta); - } - if (prevState == TAB_STATE_INITIAL) { RecordHistogram.recordEnumeratedHistogram("Tabs.StateTransfer.Target_Initial", newState, TAB_STATE_MAX); @@ -185,7 +162,6 @@ "Tab.BackgroundTabsOpenedViaContextMenuCount", mNumBackgroundTabsOpened); } mNumBackgroundTabsOpened = 0; - mChildBackgroundTabShowObserver = null; } /** @@ -202,25 +178,8 @@ mLastTabState = newState; } - /** - * @return The most recently used rank for this tab in the given TabModel. - */ - private static int computeMRURank(Tab tab, TabModel model) { - final long tabLastShow = get(tab).getLastShownTimestamp(); - int mruRank = 0; - for (int i = 0; i < model.getCount(); i++) { - Tab otherTab = model.getTabAt(i); - if (otherTab != tab && TabUma.get(otherTab) != null - && TabUma.get(otherTab).getLastShownTimestamp() > tabLastShow) { - mruRank++; - } - } - return mruRank; - } - @Override public void onShown(Tab tab, @TabSelectionType int selectionType) { - int rank = computeMRURank(tab, TabModelSelector.from(tab).getModel(tab.isIncognito())); long previousTimestampMillis = tab.getTimestampMillis(); long now = SystemClock.elapsedRealtime(); @@ -230,7 +189,6 @@ if (mLastShownTimestamp != -1 && selectionType == TabSelectionType.FROM_USER) { long age = now - mLastShownTimestamp; RecordHistogram.recordCountHistogram("Tab.SwitchedToForegroundAge", (int) age); - RecordHistogram.recordCountHistogram("Tab.SwitchedToForegroundMRURank", rank); } increaseTabShowCount(); @@ -269,27 +227,6 @@ } if (mLastShownTimestamp == -1) { - // Record Tab.BackgroundLoadStatus. - if (mTabCreationState == TabCreationState.LIVE_IN_BACKGROUND) { - if (mRestoreStartedAtMillis == -1) { - RecordHistogram.recordEnumeratedHistogram("Tab.BackgroundLoadStatus", - TAB_BACKGROUND_LOAD_SHOWN, TAB_BACKGROUND_LOAD_LIM); - } else { - RecordHistogram.recordEnumeratedHistogram("Tab.BackgroundLoadStatus", - TAB_BACKGROUND_LOAD_LOST, TAB_BACKGROUND_LOAD_LIM); - - if (previousTimestampMillis > 0) { - RecordHistogram.recordMediumTimesHistogram( - "Tab.LostTabAgeWhenSwitchedToForeground", - System.currentTimeMillis() - previousTimestampMillis); - } - } - } else if (mTabCreationState == TabCreationState.FROZEN_FOR_LAZY_LOAD) { - assert mRestoreStartedAtMillis == -1; - RecordHistogram.recordEnumeratedHistogram("Tab.BackgroundLoadStatus", - TAB_BACKGROUND_LOAD_SKIPPED, TAB_BACKGROUND_LOAD_LIM); - } - // Register the observer for context menu-triggering event here to avoid the case // where this is created too early and we start missing out on metrics suddenly. mNewTabObserver = new EmptyTabModelSelectorObserver() { @@ -297,7 +234,7 @@ public void onNewTabCreated(Tab newTab, @TabCreationState int creationState) { if (newTab.getParentId() == tab.getId() && newTab.getLaunchType() == TabLaunchType.FROM_LONGPRESS_BACKGROUND) { - onBackgroundTabOpenedFromContextMenu(newTab); + ++mNumBackgroundTabsOpened; } } }; @@ -307,14 +244,18 @@ // Record "tab age upon first display" metrics. previousTimestampMillis is persisted through // cold starts. if (mLastShownTimestamp == -1 && previousTimestampMillis > 0) { + long duration = System.currentTimeMillis() - previousTimestampMillis; + if (mTabCreationState == TabCreationState.LIVE_IN_BACKGROUND + && mRestoreStartedAtMillis != -1) { + RecordHistogram.recordMediumTimesHistogram( + "Tab.LostTabAgeWhenSwitchedToForeground", duration); + } if (isOnBrowserStartup) { RecordHistogram.recordCountHistogram("Tabs.ForegroundTabAgeAtStartup", - (int) ((System.currentTimeMillis() - previousTimestampMillis) - / DateUtils.MINUTE_IN_MILLIS)); + (int) (duration / DateUtils.MINUTE_IN_MILLIS)); } else if (selectionType == TabSelectionType.FROM_USER) { RecordHistogram.recordCountHistogram("Tab.AgeUponRestoreFromColdStart", - (int) ((System.currentTimeMillis() - previousTimestampMillis) - / DateUtils.MINUTE_IN_MILLIS)); + (int) (duration / DateUtils.MINUTE_IN_MILLIS)); } } @@ -399,28 +340,6 @@ } } - /** - * Called when a user opens a background tab by long pressing and selecting "Open in a new tab" - * from the context menu. - * @param backgroundTab The background tab. - */ - private void onBackgroundTabOpenedFromContextMenu(Tab backgroundTab) { - ++mNumBackgroundTabsOpened; - - if (mChildBackgroundTabShowObserver == null) { - mChildBackgroundTabShowObserver = - new ChildBackgroundTabShowObserver(backgroundTab.getParentId()); - } - mChildBackgroundTabShowObserver.onBackgroundTabOpened(backgroundTab); - } - - /** - * @return The timestamp for when this tab was last shown. - */ - private long getLastShownTimestamp() { - return mLastShownTimestamp; - } - private static void increaseTabShowCount() { sAllTabsShowCount++; }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/vr/ArImmersiveOverlay.java b/chrome/android/java/src/org/chromium/chrome/browser/vr/ArImmersiveOverlay.java index 22e612d..eaf830b 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/vr/ArImmersiveOverlay.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/vr/ArImmersiveOverlay.java
@@ -40,7 +40,7 @@ public class ArImmersiveOverlay implements SurfaceHolder.Callback2, View.OnTouchListener, ScreenOrientationDelegate { private static final String TAG = "ArImmersiveOverlay"; - private static final boolean DEBUG_LOGS = true; + private static final boolean DEBUG_LOGS = false; private ArCoreJavaUtils mArCoreJavaUtils; private ChromeActivity mActivity;
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/tab/TabUmaTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/tab/TabUmaTest.java index 5b707deb..8cf70a2 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/tab/TabUmaTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/tab/TabUmaTest.java
@@ -25,7 +25,6 @@ import org.chromium.chrome.browser.share.ShareDelegate; import org.chromium.chrome.test.ChromeActivityTestRule; import org.chromium.chrome.test.ChromeJUnit4ClassRunner; -import org.chromium.chrome.test.util.ChromeTabUtils; import org.chromium.components.browser_ui.util.BrowserControlsVisibilityDelegate; import org.chromium.content_public.browser.LoadUrlParams; import org.chromium.content_public.browser.test.util.TestThreadUtils; @@ -103,92 +102,4 @@ TestThreadUtils.runOnUiThreadBlocking(() -> { tab.show(TabSelectionType.FROM_USER); }); Assert.assertEquals(1, lazyLoadCount.getDelta()); } - - /** - * Verify that Tab.BackgroundLoadStatus is correctly recorded. - */ - @Test - @MediumTest - @Feature({"Uma"}) - public void testTabBackgroundLoadStatus() throws ExecutionException { - String histogram = "Tab.BackgroundLoadStatus"; - HistogramDelta shownLoadCount = - new HistogramDelta(histogram, TabUma.TAB_BACKGROUND_LOAD_SHOWN); - HistogramDelta lostLoadCount = - new HistogramDelta(histogram, TabUma.TAB_BACKGROUND_LOAD_LOST); - HistogramDelta skippedLoadCount = - new HistogramDelta(histogram, TabUma.TAB_BACKGROUND_LOAD_SKIPPED); - Assert.assertEquals(0, shownLoadCount.getDelta()); - Assert.assertEquals(0, lostLoadCount.getDelta()); - Assert.assertEquals(0, skippedLoadCount.getDelta()); - - // Test a live tab created in background and shown. - final Tab liveBgTab = TestThreadUtils.runOnUiThreadBlocking(new Callable<Tab>() { - @Override - public Tab call() { - Tab bgTab = TabBuilder.createLiveTab(true) - .setWindow(mActivityTestRule.getActivity().getWindowAndroid()) - .setLaunchType(TabLaunchType.FROM_LONGPRESS_BACKGROUND) - .setDelegateFactory(createTabDelegateFactory()) - .setInitiallyHidden(true) - .build(); - bgTab.loadUrl(new LoadUrlParams(mTestUrl)); - bgTab.show(TabSelectionType.FROM_USER); - return bgTab; - } - }); - Assert.assertEquals(1, shownLoadCount.getDelta()); - Assert.assertEquals(0, lostLoadCount.getDelta()); - Assert.assertEquals(0, skippedLoadCount.getDelta()); - - // Test a live tab killed in background before shown. - final Tab killedBgTab = TestThreadUtils.runOnUiThreadBlocking(new Callable<Tab>() { - @Override - public Tab call() { - Tab bgTab = TabBuilder.createLiveTab(true) - .setWindow(mActivityTestRule.getActivity().getWindowAndroid()) - .setLaunchType(TabLaunchType.FROM_LONGPRESS_BACKGROUND) - .setDelegateFactory(createTabDelegateFactory()) - .setInitiallyHidden(true) - .build(); - bgTab.loadUrl(new LoadUrlParams(mTestUrl)); - // Simulate the renderer being killed by the OS. - ChromeTabUtils.simulateRendererKilledForTesting(bgTab, false); - bgTab.show(TabSelectionType.FROM_USER); - return bgTab; - } - }); - Assert.assertEquals(1, shownLoadCount.getDelta()); - Assert.assertEquals(1, lostLoadCount.getDelta()); - Assert.assertEquals(0, skippedLoadCount.getDelta()); - - // Test a tab created in background but not loaded eagerly. - final Tab frozenBgTab = TestThreadUtils.runOnUiThreadBlocking(new Callable<Tab>() { - @Override - public Tab call() { - Tab bgTab = TabBuilder.createForLazyLoad(new LoadUrlParams(mTestUrl)) - .setWindow(mActivityTestRule.getActivity().getWindowAndroid()) - .setLaunchType(TabLaunchType.FROM_LONGPRESS_BACKGROUND) - .setDelegateFactory(createTabDelegateFactory()) - .setInitiallyHidden(true) - .build(); - bgTab.show(TabSelectionType.FROM_USER); - return bgTab; - } - }); - Assert.assertEquals(1, shownLoadCount.getDelta()); - Assert.assertEquals(1, lostLoadCount.getDelta()); - Assert.assertEquals(1, skippedLoadCount.getDelta()); - - // Show every tab again and make sure we didn't record more samples - this metric should be - // recorded only on first display. - TestThreadUtils.runOnUiThreadBlocking(() -> { - liveBgTab.show(TabSelectionType.FROM_USER); - killedBgTab.show(TabSelectionType.FROM_USER); - frozenBgTab.show(TabSelectionType.FROM_USER); - }); - Assert.assertEquals(1, shownLoadCount.getDelta()); - Assert.assertEquals(1, lostLoadCount.getDelta()); - Assert.assertEquals(1, skippedLoadCount.getDelta()); - } }
diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp index bb75995..25bf372 100644 --- a/chrome/app/settings_strings.grdp +++ b/chrome/app/settings_strings.grdp
@@ -1748,10 +1748,10 @@ See this provider's <ph name="BEGIN_LINK"><a target="_blank" href="$1<ex>https://google.com/</ex>"></ph>privacy policy<ph name="END_LINK"></a></ph> </message> <message name="IDS_SETTINGS_SECURE_DNS_DISABLED_FOR_MANAGED_ENVIRONMENT" desc="Substring of the secure DNS setting when secure DNS is disabled due to detection of a managed environment"> - This setting is disabled on managed browsers. + This setting is disabled on managed browsers </message> <message name="IDS_SETTINGS_SECURE_DNS_DISABLED_FOR_PARENTAL_CONTROL" desc="Substring of the secure DNS setting when secure DNS is disabled due to detection of OS-level parental controls"> - This setting is disabled because parental controls are on. + This setting is disabled because parental controls are on </message> <message name="IDS_SETTINGS_SECURE_DNS_CUSTOM_PLACEHOLDER" desc="Placeholder text for a textbox where users can enter a custom secure DNS provider"> Enter custom provider @@ -1759,6 +1759,9 @@ <message name="IDS_SETTINGS_SECURE_DNS_CUSTOM_FORMAT_ERROR" desc="Error text for an incorrectly formatted entry for the custom secure DNS provider"> Enter a correctly formatted URL </message> + <message name="IDS_SETTINGS_SECURE_DNS_CUSTOM_CONNECTION_ERROR" desc="Error text for a custom secure DNS provider entry to which a probe connection fails"> + Please verify that this is a valid provider or try again later + </message> <message name="IDS_SETTINGS_CONTENT_SETTINGS" desc="Text of the button that takes a user to settings page thats allows users to modify site settings. Also the title of that settings page."> Content settings </message>
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index a670aa2..42952bc 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn
@@ -2346,8 +2346,6 @@ "android/browsing_data/browsing_data_counter_bridge.h", "android/browsing_data/url_filter_bridge.cc", "android/browsing_data/url_filter_bridge.h", - "android/cached_feature_flags.cc", - "android/cached_feature_flags.h", "android/chrome_backup_agent.cc", "android/chrome_backup_agent.h", "android/chrome_backup_watcher.cc", @@ -2984,6 +2982,7 @@ "//chrome/android/modules/extra_icu/provider:native", "//chrome/browser/android/thin_webview/internal", "//chrome/browser/android/webapk:proto", + "//chrome/browser/flags:flags_android", "//chrome/browser/nfc/android:native", "//chrome/browser/notifications/chime/android", "//chrome/browser/notifications/scheduler/public", @@ -3165,6 +3164,8 @@ "enterprise_reporting/browser_report_generator.h", "enterprise_reporting/extension_info.cc", "enterprise_reporting/extension_info.h", + "enterprise_reporting/extension_request_policy_handler.cc", + "enterprise_reporting/extension_request_policy_handler.h", "enterprise_reporting/notification/extension_request_notification.cc", "enterprise_reporting/notification/extension_request_notification.h", "enterprise_reporting/notification/extension_request_observer.cc",
diff --git a/chrome/browser/android/shortcut_info.cc b/chrome/browser/android/shortcut_info.cc index 763128b6..6b75518 100644 --- a/chrome/browser/android/shortcut_info.cc +++ b/chrome/browser/android/shortcut_info.cc
@@ -120,6 +120,13 @@ if (shortcut_items.size() > kMaxShortcuts) shortcut_items.resize(kMaxShortcuts); + for (auto& shortcut_item : shortcut_items) { + if (shortcut_item.short_name.string().empty()) { + shortcut_item.short_name = + base::NullableString16(shortcut_item.name, /* is_null= */ false); + } + } + int ideal_shortcut_icons_size_px = ShortcutHelper::GetIdealShortcutIconSizeInPx(); for (const auto& manifest_shortcut : shortcut_items) {
diff --git a/chrome/browser/android/shortcut_info_unittest.cc b/chrome/browser/android/shortcut_info_unittest.cc index 16b7cb25..75ef2135 100644 --- a/chrome/browser/android/shortcut_info_unittest.cc +++ b/chrome/browser/android/shortcut_info_unittest.cc
@@ -148,3 +148,17 @@ EXPECT_EQ(info_.best_shortcut_icon_urls[1].path(), "/i2_2"); EXPECT_FALSE(info_.best_shortcut_icon_urls[2].is_valid()); } + +// Tests that if the optional shortcut short_name value is not provided, the +// required name value is used. +TEST_F(ShortcutInfoTest, ShortcutShortNameBackfilled) { + // Create a shortcut without a |short_name|. + manifest_.shortcuts.push_back( + CreateShortcut(/* name= */ "name", /* icons= */ {})); + + info_.UpdateFromManifest(manifest_); + + ASSERT_EQ(info_.shortcut_items.size(), 1u); + EXPECT_EQ(info_.shortcut_items[0].short_name.string(), + base::UTF8ToUTF16("name")); +}
diff --git a/chrome/browser/android/tab_web_contents_delegate_android.cc b/chrome/browser/android/tab_web_contents_delegate_android.cc index 7d5b490..3a7f6c3 100644 --- a/chrome/browser/android/tab_web_contents_delegate_android.cc +++ b/chrome/browser/android/tab_web_contents_delegate_android.cc
@@ -19,12 +19,12 @@ #include "base/optional.h" #include "base/rand_util.h" #include "chrome/android/chrome_jni_headers/TabWebContentsDelegateAndroid_jni.h" -#include "chrome/browser/android/cached_feature_flags.h" #include "chrome/browser/android/hung_renderer_infobar_delegate.h" #include "chrome/browser/android/tab_android.h" #include "chrome/browser/banners/app_banner_manager_android.h" #include "chrome/browser/content_settings/sound_content_setting_observer.h" #include "chrome/browser/file_select_helper.h" +#include "chrome/browser/flags/android/cached_feature_flags.h" #include "chrome/browser/flags/android/chrome_feature_list.h" #include "chrome/browser/infobars/infobar_service.h" #include "chrome/browser/media/protected_media_identifier_permission_context.h"
diff --git a/chrome/browser/chrome_browser_field_trials.cc b/chrome/browser/chrome_browser_field_trials.cc index 77f2337..3b404c3 100644 --- a/chrome/browser/chrome_browser_field_trials.cc +++ b/chrome/browser/chrome_browser_field_trials.cc
@@ -26,8 +26,8 @@ #include "components/version_info/version_info.h" #if defined(OS_ANDROID) -#include "chrome/browser/android/cached_feature_flags.h" #include "chrome/browser/chrome_browser_field_trials_mobile.h" +#include "chrome/browser/flags/android/cached_feature_flags.h" #else #include "chrome/browser/chrome_browser_field_trials_desktop.h" #endif
diff --git a/chrome/browser/chromeos/extensions/install_limiter_unittest.cc b/chrome/browser/chromeos/extensions/install_limiter_unittest.cc index 133d781..88fcc3ef 100644 --- a/chrome/browser/chromeos/extensions/install_limiter_unittest.cc +++ b/chrome/browser/chromeos/extensions/install_limiter_unittest.cc
@@ -44,7 +44,7 @@ const std::vector<std::string> screensaver_ids = { extension_misc::kScreensaverAppId, extension_misc::kScreensaverEveAppId, extension_misc::kScreensaverNocturneAppId, - extension_misc::kScreensaverAltAppId, + extension_misc::kScreensaverAtlasAppId, extension_misc::kScreensaverKukuiAppId}; chromeos::DemoModeTestHelper demo_mode_test_helper;
diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc index a0d1f4b..f2b26b1 100644 --- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc +++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
@@ -717,33 +717,49 @@ ::testing::Values(TestCase("sortColumns"), TestCase("sortColumns").InGuestMode())); -// TODO(adanilo): Enable tabindex for FilesNg tests when breadcrumbs focus is -// sorted. WRAPPED_INSTANTIATE_TEST_SUITE_P( TabIndex, /* tab_index.js: */ FilesAppBrowserTest, ::testing::Values( + TestCase("tabindexSearchBoxFocus").FilesNg(), TestCase("tabindexSearchBoxFocus").DisableFilesNg(), TestCase("tabindexFocusBody").DisableFilesNg(), TestCase("tabindexFocusBody").FilesNg(), TestCase("tabindexFocus").DisableFilesNg(), + TestCase("tabindexFocusDownloads").FilesNg(), TestCase("tabindexFocusDownloads").DisableFilesNg(), + TestCase("tabindexFocusDownloads").InGuestMode().FilesNg(), TestCase("tabindexFocusDownloads").InGuestMode().DisableFilesNg(), + // TestCase("tabindexFocusBreadcrumbBackground").FilesNg(), TestCase("tabindexFocusBreadcrumbBackground").DisableFilesNg(), + TestCase("tabindexFocusDirectorySelected").FilesNg(), TestCase("tabindexFocusDirectorySelected").DisableFilesNg(), + TestCase("tabindexOpenDialogDownloadsFilesNg").WithBrowser().FilesNg(), TestCase("tabindexOpenDialogDownloads").WithBrowser().DisableFilesNg(), TestCase("tabindexOpenDialogDownloads") .WithBrowser() .InGuestMode() .DisableFilesNg(), + TestCase("tabindexOpenDialogDownloadsFilesNg") + .WithBrowser() + .InGuestMode() + .FilesNg(), + TestCase("tabindexSaveFileDialogDriveFilesNg").WithBrowser().FilesNg(), TestCase("tabindexSaveFileDialogDrive").WithBrowser().DisableFilesNg(), + TestCase("tabindexSaveFileDialogDownloadsFilesNg") + .WithBrowser() + .FilesNg(), TestCase("tabindexSaveFileDialogDownloads") .WithBrowser() .DisableFilesNg(), TestCase("tabindexSaveFileDialogDownloads") .WithBrowser() .InGuestMode() - .DisableFilesNg())); + .DisableFilesNg(), + TestCase("tabindexSaveFileDialogDownloadsFilesNg") + .WithBrowser() + .InGuestMode() + .FilesNg())); WRAPPED_INSTANTIATE_TEST_SUITE_P( FileDialog, /* file_dialog.js */
diff --git a/chrome/browser/chromeos/file_manager/file_manager_string_util.cc b/chrome/browser/chromeos/file_manager/file_manager_string_util.cc index 9bfbf76..028fef1f 100644 --- a/chrome/browser/chromeos/file_manager/file_manager_string_util.cc +++ b/chrome/browser/chromeos/file_manager/file_manager_string_util.cc
@@ -887,6 +887,8 @@ SET_STRING("GRID_VIEW_FOLDERS_TITLE", IDS_FILE_BROWSER_GRID_VIEW_FOLDERS_TITLE); SET_STRING("GRID_VIEW_FILES_TITLE", IDS_FILE_BROWSER_GRID_VIEW_FILES_TITLE); + SET_STRING("LOCATION_BREADCRUMB_ELIDER_BUTTON_LABEL", + IDS_FILE_BROWSER_LOCATION_BREADCRUMB_ELIDER_BUTTON_LABEL); #undef SET_STRING dict->SetString(
diff --git a/chrome/browser/chromeos/login/demo_mode/demo_resources.cc b/chrome/browser/chromeos/login/demo_mode/demo_resources.cc index 5b8f703..b3e96ba 100644 --- a/chrome/browser/chromeos/login/demo_mode/demo_resources.cc +++ b/chrome/browser/chromeos/login/demo_mode/demo_resources.cc
@@ -97,7 +97,7 @@ // CrOSComponentManager. DCHECK(cros_component_manager); - g_browser_process->platform_part()->cros_component_manager()->Load( + cros_component_manager->Load( kDemoModeResourcesComponentName, component_updater::CrOSComponentManager::MountPolicy::kMount, component_updater::CrOSComponentManager::UpdatePolicy::kDontForce,
diff --git a/chrome/browser/chromeos/login/demo_mode/demo_session.cc b/chrome/browser/chromeos/login/demo_mode/demo_session.cc index 300bc56..430ff2a 100644 --- a/chrome/browser/chromeos/login/demo_mode/demo_session.cc +++ b/chrome/browser/chromeos/login/demo_mode/demo_session.cc
@@ -330,7 +330,7 @@ if (board == "nocturne") return extension_misc::kScreensaverNocturneAppId; if (board == "atlas") - return extension_misc::kScreensaverAltAppId; + return extension_misc::kScreensaverAtlasAppId; if (board == "kukui") return extension_misc::kScreensaverKukuiAppId; return extension_misc::kScreensaverAppId;
diff --git a/chrome/browser/component_updater/sw_reporter_installer_win.cc b/chrome/browser/component_updater/sw_reporter_installer_win.cc index 3425bf51..d65c62e1 100644 --- a/chrome/browser/component_updater/sw_reporter_installer_win.cc +++ b/chrome/browser/component_updater/sw_reporter_installer_win.cc
@@ -132,9 +132,8 @@ UMA_HISTOGRAM_BOOLEAN("SoftwareReporter.LastUploadResult", last_result); } -void ReportExperimentError(SoftwareReporterExperimentError error) { - UMA_HISTOGRAM_ENUMERATION("SoftwareReporter.ExperimentErrors", error, - SW_REPORTER_EXPERIMENT_ERROR_MAX); +void ReportConfigurationError(SoftwareReporterConfigurationError error) { + UMA_HISTOGRAM_ENUMERATION("SoftwareReporter.ConfigurationErrors", error); } // Ensures |str| contains only alphanumeric characters and characters from @@ -172,7 +171,7 @@ if (invocation_params->Get(behaviour_name, &value)) { bool enable_behaviour = false; if (!value->GetAsBoolean(&enable_behaviour)) { - ReportExperimentError(SW_REPORTER_EXPERIMENT_ERROR_BAD_PARAMS); + ReportConfigurationError(kBadParams); return false; } if (enable_behaviour) @@ -195,7 +194,7 @@ base::Value* launch_params = nullptr; if (manifest->Get("launch_params", &launch_params) && !launch_params->GetAsList(¶meter_list)) { - ReportExperimentError(SW_REPORTER_EXPERIMENT_ERROR_BAD_PARAMS); + ReportConfigurationError(kBadParams); return false; } @@ -218,7 +217,7 @@ for (const auto& iter : *parameter_list) { const base::DictionaryValue* invocation_params = nullptr; if (!iter.GetAsDictionary(&invocation_params)) { - ReportExperimentError(SW_REPORTER_EXPERIMENT_ERROR_BAD_PARAMS); + ReportConfigurationError(kBadParams); return false; } @@ -232,7 +231,7 @@ std::string suffix; if (!invocation_params->GetString("suffix", &suffix) || !ValidateString(suffix, std::string(), kMaxSuffixLength)) { - ReportExperimentError(SW_REPORTER_EXPERIMENT_ERROR_BAD_PARAMS); + ReportConfigurationError(kBadParams); return false; } @@ -241,7 +240,7 @@ // it's ok if it's an empty list or a list of empty strings.) const base::ListValue* arguments = nullptr; if (!invocation_params->GetList("arguments", &arguments)) { - ReportExperimentError(SW_REPORTER_EXPERIMENT_ERROR_BAD_PARAMS); + ReportConfigurationError(kBadParams); return false; } @@ -249,7 +248,7 @@ for (const auto& value : *arguments) { base::string16 argument; if (!value.GetAsString(&argument)) { - ReportExperimentError(SW_REPORTER_EXPERIMENT_ERROR_BAD_PARAMS); + ReportConfigurationError(kBadParams); return false; } if (!argument.empty()) @@ -365,7 +364,7 @@ constexpr char kTagParam[] = "tag"; if (tag.empty() || !ValidateString(tag, kExtraAttributeChars, kMaxAttributeLength)) { - ReportExperimentError(SW_REPORTER_EXPERIMENT_ERROR_BAD_TAG); + ReportConfigurationError(kBadTag); attributes[kTagParam] = "missing_tag"; } else { attributes[kTagParam] = tag;
diff --git a/chrome/browser/component_updater/sw_reporter_installer_win.h b/chrome/browser/component_updater/sw_reporter_installer_win.h index 1c1475ea..f48daed 100644 --- a/chrome/browser/component_updater/sw_reporter_installer_win.h +++ b/chrome/browser/component_updater/sw_reporter_installer_win.h
@@ -34,13 +34,15 @@ constexpr char kSwReporterComponentId[] = "gkmgaooipdjhmangpemjhigmamcehddo"; -// These MUST match the values for SoftwareReporterExperimentError in -// histograms.xml. Exposed for testing. -enum SoftwareReporterExperimentError { - SW_REPORTER_EXPERIMENT_ERROR_BAD_TAG = 0, - SW_REPORTER_EXPERIMENT_ERROR_BAD_PARAMS = 1, - SW_REPORTER_EXPERIMENT_ERROR_MISSING_PARAMS = 2, - SW_REPORTER_EXPERIMENT_ERROR_MAX, +// These values are logged to UMA. Entries should not be renumbered and +// numeric values should never be reused. Please keep in sync with +// "SoftwareReporterConfigurationError" in +// src/tools/metrics/histograms/enums.xml. +enum SoftwareReporterConfigurationError { + kBadTag = 0, + kBadParams = 1, + kMissingParams = 2, + kMaxValue = kMissingParams }; // Callback for running the software reporter after it is downloaded.
diff --git a/chrome/browser/component_updater/sw_reporter_installer_win_unittest.cc b/chrome/browser/component_updater/sw_reporter_installer_win_unittest.cc index c02c204..4628ad1 100644 --- a/chrome/browser/component_updater/sw_reporter_installer_win_unittest.cc +++ b/chrome/browser/component_updater/sw_reporter_installer_win_unittest.cc
@@ -36,7 +36,7 @@ namespace { -constexpr char kErrorHistogramName[] = "SoftwareReporter.ExperimentErrors"; +constexpr char kErrorHistogramName[] = "SoftwareReporter.ConfigurationErrors"; constexpr char kExperimentTag[] = "experiment_tag"; constexpr char kMissingTag[] = "missing_tag"; @@ -192,8 +192,7 @@ void ExpectLaunchError() { // The SwReporter should not be launched, and an error should be logged. EXPECT_TRUE(extracted_invocations_.container().empty()); - histograms_.ExpectUniqueSample(kErrorHistogramName, - SW_REPORTER_EXPERIMENT_ERROR_BAD_PARAMS, 1); + histograms_.ExpectUniqueSample(kErrorHistogramName, kBadParams, 1); } base::test::ScopedFeatureList scoped_feature_list_; @@ -229,16 +228,14 @@ SwReporterInstallerPolicy policy(on_component_ready_callback_); CreateFeatureWithoutTag(); ExpectAttributesWithTag(policy, kMissingTag); - histograms_.ExpectUniqueSample(kErrorHistogramName, - SW_REPORTER_EXPERIMENT_ERROR_BAD_TAG, 1); + histograms_.ExpectUniqueSample(kErrorHistogramName, kBadTag, 1); } TEST_F(SwReporterInstallerTest, InvalidTag) { SwReporterInstallerPolicy policy(on_component_ready_callback_); CreateFeatureWithTag("tag with invalid whitespace chars"); ExpectAttributesWithTag(policy, kMissingTag); - histograms_.ExpectUniqueSample(kErrorHistogramName, - SW_REPORTER_EXPERIMENT_ERROR_BAD_TAG, 1); + histograms_.ExpectUniqueSample(kErrorHistogramName, kBadTag, 1); } TEST_F(SwReporterInstallerTest, TagTooLong) { @@ -246,16 +243,14 @@ std::string tag_too_long(500, 'x'); CreateFeatureWithTag(tag_too_long); ExpectAttributesWithTag(policy, kMissingTag); - histograms_.ExpectUniqueSample(kErrorHistogramName, - SW_REPORTER_EXPERIMENT_ERROR_BAD_TAG, 1); + histograms_.ExpectUniqueSample(kErrorHistogramName, kBadTag, 1); } TEST_F(SwReporterInstallerTest, EmptyTag) { SwReporterInstallerPolicy policy(on_component_ready_callback_); CreateFeatureWithTag(""); ExpectAttributesWithTag(policy, kMissingTag); - histograms_.ExpectUniqueSample(kErrorHistogramName, - SW_REPORTER_EXPERIMENT_ERROR_BAD_TAG, 1); + histograms_.ExpectUniqueSample(kErrorHistogramName, kBadTag, 1); } TEST_F(SwReporterInstallerTest, ValidTag) { @@ -530,8 +525,7 @@ // The SwReporter should not be launched, and an error should be logged. EXPECT_TRUE(extracted_invocations_.container().empty()); - histograms_.ExpectUniqueSample(kErrorHistogramName, - SW_REPORTER_EXPERIMENT_ERROR_BAD_PARAMS, 1); + histograms_.ExpectUniqueSample(kErrorHistogramName, kBadParams, 1); } TEST_F(SwReporterInstallerTest, SuffixTooLong) { @@ -553,8 +547,7 @@ // The SwReporter should not be launched, and an error should be logged. EXPECT_TRUE(extracted_invocations_.container().empty()); - histograms_.ExpectUniqueSample(kErrorHistogramName, - SW_REPORTER_EXPERIMENT_ERROR_BAD_PARAMS, 1); + histograms_.ExpectUniqueSample(kErrorHistogramName, kBadParams, 1); } TEST_F(SwReporterInstallerTest, BadTypesInManifest_ArgumentsIsNotAList) { @@ -574,8 +567,7 @@ // The SwReporter should not be launched, and an error should be logged. EXPECT_TRUE(extracted_invocations_.container().empty()); - histograms_.ExpectUniqueSample(kErrorHistogramName, - SW_REPORTER_EXPERIMENT_ERROR_BAD_PARAMS, 1); + histograms_.ExpectUniqueSample(kErrorHistogramName, kBadParams, 1); } TEST_F(SwReporterInstallerTest, BadTypesInManifest_InvocationParamsIsNotAList) { @@ -596,8 +588,7 @@ // The SwReporter should not be launched, and an error should be logged. EXPECT_TRUE(extracted_invocations_.container().empty()); - histograms_.ExpectUniqueSample(kErrorHistogramName, - SW_REPORTER_EXPERIMENT_ERROR_BAD_PARAMS, 1); + histograms_.ExpectUniqueSample(kErrorHistogramName, kBadParams, 1); } TEST_F(SwReporterInstallerTest, BadTypesInManifest_SuffixIsAList) { @@ -617,8 +608,7 @@ // The SwReporter should not be launched, and an error should be logged. EXPECT_TRUE(extracted_invocations_.container().empty()); - histograms_.ExpectUniqueSample(kErrorHistogramName, - SW_REPORTER_EXPERIMENT_ERROR_BAD_PARAMS, 1); + histograms_.ExpectUniqueSample(kErrorHistogramName, kBadParams, 1); } TEST_F(SwReporterInstallerTest, BadTypesInManifest_PromptIsNotABoolean) { @@ -639,8 +629,7 @@ // The SwReporter should not be launched, and an error should be logged. EXPECT_TRUE(extracted_invocations_.container().empty()); - histograms_.ExpectUniqueSample(kErrorHistogramName, - SW_REPORTER_EXPERIMENT_ERROR_BAD_PARAMS, 1); + histograms_.ExpectUniqueSample(kErrorHistogramName, kBadParams, 1); } TEST_F(SwReporterInstallerTest, BadTypesInManifest_LaunchParamsIsScalar) { @@ -653,8 +642,7 @@ // The SwReporter should not be launched, and an error should be logged. EXPECT_TRUE(extracted_invocations_.container().empty()); - histograms_.ExpectUniqueSample(kErrorHistogramName, - SW_REPORTER_EXPERIMENT_ERROR_BAD_PARAMS, 1); + histograms_.ExpectUniqueSample(kErrorHistogramName, kBadParams, 1); } TEST_F(SwReporterInstallerTest, BadTypesInManifest_LaunchParamsIsDict) { @@ -667,8 +655,7 @@ // The SwReporter should not be launched, and an error should be logged. EXPECT_TRUE(extracted_invocations_.container().empty()); - histograms_.ExpectUniqueSample(kErrorHistogramName, - SW_REPORTER_EXPERIMENT_ERROR_BAD_PARAMS, 1); + histograms_.ExpectUniqueSample(kErrorHistogramName, kBadParams, 1); } class SwReporterOnDemandFetcherTest : public ::testing::Test,
diff --git a/chrome/browser/devtools/devtools_eye_dropper.cc b/chrome/browser/devtools/devtools_eye_dropper.cc index ff89ef88..a3b4d68 100644 --- a/chrome/browser/devtools/devtools_eye_dropper.cc +++ b/chrome/browser/devtools/devtools_eye_dropper.cc
@@ -16,7 +16,6 @@ #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "content/public/common/content_features.h" -#include "content/public/common/cursor_info.h" #include "content/public/common/screen_info.h" #include "media/base/limits.h" #include "media/base/video_frame.h" @@ -28,6 +27,7 @@ #include "third_party/skia/include/core/SkPaint.h" #include "third_party/skia/include/core/SkPath.h" #include "third_party/skia/include/core/SkPixmap.h" +#include "ui/base/cursor/cursor.h" #include "ui/base/mojom/cursor_type.mojom-shared.h" #include "ui/gfx/geometry/size_conversions.h" @@ -81,9 +81,8 @@ if (!host_) return; host_->RemoveMouseEventCallback(mouse_event_callback_); - content::CursorInfo cursor_info; - cursor_info.type = ui::mojom::CursorType::kPointer; - host_->SetCursor(cursor_info); + ui::Cursor cursor(ui::mojom::CursorType::kPointer); + host_->SetCursor(cursor); video_capturer_.reset(); host_ = nullptr; } @@ -255,13 +254,12 @@ paint.setAntiAlias(true); canvas.drawCircle(kCursorSize / 2, kCursorSize / 2, kDiameter / 2, paint); - content::CursorInfo cursor_info; - cursor_info.type = ui::mojom::CursorType::kCustom; - cursor_info.image_scale_factor = device_scale_factor; - cursor_info.custom_image = result; - cursor_info.hotspot = gfx::Point(kHotspotOffset * device_scale_factor, - kHotspotOffset * device_scale_factor); - host_->SetCursor(cursor_info); + ui::Cursor cursor(ui::mojom::CursorType::kCustom); + cursor.set_image_scale_factor(device_scale_factor); + cursor.set_custom_bitmap(result); + cursor.set_custom_hotspot(gfx::Point(kHotspotOffset * device_scale_factor, + kHotspotOffset * device_scale_factor)); + host_->SetCursor(cursor); } void DevToolsEyeDropper::OnFrameCaptured(
diff --git a/chrome/browser/download/android/download_manager_service.cc b/chrome/browser/download/android/download_manager_service.cc index bb894882..3d352738 100644 --- a/chrome/browser/download/android/download_manager_service.cc +++ b/chrome/browser/download/android/download_manager_service.cc
@@ -18,7 +18,6 @@ #include "base/time/time.h" #include "chrome/android/chrome_jni_headers/DownloadItem_jni.h" #include "chrome/android/chrome_jni_headers/DownloadManagerService_jni.h" -#include "chrome/browser/android/cached_feature_flags.h" #include "chrome/browser/android/profile_key_startup_accessor.h" #include "chrome/browser/download/android/download_controller.h" #include "chrome/browser/download/android/download_startup_utils.h" @@ -27,6 +26,7 @@ #include "chrome/browser/download/android/service/download_task_scheduler.h" #include "chrome/browser/download/offline_item_utils.h" #include "chrome/browser/download/simple_download_manager_coordinator_factory.h" +#include "chrome/browser/flags/android/cached_feature_flags.h" #include "chrome/browser/flags/android/chrome_feature_list.h" #include "chrome/browser/profiles/profile_key.h" #include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/enterprise_reporting/extension_request_policy_handler.cc b/chrome/browser/enterprise_reporting/extension_request_policy_handler.cc new file mode 100644 index 0000000..4ffb717 --- /dev/null +++ b/chrome/browser/enterprise_reporting/extension_request_policy_handler.cc
@@ -0,0 +1,41 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/enterprise_reporting/extension_request_policy_handler.h" + +#include "base/values.h" +#include "chrome/common/pref_names.h" +#include "components/policy/core/common/policy_map.h" +#include "components/policy/policy_constants.h" +#include "components/prefs/pref_value_map.h" + +namespace enterprise_reporting { + +ExtensionRequestPolicyHandler::ExtensionRequestPolicyHandler() + : policy::TypeCheckingPolicyHandler( + policy::key::kCloudExtensionRequestEnabled, + base::Value::Type::BOOLEAN) {} + +ExtensionRequestPolicyHandler::~ExtensionRequestPolicyHandler() = default; + +void ExtensionRequestPolicyHandler::ApplyPolicySettings( + const policy::PolicyMap& policies, + PrefValueMap* prefs) { + const base::Value* cloud_reporting_policy_value = + policies.GetValue(policy::key::kCloudReportingEnabled); + if (!cloud_reporting_policy_value || + !cloud_reporting_policy_value->is_bool() || + !cloud_reporting_policy_value->GetBool()) + return; + + const base::Value* extension_request_policy_value = + policies.GetValue(policy_name()); + + if (extension_request_policy_value) { + prefs->SetValue(prefs::kCloudExtensionRequestEnabled, + extension_request_policy_value->Clone()); + } +} + +} // namespace enterprise_reporting
diff --git a/chrome/browser/enterprise_reporting/extension_request_policy_handler.h b/chrome/browser/enterprise_reporting/extension_request_policy_handler.h new file mode 100644 index 0000000..a286f64 --- /dev/null +++ b/chrome/browser/enterprise_reporting/extension_request_policy_handler.h
@@ -0,0 +1,28 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CHROME_BROWSER_ENTERPRISE_REPORTING_EXTENSION_REQUEST_POLICY_HANDLER_H_ +#define CHROME_BROWSER_ENTERPRISE_REPORTING_EXTENSION_REQUEST_POLICY_HANDLER_H_ + +#include "components/policy/core/browser/configuration_policy_handler.h" + +namespace enterprise_reporting { + +// Sets prefs for policy CloudExtensionRequestEnabled policy. +// +// The policy value is set to pref iff CloudReportingEnabled is set to True. +// Otherwise, it will use the default value. +class ExtensionRequestPolicyHandler : public policy::TypeCheckingPolicyHandler { + public: + ExtensionRequestPolicyHandler(); + ~ExtensionRequestPolicyHandler() override; + + private: + void ApplyPolicySettings(const policy::PolicyMap& policies, + PrefValueMap* prefs) override; +}; + +} // namespace enterprise_reporting + +#endif // CHROME_BROWSER_ENTERPRISE_REPORTING_EXTENSION_REQUEST_POLICY_HANDLER_H_
diff --git a/chrome/browser/extensions/api/terminal/crostini_startup_status.cc b/chrome/browser/extensions/api/terminal/crostini_startup_status.cc index a8469622..56168cb 100644 --- a/chrome/browser/extensions/api/terminal/crostini_startup_status.cc +++ b/chrome/browser/extensions/api/terminal/crostini_startup_status.cc
@@ -34,10 +34,6 @@ const char kEraseInLine[] = "\x1b[K"; const char kSpinner[] = "|/-\\"; const int kMaxStage = 9; -const char kErrorSymbol[] = "☠️"; -const base::NoDestructor<std::vector<std::string>> kSuccessSymbol({"😺", "🐹", - "🐼", "🐸", - "🐶", "🐬"}); std::string MoveForward(int i) { return base::StringPrintf("\x1b[%dC", i); @@ -49,9 +45,6 @@ base::RepeatingCallback<void(const std::string&)> print, bool verbose) : print_(std::move(print)), verbose_(verbose) { - // Initialize Progress - Print(base::StringPrintf("%s%s[%s] ", kCursorHide, kColor5Purple, - std::string(kMaxStage, ' ').c_str())); } CrostiniStartupStatus::~CrostiniStartupStatus() = default; @@ -61,13 +54,11 @@ if (result != crostini::CrostiniResult::SUCCESS) { PrintAfterStage( kColor1RedBright, - base::StringPrintf("Error starting penguin container: %d %s\r\n", - result, kErrorSymbol)); + base::StringPrintf("Error starting penguin container: %d\r\n", result)); } else { if (verbose_) { stage_index_ = kMaxStage + 1; // done. - PrintStage(kColor2GreenBright, "done"); - Print((*kSuccessSymbol)[rand() % kSuccessSymbol->size()] + "\r\n"); + PrintStage(kColor2GreenBright, "done\r\n"); } } Print( @@ -77,8 +68,11 @@ void CrostiniStartupStatus::ShowProgressAtInterval() { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); + // Wait one interval before showing progress. + if (spinner_index_ > 0) { + PrintProgress(); + } ++spinner_index_; - PrintProgress(); base::PostDelayedTask( FROM_HERE, {content::BrowserThread::UI}, base::BindOnce(&CrostiniStartupStatus::ShowProgressAtInterval, @@ -98,11 +92,13 @@ kStartStrings({ {InstallerState::kStart, "Initializing"}, {InstallerState::kInstallImageLoader, - "Checking cros-termina component"}, + "Checking cros-termina component installed"}, {InstallerState::kStartConcierge, "Starting VM controller"}, - {InstallerState::kCreateDiskImage, "Creating termina VM image"}, + {InstallerState::kCreateDiskImage, + "Checking termina VM image installed"}, {InstallerState::kStartTerminaVm, "Starting termina VM"}, - {InstallerState::kCreateContainer, "Creating penguin container"}, + {InstallerState::kCreateContainer, + "Checking penguin container installed"}, {InstallerState::kSetupContainer, "Checking penguin container setup"}, {InstallerState::kStartContainer, "Starting penguin container"}, {InstallerState::kFetchSshKeys, @@ -123,7 +119,17 @@ print_.Run(output); } +void CrostiniStartupStatus::InitializeProgress() { + if (progress_initialized_) { + return; + } + progress_initialized_ = true; + Print(base::StringPrintf("%s%s[%s] ", kCursorHide, kColor5Purple, + std::string(kMaxStage, ' ').c_str())); +} + void CrostiniStartupStatus::PrintProgress() { + InitializeProgress(); Print(base::StringPrintf("\r%s%s%c", MoveForward(stage_index_).c_str(), kColor5Purple, kSpinner[spinner_index_ & 0x3])); } @@ -131,6 +137,7 @@ void CrostiniStartupStatus::PrintStage(const char* color, const std::string& output) { DCHECK_GE(stage_index_, 1); + InitializeProgress(); std::string progress(stage_index_ - 1, '='); Print(base::StringPrintf("\r%s[%s%s%s%s%s ", kColor5Purple, progress.c_str(), MoveForward(3 + (kMaxStage - stage_index_)).c_str(), @@ -140,6 +147,7 @@ void CrostiniStartupStatus::PrintAfterStage(const char* color, const std::string& output) { + InitializeProgress(); Print(base::StringPrintf("\r%s%s%s", MoveForward(end_of_line_index_).c_str(), color, output.c_str())); end_of_line_index_ += output.size();
diff --git a/chrome/browser/extensions/api/terminal/crostini_startup_status.h b/chrome/browser/extensions/api/terminal/crostini_startup_status.h index 69830de..9191f23 100644 --- a/chrome/browser/extensions/api/terminal/crostini_startup_status.h +++ b/chrome/browser/extensions/api/terminal/crostini_startup_status.h
@@ -38,12 +38,14 @@ void OnContainerDownloading(int32_t download_percent) override; void Print(const std::string& output); + void InitializeProgress(); void PrintProgress(); void PrintStage(const char* color, const std::string& output); void PrintAfterStage(const char* color, const std::string& output); base::RepeatingCallback<void(const std::string& output)> print_; const bool verbose_; + bool progress_initialized_ = false; int spinner_index_ = 0; int stage_index_ = 0; int end_of_line_index_ = 0;
diff --git a/chrome/browser/extensions/api/terminal/crostini_startup_status_unittest.cc b/chrome/browser/extensions/api/terminal/crostini_startup_status_unittest.cc index fd975d7..c4307e82 100644 --- a/chrome/browser/extensions/api/terminal/crostini_startup_status_unittest.cc +++ b/chrome/browser/extensions/api/terminal/crostini_startup_status_unittest.cc
@@ -42,11 +42,9 @@ startup_status->OnStageStarted(InstallerState::kInstallImageLoader); startup_status->OnCrostiniRestarted(crostini::CrostiniResult::SUCCESS); - EXPECT_EQ(output_.size(), 2u); - // Hide cursor, init progress. - EXPECT_EQ(output_[0], "\x1b[?25l\x1b[35m[ ] "); + EXPECT_EQ(output_.size(), 1u); // CR, delete line, default color, show cursor. - EXPECT_EQ(output_[1], "\r\x1b[K\x1b[0m\x1b[?25h"); + EXPECT_EQ(output_[0], "\r\x1b[K\x1b[0m\x1b[?25h"); } TEST_F(CrostiniStartupStatusTest, TestVerbose) { @@ -55,7 +53,7 @@ startup_status->OnStageStarted(InstallerState::kInstallImageLoader); startup_status->OnCrostiniRestarted(crostini::CrostiniResult::SUCCESS); - EXPECT_EQ(output_.size(), 6u); + EXPECT_EQ(output_.size(), 5u); // Hide cursor, init progress. EXPECT_EQ(output_[0], "\x1b[?25l\x1b[35m[ ] "); @@ -63,15 +61,15 @@ EXPECT_EQ(output_[1], "\r\x1b[35m[\x1b[11C\x1b[K\x1b[33mInitializing "); // CR, purple, progress, forward 10, erase, yellow, stage. - EXPECT_EQ( - output_[2], - "\r\x1b[35m[=\x1b[10C\x1b[K\x1b[33mChecking cros-termina component "); + EXPECT_EQ(output_[2], + "\r\x1b[35m[=\x1b[10C\x1b[K\x1b[33mChecking cros-termina component " + "installed "); // CR, purple, progress, forward 2, erase, green, done, symbol, CRLF. - EXPECT_EQ(output_[3], "\r\x1b[35m[=========\x1b[2C\x1b[K\x1b[1;32mdone "); + EXPECT_EQ(output_[3], "\r\x1b[35m[=========\x1b[2C\x1b[K\x1b[1;32mdone\r\n "); // CR, delete line, default color, show cursor; - EXPECT_EQ(output_[5], "\r\x1b[K\x1b[0m\x1b[?25h"); + EXPECT_EQ(output_[4], "\r\x1b[K\x1b[0m\x1b[?25h"); } } // namespace extensions
diff --git a/chrome/browser/file_select_helper.cc b/chrome/browser/file_select_helper.cc index 5a51199..13d648e 100644 --- a/chrome/browser/file_select_helper.cc +++ b/chrome/browser/file_select_helper.cc
@@ -601,6 +601,8 @@ void FileSelectHelper::CheckDownloadRequestWithSafeBrowsing( const base::FilePath& default_file_path, FileChooserParamsPtr params) { +// Download Protection is not supported on Android. +#if BUILDFLAG(FULL_SAFE_BROWSING) safe_browsing::SafeBrowsingService* sb_service = g_browser_process->safe_browsing_service(); @@ -631,6 +633,7 @@ base::Bind(&InterpretSafeBrowsingVerdict, base::Bind(&FileSelectHelper::ProceedWithSafeBrowsingVerdict, this, default_file_path, base::Passed(¶ms)))); +#endif } void FileSelectHelper::ProceedWithSafeBrowsingVerdict(
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc index 28f4ae1..b2900f1e 100644 --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc
@@ -992,7 +992,9 @@ const char kHandwritingGestureName[] = "Handwriting Gestures"; const char kHandwritingGestureDescription[] = - "Enables handwriting gestures within the virtual keyboard"; + "Enables handwriting gestures within the virtual keyboard. This will send " + "handwriting you write inside the virtual keyboard to Google servers for " + "recognition but will not be associated with your Google account."; const char kHardwareMediaKeyHandling[] = "Hardware Media Key Handling"; const char kHardwareMediaKeyHandlingDescription[] =
diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn index 3cde6c0..1347b7ca 100644 --- a/chrome/browser/flags/BUILD.gn +++ b/chrome/browser/flags/BUILD.gn
@@ -7,6 +7,7 @@ android_library("java") { sources = [ "android/java/src/org/chromium/chrome/browser/flags/BooleanCachedFieldTrialParameter.java", + "android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java", "android/java/src/org/chromium/chrome/browser/flags/CachedFieldTrialParameter.java", "android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java", "android/java/src/org/chromium/chrome/browser/flags/IntCachedFieldTrialParameter.java", @@ -23,10 +24,22 @@ generate_jni("jni_headers") { sources = [ + "android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java", "android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java", ] } +static_library("flags_android") { + sources = [ + "android/cached_feature_flags.cc", + "android/cached_feature_flags.h", + ] + deps = [ + "//base", + "//content/public/common", + ] +} + java_cpp_strings("chrome_android_java_switches_srcjar") { sources = [ "//chrome/common/chrome_switches.cc" ] template = "android/java_templates/ChromeSwitches.java.tmpl" @@ -37,6 +50,8 @@ bypass_platform_checks = true testonly = true sources = [ + "android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlagsAnnotationUnitTest.java", + "android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlagsUnitTest.java", "android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureListWithProcessorUnitTest.java", "android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureListWithoutProcessorUnitTest.java", ]
diff --git a/chrome/browser/android/cached_feature_flags.cc b/chrome/browser/flags/android/cached_feature_flags.cc similarity index 90% rename from chrome/browser/android/cached_feature_flags.cc rename to chrome/browser/flags/android/cached_feature_flags.cc index ab43889..21a8ef3 100644 --- a/chrome/browser/android/cached_feature_flags.cc +++ b/chrome/browser/flags/android/cached_feature_flags.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/android/cached_feature_flags.h" +#include "chrome/browser/flags/android/cached_feature_flags.h" -#include "chrome/android/chrome_jni_headers/CachedFeatureFlags_jni.h" +#include "chrome/browser/flags/jni_headers/CachedFeatureFlags_jni.h" #include "base/android/jni_string.h" #include "base/feature_list.h"
diff --git a/chrome/browser/android/cached_feature_flags.h b/chrome/browser/flags/android/cached_feature_flags.h similarity index 76% rename from chrome/browser/android/cached_feature_flags.h rename to chrome/browser/flags/android/cached_feature_flags.h index 36f67cb..03d2e33 100644 --- a/chrome/browser/android/cached_feature_flags.h +++ b/chrome/browser/flags/android/cached_feature_flags.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_ANDROID_CACHED_FEATURE_FLAGS_H_ -#define CHROME_BROWSER_ANDROID_CACHED_FEATURE_FLAGS_H_ +#ifndef CHROME_BROWSER_FLAGS_ANDROID_CACHED_FEATURE_FLAGS_H_ +#define CHROME_BROWSER_FLAGS_ANDROID_CACHED_FEATURE_FLAGS_H_ #include <jni.h> @@ -25,4 +25,4 @@ } // namespace android } // namespace chrome -#endif // CHROME_BROWSER_ANDROID_CACHED_FEATURE_FLAGS_H_ +#endif // CHROME_BROWSER_FLAGS_ANDROID_CACHED_FEATURE_FLAGS_H_
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java similarity index 100% rename from chrome/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java rename to chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/flags/CachedFeatureFlagsAnnotationUnitTest.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlagsAnnotationUnitTest.java similarity index 100% rename from chrome/android/junit/src/org/chromium/chrome/browser/flags/CachedFeatureFlagsAnnotationUnitTest.java rename to chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlagsAnnotationUnitTest.java
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/flags/CachedFeatureFlagsUnitTest.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlagsUnitTest.java similarity index 100% rename from chrome/android/junit/src/org/chromium/chrome/browser/flags/CachedFeatureFlagsUnitTest.java rename to chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlagsUnitTest.java
diff --git a/chrome/browser/importer/importer_list.cc b/chrome/browser/importer/importer_list.cc index 6b3bfe25..230fb4b 100644 --- a/chrome/browser/importer/importer_list.cc +++ b/chrome/browser/importer/importer_list.cc
@@ -101,41 +101,45 @@ #else const std::string firefox_install_id; #endif // defined(OS_WIN) - base::FilePath profile_path = GetFirefoxProfilePath(firefox_install_id); - if (profile_path.empty()) + std::vector<FirefoxDetail> details = GetFirefoxDetails(firefox_install_id); + if (details.empty()) return; - // Detects which version of Firefox is installed. - importer::ImporterType firefox_type; - base::FilePath app_path; - int version = 0; + for (auto detail = details.begin(); detail != details.end(); ++detail) { + base::FilePath app_path; + if (detail->path.empty()) + continue; + + int version = 0; #if defined(OS_WIN) - version = GetCurrentFirefoxMajorVersionFromRegistry(); + version = GetCurrentFirefoxMajorVersionFromRegistry(); #endif - if (version < 2) - GetFirefoxVersionAndPathFromProfile(profile_path, &version, &app_path); - if (version >= 3) { - firefox_type = importer::TYPE_FIREFOX; - } else { - // Ignores old versions of firefox. - return; + if (version < 2) { + GetFirefoxVersionAndPathFromProfile(detail->path, &version, &app_path); + // Note that |version| is re-assigned above. + if (version < 2) { + // Ignores old versions of firefox. + continue; + } + } + + importer::SourceProfile firefox; + firefox.importer_name = GetFirefoxImporterName(app_path); + firefox.profile = detail->name; + firefox.importer_type = importer::TYPE_FIREFOX; + firefox.source_path = detail->path; +#if defined(OS_WIN) + firefox.app_path = GetFirefoxInstallPathFromRegistry(); +#endif + if (firefox.app_path.empty()) + firefox.app_path = app_path; + firefox.services_supported = + importer::HISTORY | importer::FAVORITES | importer::PASSWORDS | + importer::SEARCH_ENGINES | importer::AUTOFILL_FORM_DATA; + firefox.locale = locale; + profiles->push_back(firefox); } - - importer::SourceProfile firefox; - firefox.importer_name = GetFirefoxImporterName(app_path); - firefox.importer_type = firefox_type; - firefox.source_path = profile_path; -#if defined(OS_WIN) - firefox.app_path = GetFirefoxInstallPathFromRegistry(); -#endif - if (firefox.app_path.empty()) - firefox.app_path = app_path; - firefox.services_supported = importer::HISTORY | importer::FAVORITES | - importer::PASSWORDS | importer::SEARCH_ENGINES | - importer::AUTOFILL_FORM_DATA; - firefox.locale = locale; - profiles->push_back(firefox); } std::vector<importer::SourceProfile> DetectSourceProfilesWorker(
diff --git a/chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc b/chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc index b63b10e..03a9ee40 100644 --- a/chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc +++ b/chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc
@@ -24,6 +24,7 @@ #include "chrome/common/chrome_paths.h" #include "components/content_settings/core/browser/host_content_settings_map.h" #include "components/content_settings/core/common/content_settings.h" +#include "components/safe_browsing/buildflags.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_frame_host.h" @@ -219,10 +220,10 @@ std::unique_ptr<content::NativeFileSystemWriteItem> item, safe_browsing::CheckDownloadCallback callback) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - + // Download Protection Service is not supported on Android. +#if BUILDFLAG(FULL_SAFE_BROWSING) safe_browsing::SafeBrowsingService* sb_service = g_browser_process->safe_browsing_service(); - if (!sb_service || !sb_service->download_protection_service() || !sb_service->download_protection_service()->enabled()) { std::move(callback).Run(safe_browsing::DownloadCheckResult::UNKNOWN); @@ -248,6 +249,7 @@ sb_service->download_protection_service()->CheckNativeFileSystemWrite( std::move(item), std::move(callback)); +#endif } ChromeNativeFileSystemPermissionContext::AfterWriteCheckResult
diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc index d98e64d4..aab5305 100644 --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -90,6 +90,7 @@ #else // defined(OS_ANDROID) #include "chrome/browser/download/default_download_dir_policy_handler.h" #include "chrome/browser/download/download_dir_policy_handler.h" +#include "chrome/browser/enterprise_reporting/extension_request_policy_handler.h" #include "chrome/browser/media/router/media_router_feature.h" #include "chrome/browser/policy/local_sync_policy_handler.h" #endif // defined(OS_ANDROID) @@ -630,9 +631,6 @@ { key::kWebRtcEventLogCollectionAllowed, prefs::kWebRtcEventLogCollectionAllowed, base::Value::Type::BOOLEAN }, - { key::kCloudExtensionRequestEnabled, - prefs::kCloudExtensionRequestEnabled, - base::Value::Type::BOOLEAN }, { key::kCloudReportingEnabled, prefs::kCloudReportingEnabled, base::Value::Type::BOOLEAN }, @@ -1411,6 +1409,8 @@ chrome_schema.GetValidationSchema(), SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED, SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED)); + handlers->AddHandler( + std::make_unique<enterprise_reporting::ExtensionRequestPolicyHandler>()); #endif // defined(OS_ANDROID) #if defined(OS_CHROMEOS)
diff --git a/chrome/browser/resource_coordinator/tab_activity_watcher.cc b/chrome/browser/resource_coordinator/tab_activity_watcher.cc index 2a8d0b78..b56310e 100644 --- a/chrome/browser/resource_coordinator/tab_activity_watcher.cc +++ b/chrome/browser/resource_coordinator/tab_activity_watcher.cc
@@ -561,6 +561,9 @@ // Set query_id so that all TabFeatures logged in this query can be joined. tab_metrics_logger_->set_query_id(NewInt64ForLabelIdOrQueryId()); + const bool should_sort_tabs = + base::FeatureList::IsEnabled(features::kTabRanker); + std::map<int32_t, base::Optional<TabFeatures>> tab_features; for (auto* lifecycle_unit : *tabs) { auto* lifecycle_unit_external = @@ -583,12 +586,16 @@ } const base::Optional<TabFeatures> tab = web_contents_data->GetTabFeatures(); - tab_features[lifecycle_unit->GetID()] = tab; web_contents_data->LogCurrentTabFeatures(tab); + + // No reason to store TabFeatures if TabRanker is disabled. + if (should_sort_tabs) { + tab_features[lifecycle_unit->GetID()] = tab; + } } - // Directly return if TabRanker is not enabled. - if (!base::FeatureList::IsEnabled(features::kTabRanker)) + // Directly return if TabRanker is disabled. + if (!should_sort_tabs) return; const std::map<int32_t, float> reactivation_scores =
diff --git a/chrome/browser/resource_coordinator/tab_manager_delegate_chromeos_unittest.cc b/chrome/browser/resource_coordinator/tab_manager_delegate_chromeos_unittest.cc index dc1c2d2..8c411cd 100644 --- a/chrome/browser/resource_coordinator/tab_manager_delegate_chromeos_unittest.cc +++ b/chrome/browser/resource_coordinator/tab_manager_delegate_chromeos_unittest.cc
@@ -112,7 +112,8 @@ base::test::ScopedFeatureList feature_list; feature_list.InitAndEnableFeatureWithParameters( features::kTabRanker, - {{"number_of_oldest_tabs_to_score_with_TabRanker", "20"}}); + {{"number_of_oldest_tabs_to_score_with_TabRanker", "20"}, + {"process_type_of_tabs_to_score_with_TabRanker", "4"}}); std::vector<arc::ArcProcess> arc_processes; arc_processes.emplace_back(1, 10, "focused", arc::mojom::ProcessState::TOP, kIsFocused, 99);
diff --git a/chrome/browser/resource_coordinator/tab_manager_features.cc b/chrome/browser/resource_coordinator/tab_manager_features.cc index 2eabf51..5dd116a 100644 --- a/chrome/browser/resource_coordinator/tab_manager_features.cc +++ b/chrome/browser/resource_coordinator/tab_manager_features.cc
@@ -113,12 +113,13 @@ int GetNumOldestTabsToScoreWithTabRanker() { return base::GetFieldTrialParamByFeatureAsInt( - features::kTabRanker, "number_of_oldest_tabs_to_score_with_TabRanker", 0); + features::kTabRanker, "number_of_oldest_tabs_to_score_with_TabRanker", + 50); } int GetProcessTypeToScoreWithTabRanker() { return base::GetFieldTrialParamByFeatureAsInt( - features::kTabRanker, "process_type_of_tabs_to_score_with_TabRanker", 4); + features::kTabRanker, "process_type_of_tabs_to_score_with_TabRanker", 3); } int GetNumOldestTabsToLogWithTabRanker() {
diff --git a/chrome/browser/resources/omnibox/BUILD.gn b/chrome/browser/resources/omnibox/BUILD.gn index dec4ea3..1e3b932 100644 --- a/chrome/browser/resources/omnibox/BUILD.gn +++ b/chrome/browser/resources/omnibox/BUILD.gn
@@ -47,6 +47,7 @@ js_library("omnibox_popup") { deps = [ "//chrome/browser/ui/webui/omnibox:mojo_bindings_js_library_for_compile", + "//ui/webui/resources/cr_components/omnibox:cr_autocomplete_match_list", ] }
diff --git a/chrome/browser/resources/omnibox/omnibox_popup.html b/chrome/browser/resources/omnibox/omnibox_popup.html index ed3dea5..9a6080e 100644 --- a/chrome/browser/resources/omnibox/omnibox_popup.html +++ b/chrome/browser/resources/omnibox/omnibox_popup.html
@@ -6,9 +6,11 @@ <title>Omnibox Popup</title> <link rel="stylesheet" href="chrome://resources/css/text_defaults.css"> <script type="module" src="omnibox_popup.js"></script> + <script type="module" src="chrome://resources/cr_components/omnibox/cr_autocomplete_match_list.js"> + </script> </head> <body> - <ol id="omnibox-results"></ol> + <cr-autocomplete-match-list></cr-autocomplete-match-list> </body> </html>
diff --git a/chrome/browser/resources/omnibox/omnibox_popup.js b/chrome/browser/resources/omnibox/omnibox_popup.js index 1b9a6f9..a6b55b23 100644 --- a/chrome/browser/resources/omnibox/omnibox_popup.js +++ b/chrome/browser/resources/omnibox/omnibox_popup.js
@@ -5,6 +5,8 @@ import 'chrome://resources/mojo/mojo/public/js/mojo_bindings_lite.js'; import './chrome/browser/ui/webui/omnibox/omnibox.mojom-lite.js'; +import {AutocompleteMatchListElement} from 'chrome://resources/cr_components/omnibox/cr_autocomplete_match_list.js'; + /** * Javascript proof-of-concept for omnibox_popup.html, served from * chrome://omnibox/omnibox_popup.html. This is used for the experimental @@ -21,15 +23,11 @@ (response, isPageController) => { // Ignore debug controller and empty results. if (!isPageController && response.combinedResults.length > 0) { - const ol = document.querySelector('#omnibox-results'); - while (ol.firstChild) { - ol.firstChild.remove(); - } - response.combinedResults.forEach(result => { - const li = document.createElement('li'); - li.textContent = `${result.contents} - ${result.description}`; - ol.appendChild(li); - }); + /** @private {!AutocompleteMatchListElement} */ + const popup = /** @type {!AutocompleteMatchListElement} */ ( + document.querySelector('cr-autocomplete-match-list')); + + popup.updateMatches(response.combinedResults); } });
diff --git a/chrome/browser/resources/pdf/metrics.js b/chrome/browser/resources/pdf/metrics.js index 3a0c85c..d1ca0a82 100644 --- a/chrome/browser/resources/pdf/metrics.js +++ b/chrome/browser/resources/pdf/metrics.js
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import {FittingType} from './constants.js'; +import {FittingType, TwoUpViewAction} from './constants.js'; /** * Handles events specific to the PDF viewer and logs the corresponding metrics. @@ -24,6 +24,18 @@ } /** + * Records when the two up view mode is enabled or disabled. + * + * @param {TwoUpViewAction} twoUpViewAction the new TwoUpViewAction. + */ + static recordTwoUpView(twoUpViewAction) { + PDFMetrics.record( + twoUpViewAction === TwoUpViewAction.TWO_UP_VIEW_ENABLE ? + PDFMetrics.UserAction.TWO_UP_VIEW_ENABLE : + PDFMetrics.UserAction.TWO_UP_VIEW_DISABLE); + } + + /** * Records the given action to chrome.metricsPrivate. * * @param {PDFMetrics.UserAction} action @@ -149,7 +161,15 @@ ANNOTATE_STROKE_DEVICE_PEN_FIRST: 33, ANNOTATE_STROKE_DEVICE_PEN: 34, - NUMBER_OF_ACTIONS: 35, + /** Recorded when two-up view mode is enabled. */ + TWO_UP_VIEW_ENABLE_FIRST: 35, + TWO_UP_VIEW_ENABLE: 36, + + /** Recorded when two-up view mode is disabled. */ + TWO_UP_VIEW_DISABLE_FIRST: 37, + TWO_UP_VIEW_DISABLE: 38, + + NUMBER_OF_ACTIONS: 39, }; // Map from UserAction to the 'FIRST' action. These metrics are recorded @@ -224,4 +244,12 @@ PDFMetrics.UserAction.ANNOTATE_STROKE_DEVICE_PEN, PDFMetrics.UserAction.ANNOTATE_STROKE_DEVICE_PEN_FIRST, ], + [ + PDFMetrics.UserAction.TWO_UP_VIEW_ENABLE, + PDFMetrics.UserAction.TWO_UP_VIEW_ENABLE_FIRST, + ], + [ + PDFMetrics.UserAction.TWO_UP_VIEW_DISABLE, + PDFMetrics.UserAction.TWO_UP_VIEW_DISABLE_FIRST, + ], ]);
diff --git a/chrome/browser/resources/pdf/pdf_viewer.js b/chrome/browser/resources/pdf/pdf_viewer.js index 7e5593a..296c0fc 100644 --- a/chrome/browser/resources/pdf/pdf_viewer.js +++ b/chrome/browser/resources/pdf/pdf_viewer.js
@@ -746,7 +746,7 @@ this.toolbar_.annotationAvailable = (e.detail !== TwoUpViewAction.TWO_UP_VIEW_ENABLE); - // TODO(crbug.com/51472): Record to metrics. + PDFMetrics.recordTwoUpView(e.detail); } /**
diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn index febf22d..b51e7505 100644 --- a/chrome/browser/resources/settings/BUILD.gn +++ b/chrome/browser/resources/settings/BUILD.gn
@@ -223,6 +223,7 @@ "a11y_page:closure_compile_module", "about_page:closure_compile_module", "appearance_page:closure_compile_module", + "autofill_page:closure_compile_module", "basic_page:closure_compile_module", "clear_browsing_data_dialog:closure_compile_module", "controls:closure_compile_module", @@ -267,8 +268,9 @@ ":lifetime_browser_proxy.m", #":metrics_browser_proxy.m", - #":open_window_proxy.m", + ":open_window_proxy.m", ":page_visibility.m", + ":plural_string_proxy.m", ":route.m", ":router.m", ":search_settings.m", @@ -323,9 +325,7 @@ sources = [ "$root_gen_dir/chrome/browser/resources/settings/open_window_proxy.m.js", ] - deps = [ - # TODO: Fill those in. - ] + deps = [ "//ui/webui/resources/js:cr.m" ] extra_deps = [ ":modulize" ] } @@ -336,6 +336,14 @@ extra_deps = [ ":modulize" ] } +js_library("plural_string_proxy.m") { + sources = [ + "$root_gen_dir/chrome/browser/resources/settings/plural_string_proxy.m.js", + ] + deps = [ "//ui/webui/resources/js:cr.m" ] + extra_deps = [ ":modulize" ] +} + js_library("route.m") { sources = [ "$root_gen_dir/chrome/browser/resources/settings/route.m.js" ] deps = [
diff --git a/chrome/browser/resources/settings/autofill_page/BUILD.gn b/chrome/browser/resources/settings/autofill_page/BUILD.gn index 0bbe17b..5b45a19 100644 --- a/chrome/browser/resources/settings/autofill_page/BUILD.gn +++ b/chrome/browser/resources/settings/autofill_page/BUILD.gn
@@ -3,6 +3,9 @@ # found in the LICENSE file. import("//third_party/closure_compiler/compile_js.gni") +import("//tools/polymer/polymer.gni") +import("//ui/webui/resources/tools/js_modulizer.gni") +import("../settings.gni") js_type_check("closure_compile") { deps = [ @@ -87,6 +90,7 @@ js_library("credit_card_list_entry") { deps = [ "//ui/webui/resources/js:i18n_behavior" ] + externs_list = [ "$externs_path/autofill_private.js" ] } js_library("password_check") { @@ -166,40 +170,53 @@ deps = [ "//ui/webui/resources/js:i18n_behavior" ] } -# TODO(crbug.com/1026426): Fix and enable. -#js_type_check("closure_compile_module") { -# is_polymer3 = true -# deps = [ -# ":address_edit_dialog.m", -# ":autofill_page.m", -# ":autofill_section.m", -# ":blocking_request_manager.m", -# ":credit_card_edit_dialog.m", -# ":credit_card_list_entry.m", -# ":password_edit_dialog.m", -# ":password_list_item.m", -# ":password_manager_proxy.m", -# ":passwords_export_dialog.m", -# ":passwords_section.m", -# ":payments_list.m", -# ":payments_section.m", -# ":show_password_behavior.m", -# ":upi_id_list_entry.m", -# ] -#} +js_type_check("closure_compile_module") { + is_polymer3 = true + deps = [ + ":address_edit_dialog.m", + ":autofill_page.m", + ":autofill_section.m", + ":blocking_request_manager.m", + ":credit_card_edit_dialog.m", + ":credit_card_list_entry.m", + ":password_check.m", + ":password_check_list_item.m", + ":password_edit_dialog.m", + ":password_list_item.m", + ":password_manager_proxy.m", + ":passwords_export_dialog.m", + ":passwords_section.m", + ":payments_list.m", + ":payments_section.m", + ":show_password_behavior.m", + ":upi_id_list_entry.m", + ] +} js_library("address_edit_dialog.m") { sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/address_edit_dialog.m.js" ] deps = [ - # TODO: Fill those in. + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m", + "//ui/webui/resources/js:assert.m", + "//ui/webui/resources/js:cr.m", + "//ui/webui/resources/js:i18n_behavior.m", ] + externs_list = [ "$externs_path/autofill_private.js" ] extra_deps = [ ":address_edit_dialog_module" ] } js_library("autofill_page.m") { sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/autofill_page.m.js" ] deps = [ - # TODO: Fill those in. + "..:open_window_proxy.m", + "..:route.m", + "..:router.m", + "../prefs:prefs_behavior.m", + ] + externs_list = [ + "$externs_path/passwords_private.js", + "$externs_path/settings_private.js", ] extra_deps = [ ":autofill_page_module" ] } @@ -207,39 +224,75 @@ js_library("autofill_section.m") { sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/autofill_section.m.js" ] deps = [ - # TODO: Fill those in. + ":address_edit_dialog.m", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu.m", + "//ui/webui/resources/js:assert.m", + "//ui/webui/resources/js:cr.m", + "//ui/webui/resources/js:load_time_data.m", + "//ui/webui/resources/js/cr/ui:focus_without_ink.m", + ] + externs_list = [ + "$externs_path/autofill_private.js", + "$externs_path/metrics_private.js", ] extra_deps = [ ":autofill_section_module" ] } js_library("blocking_request_manager.m") { sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/blocking_request_manager.m.js" ] - deps = [ - # TODO: Fill those in. - ] extra_deps = [ ":modulize" ] } js_library("credit_card_edit_dialog.m") { sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/credit_card_edit_dialog.m.js" ] deps = [ - # TODO: Fill those in. + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m", + "//ui/webui/resources/js:i18n_behavior.m", ] + externs_list = [ "$externs_path/autofill_private.js" ] extra_deps = [ ":credit_card_edit_dialog_module" ] } js_library("credit_card_list_entry.m") { sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/credit_card_list_entry.m.js" ] deps = [ - # TODO: Fill those in. + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + "//ui/webui/resources/js:i18n_behavior.m", ] + externs_list = [ "$externs_path/autofill_private.js" ] extra_deps = [ ":credit_card_list_entry_module" ] } +js_library("password_check.m") { + sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/password_check.m.js" ] + deps = [ + ":password_manager_proxy.m", + "..:plural_string_proxy.m", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + "//ui/webui/resources/js:i18n_behavior.m", + ] + extra_deps = [ ":password_check_module" ] +} + +js_library("password_check_list_item.m") { + sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/password_check_list_item.m.js" ] + deps = [ + ":password_manager_proxy.m", + "..:open_window_proxy.m", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + "//ui/webui/resources/js:i18n_behavior", + ] + extra_deps = [ ":password_check_list_item_module" ] +} + js_library("password_edit_dialog.m") { sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/password_edit_dialog.m.js" ] deps = [ - # TODO: Fill those in. + ":show_password_behavior.m", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + "//ui/webui/resources/cr_elements/cr_input:cr_input.m", ] extra_deps = [ ":password_edit_dialog_module" ] } @@ -247,23 +300,25 @@ js_library("password_list_item.m") { sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/password_list_item.m.js" ] deps = [ - # TODO: Fill those in. + ":show_password_behavior.m", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + "//ui/webui/resources/js:load_time_data.m", + "//ui/webui/resources/js/cr/ui:focus_row_behavior.m", ] extra_deps = [ ":password_list_item_module" ] } js_library("password_manager_proxy.m") { sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/password_manager_proxy.m.js" ] - deps = [ - # TODO: Fill those in. - ] + deps = [ "//ui/webui/resources/js:cr.m" ] extra_deps = [ ":modulize" ] } js_library("passwords_export_dialog.m") { sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/passwords_export_dialog.m.js" ] deps = [ - # TODO: Fill those in. + ":blocking_request_manager.m", + ":password_manager_proxy.m", ] extra_deps = [ ":passwords_export_dialog_module" ] } @@ -271,7 +326,27 @@ js_library("passwords_section.m") { sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/passwords_section.m.js" ] deps = [ - # TODO: Fill those in. + ":password_edit_dialog.m", + ":password_list_item.m", + ":password_manager_proxy.m", + "..:global_scroll_target_behavior.m", + "..:route.m", + "../people_page:sync_browser_proxy.m", + "../prefs:prefs_behavior.m", + "//third_party/polymer/v3_0/components-chromium/iron-a11y-announcer:iron-a11y-announcer", + "//third_party/polymer/v3_0/components-chromium/iron-a11y-keys-behavior:iron-a11y-keys-behavior", + "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu.m", + "//ui/webui/resources/cr_elements/cr_toast:cr_toast_manager.m", + "//ui/webui/resources/js:assert.m", + "//ui/webui/resources/js:i18n_behavior.m", + "//ui/webui/resources/js:list_property_update_behavior.m", + "//ui/webui/resources/js:util.m", + "//ui/webui/resources/js:web_ui_listener_behavior.m", + "//ui/webui/resources/js/cr/ui:focus_without_ink.m", + ] + externs_list = [ + "$externs_path/passwords_private.js", + "$externs_path/quick_unlock_private.js", ] extra_deps = [ ":passwords_section_module" ] } @@ -279,7 +354,11 @@ js_library("payments_list.m") { sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/payments_list.m.js" ] deps = [ - # TODO: Fill those in. + ":credit_card_list_entry.m", + ":upi_id_list_entry.m", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + "//ui/webui/resources/js:i18n_behavior.m", + "//ui/webui/resources/js:load_time_data.m", ] extra_deps = [ ":payments_list_module" ] } @@ -287,31 +366,42 @@ js_library("payments_section.m") { sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/payments_section.m.js" ] deps = [ - # TODO: Fill those in. + ":autofill_section.m", + ":credit_card_edit_dialog.m", + ":payments_list.m", + "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu.m", + "//ui/webui/resources/js:assert.m", + "//ui/webui/resources/js:cr.m", + "//ui/webui/resources/js:i18n_behavior.m", + "//ui/webui/resources/js:load_time_data.m", + "//ui/webui/resources/js:web_ui_listener_behavior.m", + "//ui/webui/resources/js/cr/ui:focus_without_ink.m", ] + externs_list = [ "$externs_path/autofill_private.js" ] extra_deps = [ ":payments_section_module" ] } js_library("show_password_behavior.m") { sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/show_password_behavior.m.js" ] deps = [ - # TODO: Fill those in. + ":blocking_request_manager.m", + ":password_manager_proxy.m", ] + externs_list = [ "$externs_path/passwords_private.js" ] extra_deps = [ ":modulize" ] } js_library("upi_id_list_entry.m") { sources = [ "$root_gen_dir/chrome/browser/resources/settings/autofill_page/upi_id_list_entry.m.js" ] deps = [ - # TODO: Fill those in. + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + "//ui/webui/resources/js:i18n_behavior.m", ] extra_deps = [ ":upi_id_list_entry_module" ] } -import("//tools/polymer/polymer.gni") - group("polymer3_elements") { - deps = [ + public_deps = [ ":address_edit_dialog_module", ":autofill_page_module", ":autofill_section_module", @@ -335,18 +425,38 @@ js_file = "address_edit_dialog.js" html_file = "address_edit_dialog.html" html_type = "dom-module" + auto_imports = [ + "ui/webui/resources/html/assert.html|assertNotReached", + "ui/webui/resources/html/cr.html|addSingletonGetter", + "ui/webui/resources/html/polymer.html|html,flush,Polymer", + ] + namespace_rewrites = + settings_namespace_rewrites + + [ "settings.address.AddressComponentUI|AddressComponentUI" ] } polymer_modulizer("autofill_page") { js_file = "autofill_page.js" html_file = "autofill_page.html" html_type = "dom-module" + auto_imports = settings_auto_imports + [ + "chrome/browser/resources/settings/autofill_page/password_manager_proxy.html|PasswordManagerImpl", + "chrome/browser/resources/settings/open_window_proxy.html|OpenWindowProxyImpl", + "chrome/browser/resources/settings/route.html|routes", + "chrome/browser/resources/settings/router.html|Router", + ] + namespace_rewrites = settings_namespace_rewrites } polymer_modulizer("autofill_section") { js_file = "autofill_section.js" html_file = "autofill_section.html" html_type = "dom-module" + auto_imports = settings_auto_imports + [ + "ui/webui/resources/html/assert.html|assert", + "ui/webui/resources/html/cr.html|addSingletonGetter", + ] + namespace_rewrites = settings_namespace_rewrites } polymer_modulizer("credit_card_edit_dialog") { @@ -359,42 +469,71 @@ js_file = "credit_card_list_entry.js" html_file = "credit_card_list_entry.html" html_type = "dom-module" + namespace_rewrites = settings_namespace_rewrites } polymer_modulizer("password_check") { js_file = "password_check.js" html_file = "password_check.html" html_type = "dom-module" + auto_imports = [ + "chrome/browser/resources/settings/autofill_page/password_manager_proxy.html|PasswordManagerImpl,PasswordManagerProxy", + "chrome/browser/resources/settings/plural_string_proxy.html|PluralStringProxyImpl", + "ui/webui/resources/html/assert.html|assert", + ] + namespace_rewrites = settings_namespace_rewrites } polymer_modulizer("password_check_list_item") { js_file = "password_check_list_item.js" html_file = "password_check_list_item.html" html_type = "dom-module" + auto_imports = [ + "chrome/browser/resources/settings/open_window_proxy.html|OpenWindowProxyImpl", + "chrome/browser/resources/settings/autofill_page/password_manager_proxy.html|PasswordManagerProxy", + ] + namespace_rewrites = settings_namespace_rewrites } polymer_modulizer("password_edit_dialog") { js_file = "password_edit_dialog.js" html_file = "password_edit_dialog.html" html_type = "dom-module" + auto_imports = settings_auto_imports } polymer_modulizer("password_list_item") { js_file = "password_list_item.js" html_file = "password_list_item.html" html_type = "dom-module" + auto_imports = settings_auto_imports + [ "chrome/browser/resources/settings/autofill_page/password_manager_proxy.html|PasswordManagerProxy" ] } polymer_modulizer("passwords_export_dialog") { js_file = "passwords_export_dialog.js" html_file = "passwords_export_dialog.html" html_type = "dom-module" + namespace_rewrites = settings_namespace_rewrites + auto_imports = settings_auto_imports + [ "chrome/browser/resources/settings/autofill_page/password_manager_proxy.html|PasswordManagerImpl, PasswordManagerProxy" ] } polymer_modulizer("passwords_section") { js_file = "passwords_section.js" html_file = "passwords_section.html" html_type = "dom-module" + namespace_rewrites = settings_namespace_rewrites + + [ "Polymer.IronA11yKeysBehavior|IronA11yKeysBehavior" ] + auto_imports = settings_auto_imports + [ + "chrome/browser/resources/settings/autofill_page/password_manager_proxy.html|PasswordManagerImpl,PasswordManagerProxy", + "chrome/browser/resources/settings/people_page/sync_browser_proxy.html|SyncBrowserProxyImpl,SyncPrefs,SyncStatus", + "chrome/browser/resources/settings/route.html|routes", + "chrome/browser/resources/settings/router.html|Router", + "third_party/polymer/v1_0/components-chromium/iron-a11y-keys-behavior/iron-a11y-keys-behavior.html|IronA11yKeysBehavior", + "ui/webui/resources/cr_elements/cr_toast/cr_toast_manager.html|getToastManager", + "ui/webui/resources/html/assert.html|assert", + "ui/webui/resources/html/polymer.html|afterNextRender,html,Polymer", + "ui/webui/resources/html/util.html|getDeepActiveElement", + ] } polymer_modulizer("passwords_shared_css") { @@ -407,12 +546,21 @@ js_file = "payments_list.js" html_file = "payments_list.html" html_type = "dom-module" + auto_imports = settings_auto_imports + namespace_rewrites = settings_namespace_rewrites } polymer_modulizer("payments_section") { js_file = "payments_section.js" html_file = "payments_section.html" html_type = "dom-module" + auto_imports = settings_auto_imports + [ + "chrome/browser/resources/settings/autofill_page/autofill_section.html|AutofillManager", + "ui/webui/resources/html/assert.html|assert", + "ui/webui/resources/html/cr.html|addSingletonGetter", + ] + namespace_rewrites = settings_namespace_rewrites + + [ "settings.PaymentsManager|PaymentsManager" ] } polymer_modulizer("upi_id_list_entry") { @@ -421,12 +569,11 @@ html_type = "dom-module" } -import("//ui/webui/resources/tools/js_modulizer.gni") - js_modulizer("modulize") { input_files = [ "blocking_request_manager.js", "password_manager_proxy.js", "show_password_behavior.js", ] + namespace_rewrites = settings_namespace_rewrites }
diff --git a/chrome/browser/resources/settings/autofill_page/address_edit_dialog.html b/chrome/browser/resources/settings/autofill_page/address_edit_dialog.html index d91745b1..f6be408 100644 --- a/chrome/browser/resources/settings/autofill_page/address_edit_dialog.html +++ b/chrome/browser/resources/settings/autofill_page/address_edit_dialog.html
@@ -5,6 +5,7 @@ <link rel="import" href="chrome://resources/cr_elements/cr_input/cr_input.html"> <link rel="import" href="chrome://resources/cr_elements/shared_style_css.html"> <link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html"> +<link rel="import" href="chrome://resources/html/assert.html"> <link rel="import" href="chrome://resources/html/cr.html"> <link rel="import" href="chrome://resources/html/i18n_behavior.html"> <link rel="import" href="chrome://resources/cr_elements/md_select_css.html">
diff --git a/chrome/browser/resources/settings/autofill_page/address_edit_dialog.js b/chrome/browser/resources/settings/autofill_page/address_edit_dialog.js index 28aa9f81..c6bf23a 100644 --- a/chrome/browser/resources/settings/autofill_page/address_edit_dialog.js +++ b/chrome/browser/resources/settings/autofill_page/address_edit_dialog.js
@@ -3,8 +3,8 @@ // found in the LICENSE file. /** - * @fileoverview 'password-edit-dialog' is the dialog that allows showing a - * saved password. + * @fileoverview 'address-edit-dialog' is the dialog that allows editing a saved + * address. */ cr.define('settings.address', function() { Polymer({ @@ -318,7 +318,7 @@ * Default implementation. Override for testing. * @implements {settings.address.CountryDetailManager} */ - class CountryDetailManagerImpl { + /* #export */ class CountryDetailManagerImpl { /** @override */ getCountryList() { return new Promise(function(callback) {
diff --git a/chrome/browser/resources/settings/autofill_page/autofill_page.html b/chrome/browser/resources/settings/autofill_page/autofill_page.html index 476c7d48..30f4dbf 100644 --- a/chrome/browser/resources/settings/autofill_page/autofill_page.html +++ b/chrome/browser/resources/settings/autofill_page/autofill_page.html
@@ -3,6 +3,7 @@ <link rel="import" href="chrome://resources/cr_elements/cr_link_row/cr_link_row.html"> <link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html"> <link rel="import" href="chrome://resources/html/cr.html"> +<link rel="import" href="../i18n_setup.html"> <link rel="import" href="../prefs/prefs.html"> <link rel="import" href="../prefs/prefs_behavior.html"> <link rel="import" href="../open_window_proxy.html">
diff --git a/chrome/browser/resources/settings/autofill_page/autofill_section.html b/chrome/browser/resources/settings/autofill_page/autofill_section.html index 58164cb1..71b7ae2 100644 --- a/chrome/browser/resources/settings/autofill_page/autofill_section.html +++ b/chrome/browser/resources/settings/autofill_page/autofill_section.html
@@ -4,6 +4,7 @@ <link rel="import" href="chrome://resources/cr_elements/cr_button/cr_button.html"> <link rel="import" href="chrome://resources/cr_elements/cr_icon_button/cr_icon_button.html"> <link rel="import" href="chrome://resources/html/assert.html"> +<link rel="import" href="chrome://resources/html/cr.html"> <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html"> <link rel="import" href="../i18n_setup.html"> <link rel="import" href="../settings_shared_css.html"> @@ -11,6 +12,7 @@ <link rel="import" href="../controls/settings_toggle_button.html"> <link rel="import" href="../prefs/prefs.html"> <link rel="import" href="address_edit_dialog.html"> +<link rel="import" href="credit_card_list_entry.html"> <link rel="import" href="passwords_shared_css.html"> <dom-module id="settings-autofill-section">
diff --git a/chrome/browser/resources/settings/autofill_page/autofill_section.js b/chrome/browser/resources/settings/autofill_page/autofill_section.js index 596031c..fc1eda1 100644 --- a/chrome/browser/resources/settings/autofill_page/autofill_section.js +++ b/chrome/browser/resources/settings/autofill_page/autofill_section.js
@@ -12,18 +12,18 @@ * Interface for all callbacks to the autofill API. * @interface */ - class AutofillManager { + /* #export */ class AutofillManager { /** * Add an observer to the list of personal data. * @param {function(!Array<!settings.AutofillManager.AddressEntry>, - * !Array<!settings.PaymentsManager.CreditCardEntry>):void} listener + * !Array<!settings.CreditCardEntry>):void} listener */ setPersonalDataManagerListener(listener) {} /** * Remove an observer from the list of personal data. * @param {function(!Array<!settings.AutofillManager.AddressEntry>, - * !Array<!settings.PaymentsManager.CreditCardEntry>):void} listener + * !Array<!settings.CreditCardEntry>):void} listener */ removePersonalDataManagerListener(listener) {} @@ -51,7 +51,7 @@ * Implementation that accesses the private API. * @implements {settings.AutofillManager} */ - class AutofillManagerImpl { + /* #export */ class AutofillManagerImpl { /** @override */ setPersonalDataManagerListener(listener) { chrome.autofillPrivate.onPersonalDataChanged.addListener(listener); @@ -119,7 +119,7 @@ /** * @type {?function(!Array<!settings.AutofillManager.AddressEntry>, - * !Array<!settings.PaymentsManager.CreditCardEntry>)} + * !Array<!settings.CreditCardEntry>)} * @private */ setPersonalDataListener_: null, @@ -134,7 +134,7 @@ /** * @type {function(!Array<!settings.AutofillManager.AddressEntry>, - * !Array<!settings.PaymentsManager.CreditCardEntry>)} + * !Array<!settings.CreditCardEntry>)} */ const setPersonalDataListener = (addressList, cardList) => { this.addresses = addressList; @@ -162,7 +162,7 @@ this.autofillManager_.removePersonalDataManagerListener( /** @type {function(!Array<!settings.AutofillManager.AddressEntry>, - !Array<!settings.PaymentsManager.CreditCardEntry>)} + !Array<!settings.CreditCardEntry>)} */ (this.setPersonalDataListener_)); }, @@ -195,7 +195,7 @@ e.preventDefault(); this.activeAddress = {}; this.showAddressDialog_ = true; - this.activeDialogAnchor_ = this.$.addAddress; + this.activeDialogAnchor_ = /** @type {HTMLElement} */ (this.$.addAddress); }, /** @private */
diff --git a/chrome/browser/resources/settings/autofill_page/blocking_request_manager.js b/chrome/browser/resources/settings/autofill_page/blocking_request_manager.js index 0a251b11..4eab7b1 100644 --- a/chrome/browser/resources/settings/autofill_page/blocking_request_manager.js +++ b/chrome/browser/resources/settings/autofill_page/blocking_request_manager.js
@@ -7,7 +7,7 @@ * elsewhere in the DOM. */ cr.define('settings', function() { - class BlockingRequestManager { + /* #export */ class BlockingRequestManager { /** * @param {Function=} makeRequest Function to initiate flow for request. If * no function is provided, it defaults to this.resolve, i.e. it
diff --git a/chrome/browser/resources/settings/autofill_page/credit_card_edit_dialog.js b/chrome/browser/resources/settings/autofill_page/credit_card_edit_dialog.js index 7623f51..26394fac 100644 --- a/chrome/browser/resources/settings/autofill_page/credit_card_edit_dialog.js +++ b/chrome/browser/resources/settings/autofill_page/credit_card_edit_dialog.js
@@ -8,7 +8,6 @@ */ (function() { -'use strict'; Polymer({ is: 'settings-credit-card-edit-dialog',
diff --git a/chrome/browser/resources/settings/autofill_page/credit_card_list_entry.html b/chrome/browser/resources/settings/autofill_page/credit_card_list_entry.html index 1d3bbd05..dbc816a 100644 --- a/chrome/browser/resources/settings/autofill_page/credit_card_list_entry.html +++ b/chrome/browser/resources/settings/autofill_page/credit_card_list_entry.html
@@ -2,6 +2,7 @@ <link rel="import" href="chrome://resources/cr_elements/cr_icon_button/cr_icon_button.html"> <link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html"> +<link rel="import" href="chrome://resources/html/i18n_behavior.html"> <link rel="import" href="../i18n_setup.html"> <link rel="import" href="../settings_shared_css.html"> <link rel="import" href="passwords_shared_css.html">
diff --git a/chrome/browser/resources/settings/autofill_page/credit_card_list_entry.js b/chrome/browser/resources/settings/autofill_page/credit_card_list_entry.js index 9de767ca..bcb7c6f5 100644 --- a/chrome/browser/resources/settings/autofill_page/credit_card_list_entry.js +++ b/chrome/browser/resources/settings/autofill_page/credit_card_list_entry.js
@@ -7,44 +7,53 @@ * the settings page. */ -Polymer({ - is: 'settings-credit-card-list-entry', +cr.define('settings', function() { + /** @typedef {chrome.autofillPrivate.CreditCardEntry} */ + /* #export */ let CreditCardEntry; - behaviors: [ - I18nBehavior, - ], + Polymer({ + is: 'settings-credit-card-list-entry', - properties: { + behaviors: [ + I18nBehavior, + ], + + properties: { + /** + * A saved credit card. + * @type {!settings.CreditCardEntry} + */ + creditCard: Object, + }, + /** - * A saved credit card. - * @type {!settings.PaymentsManager.CreditCardEntry} + * Opens the credit card action menu. + * @private */ - creditCard: Object, - }, + onDotsMenuClick_() { + this.fire('dots-card-menu-click', { + creditCard: this.creditCard, + anchorElement: this.$$('#creditCardMenu'), + }); + }, - /** - * Opens the credit card action menu. - * @private - */ - onDotsMenuClick_() { - this.fire('dots-card-menu-click', { - creditCard: this.creditCard, - anchorElement: this.$$('#creditCardMenu'), - }); - }, + /** @private */ + onRemoteEditClick_() { + this.fire('remote-card-menu-click'); + }, - /** @private */ - onRemoteEditClick_() { - this.fire('remote-card-menu-click'); - }, + /** + * The 3-dot menu should not be shown if the card is entirely remote. + * @return {boolean} + * @private + */ + showDots_() { + return !!( + this.creditCard.metadata.isLocal || + this.creditCard.metadata.isCached); + }, + }); - /** - * The 3-dot menu should not be shown if the card is entirely remote. - * @return {boolean} - * @private - */ - showDots_() { - return !!( - this.creditCard.metadata.isLocal || this.creditCard.metadata.isCached); - }, + // #cr_define_end + return {CreditCardEntry: CreditCardEntry}; });
diff --git a/chrome/browser/resources/settings/autofill_page/password_check.html b/chrome/browser/resources/settings/autofill_page/password_check.html index 990e687..73ab383 100644 --- a/chrome/browser/resources/settings/autofill_page/password_check.html +++ b/chrome/browser/resources/settings/autofill_page/password_check.html
@@ -6,10 +6,12 @@ <link rel="import" href="../plural_string_proxy.html"> <link rel="import" href="../settings_shared_css.html"> <link rel="import" href="chrome://resources/cr_elements/icons.html"> +<link rel="import" href="chrome://resources/html/assert.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.html"> <link rel="import" href="chrome://resources/html/i18n_behavior.html"> <link rel="import" href="password_check_list_item.html"> +<link rel="import" href="password_manager_proxy.html"> <dom-module id="settings-password-check"> <template>
diff --git a/chrome/browser/resources/settings/autofill_page/password_check.js b/chrome/browser/resources/settings/autofill_page/password_check.js index 6510f31..1680d67 100644 --- a/chrome/browser/resources/settings/autofill_page/password_check.js +++ b/chrome/browser/resources/settings/autofill_page/password_check.js
@@ -3,7 +3,6 @@ // found in the LICENSE file. (function() { -'use strict'; const CheckState = chrome.passwordsPrivate.PasswordCheckState;
diff --git a/chrome/browser/resources/settings/autofill_page/password_check_list_item.html b/chrome/browser/resources/settings/autofill_page/password_check_list_item.html index 15977ebb..680b3da 100644 --- a/chrome/browser/resources/settings/autofill_page/password_check_list_item.html +++ b/chrome/browser/resources/settings/autofill_page/password_check_list_item.html
@@ -2,8 +2,10 @@ <link rel="import" href="chrome://resources/cr_elements/cr_icon_button/cr_icon_button.html"> <link rel="import" href="chrome://resources/cr_elements/cr_icons_css.html"> +<link rel="import" href="chrome://resources/html/i18n_behavior.html"> <link rel="import" href="../settings_shared_css.html"> <link rel="import" href="../site_favicon.html"> +<link rel="import" href="../open_window_proxy.html"> <link rel="import" href="passwords_shared_css.html"> <link rel="import" href="show_password_behavior.html"> <link rel="import" href="password_manager_proxy.html">
diff --git a/chrome/browser/resources/settings/autofill_page/password_edit_dialog.js b/chrome/browser/resources/settings/autofill_page/password_edit_dialog.js index 59e33f54..6db9c1ee 100644 --- a/chrome/browser/resources/settings/autofill_page/password_edit_dialog.js +++ b/chrome/browser/resources/settings/autofill_page/password_edit_dialog.js
@@ -8,7 +8,6 @@ */ (function() { -'use strict'; Polymer({ is: 'password-edit-dialog',
diff --git a/chrome/browser/resources/settings/autofill_page/password_list_item.html b/chrome/browser/resources/settings/autofill_page/password_list_item.html index 1d7d799..d9fd6a7 100644 --- a/chrome/browser/resources/settings/autofill_page/password_list_item.html +++ b/chrome/browser/resources/settings/autofill_page/password_list_item.html
@@ -3,8 +3,10 @@ <link rel="import" href="chrome://resources/cr_elements/cr_icon_button/cr_icon_button.html"> <link rel="import" href="chrome://resources/cr_elements/cr_icons_css.html"> <link rel="import" href="chrome://resources/html/cr/ui/focus_row_behavior.html"> +<link rel="import" href="../i18n_setup.html"> <link rel="import" href="../settings_shared_css.html"> <link rel="import" href="../site_favicon.html"> +<link rel="import" href="password_manager_proxy.html"> <link rel="import" href="passwords_shared_css.html"> <link rel="import" href="show_password_behavior.html">
diff --git a/chrome/browser/resources/settings/autofill_page/password_manager_proxy.js b/chrome/browser/resources/settings/autofill_page/password_manager_proxy.js index a809bb4..e786defb 100644 --- a/chrome/browser/resources/settings/autofill_page/password_manager_proxy.js +++ b/chrome/browser/resources/settings/autofill_page/password_manager_proxy.js
@@ -7,11 +7,13 @@ * chrome.passwordsPrivate which facilitates testing. */ +// #import {addSingletonGetter} from 'chrome://resources/js/cr.m.js'; + /** * Interface for all callbacks to the password API. * @interface */ -class PasswordManagerProxy { +/* #export */ class PasswordManagerProxy { /** * Add an observer to the list of saved passwords. * @param {function(!Array<!PasswordManagerProxy.PasswordUiEntry>):void} @@ -228,7 +230,7 @@ * Implementation that accesses the private API. * @implements {PasswordManagerProxy} */ -class PasswordManagerImpl { +/* #export */ class PasswordManagerImpl { /** @override */ addSavedPasswordListChangedListener(listener) { chrome.passwordsPrivate.onSavedPasswordsListChanged.addListener(listener);
diff --git a/chrome/browser/resources/settings/autofill_page/passwords_export_dialog.html b/chrome/browser/resources/settings/autofill_page/passwords_export_dialog.html index ae962e25..67760b5f 100644 --- a/chrome/browser/resources/settings/autofill_page/passwords_export_dialog.html +++ b/chrome/browser/resources/settings/autofill_page/passwords_export_dialog.html
@@ -3,9 +3,11 @@ <link rel="import" href="chrome://resources/cr_elements/cr_button/cr_button.html"> <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html"> <link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html"> +<link rel="import" href="chrome://resources/html/i18n_behavior.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-progress/paper-progress.html"> <link rel="import" href="../settings_shared_css.html"> +<link rel="import" href="password_manager_proxy.html"> <if expr="chromeos"> <link rel="import" href="blocking_request_manager.html"> </if>
diff --git a/chrome/browser/resources/settings/autofill_page/passwords_export_dialog.js b/chrome/browser/resources/settings/autofill_page/passwords_export_dialog.js index 61d2730..2f14f0c 100644 --- a/chrome/browser/resources/settings/autofill_page/passwords_export_dialog.js +++ b/chrome/browser/resources/settings/autofill_page/passwords_export_dialog.js
@@ -8,7 +8,6 @@ */ (function() { -'use strict'; /** * The states of the export passwords dialog. @@ -71,7 +70,7 @@ */ passwordManager_: null, - /** @private {function(!PasswordManagerProxy.PasswordExportProgress):void} */ + /** @private {?function(!PasswordManagerProxy.PasswordExportProgress):void} */ onPasswordsFileExportProgressListener_: null, /** @@ -173,7 +172,11 @@ this.progressTaskToken_ = null; this.delayedCompletionToken_ = null; this.passwordManager_.removePasswordsFileExportProgressListener( - this.onPasswordsFileExportProgressListener_); + /** + * @type {function(!PasswordManagerProxy.PasswordExportProgress): + * void} + */ + (this.onPasswordsFileExportProgressListener_)); this.showStartDialog_ = false; this.showProgressDialog_ = false; this.showErrorDialog_ = false; @@ -225,8 +228,9 @@ return; } if (progress.status == ProgressStatus.FAILED_WRITE_FAILED) { - this.exportErrorMessage = - this.i18n('exportPasswordsFailTitle', progress.folderName); + this.exportErrorMessage = this.i18n( + 'exportPasswordsFailTitle', + /** @type {string} */ (progress.folderName)); this.switchToDialog_(States.ERROR); return; }
diff --git a/chrome/browser/resources/settings/autofill_page/passwords_section.html b/chrome/browser/resources/settings/autofill_page/passwords_section.html index c770bd22..be7bf36 100644 --- a/chrome/browser/resources/settings/autofill_page/passwords_section.html +++ b/chrome/browser/resources/settings/autofill_page/passwords_section.html
@@ -18,6 +18,7 @@ <link rel="import" href="../controls/extension_controlled_indicator.html"> <link rel="import" href="../controls/settings_toggle_button.html"> <link rel="import" href="../global_scroll_target_behavior.html"> +<link rel="import" href="../i18n_setup.html"> <link rel="import" href="../people_page/sync_browser_proxy.html"> <link rel="import" href="../prefs/prefs.html"> <link rel="import" href="../prefs/prefs_behavior.html">
diff --git a/chrome/browser/resources/settings/autofill_page/passwords_section.js b/chrome/browser/resources/settings/autofill_page/passwords_section.js index 5ef383ff..b8b7c2d 100644 --- a/chrome/browser/resources/settings/autofill_page/passwords_section.js +++ b/chrome/browser/resources/settings/autofill_page/passwords_section.js
@@ -15,7 +15,6 @@ let ExceptionEntryEntryEvent; (function() { -'use strict'; /** * Checks if an HTML element is an editable. An editable is either a text @@ -427,7 +426,7 @@ const activeElement = getDeepActiveElement(); if (!activeElement || !isEditable(activeElement)) { this.passwordManager_.undoRemoveSavedPasswordOrException(); - cr.toastManager.getInstance().hide(); + cr.toastManager.getToastManager().hide(); // Preventing the default is necessary to not conflict with a possible // search action. event.preventDefault();
diff --git a/chrome/browser/resources/settings/autofill_page/payments_list.html b/chrome/browser/resources/settings/autofill_page/payments_list.html index 76e29187..4b45054 100644 --- a/chrome/browser/resources/settings/autofill_page/payments_list.html +++ b/chrome/browser/resources/settings/autofill_page/payments_list.html
@@ -1,6 +1,7 @@ <link rel="import" href="chrome://resources/html/polymer.html"> <link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html"> +<link rel="import" href="../i18n_setup.html"> <link rel="import" href="../settings_shared_css.html"> <link rel="import" href="credit_card_list_entry.html"> <link rel="import" href="passwords_shared_css.html">
diff --git a/chrome/browser/resources/settings/autofill_page/payments_list.js b/chrome/browser/resources/settings/autofill_page/payments_list.js index f8b5796..da1e9cf 100644 --- a/chrome/browser/resources/settings/autofill_page/payments_list.js +++ b/chrome/browser/resources/settings/autofill_page/payments_list.js
@@ -13,7 +13,7 @@ properties: { /** * An array of all saved credit cards. - * @type {!Array<!settings.PaymentsManager.CreditCardEntry>} + * @type {!Array<!settings.CreditCardEntry>} */ creditCards: Array,
diff --git a/chrome/browser/resources/settings/autofill_page/payments_section.html b/chrome/browser/resources/settings/autofill_page/payments_section.html index 99e9344a..62862b2 100644 --- a/chrome/browser/resources/settings/autofill_page/payments_section.html +++ b/chrome/browser/resources/settings/autofill_page/payments_section.html
@@ -5,6 +5,8 @@ <link rel="import" href="chrome://resources/cr_elements/cr_link_row/cr_link_row.html"> <link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html"> <link rel="import" href="chrome://resources/html/assert.html"> +<link rel="import" href="chrome://resources/html/cr.html"> +<link rel="import" href="chrome://resources/html/i18n_behavior.html"> <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html"> <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> <link rel="import" href="../i18n_setup.html"> @@ -12,7 +14,9 @@ <link rel="import" href="../controls/settings_toggle_button.html"> <link rel="import" href="../prefs/prefs.html"> <link rel="import" href="../people_page/sync_browser_proxy.html"> +<link rel="import" href="autofill_section.html"> <link rel="import" href="credit_card_edit_dialog.html"> +<link rel="import" href="credit_card_list_entry.html"> <link rel="import" href="passwords_shared_css.html"> <link rel="import" href="payments_list.html">
diff --git a/chrome/browser/resources/settings/autofill_page/payments_section.js b/chrome/browser/resources/settings/autofill_page/payments_section.js index 983d330f..c0ef62ca 100644 --- a/chrome/browser/resources/settings/autofill_page/payments_section.js +++ b/chrome/browser/resources/settings/autofill_page/payments_section.js
@@ -16,20 +16,20 @@ /** * Add an observer to the list of personal data. * @param {function(!Array<!settings.AutofillManager.AddressEntry>, - * !Array<!settings.PaymentsManager.CreditCardEntry>):void} listener + * !Array<!settings.CreditCardEntry>):void} listener */ setPersonalDataManagerListener(listener) {} /** * Remove an observer from the list of personal data. * @param {function(!Array<!settings.AutofillManager.AddressEntry>, - * !Array<!settings.PaymentsManager.CreditCardEntry>):void} listener + * !Array<!settings.CreditCardEntry>):void} listener */ removePersonalDataManagerListener(listener) {} /** * Request the list of credit cards. - * @param {function(!Array<!settings.PaymentsManager.CreditCardEntry>):void} + * @param {function(!Array<!settings.CreditCardEntry>):void} * callback */ getCreditCardList(callback) {} @@ -44,7 +44,7 @@ /** * Saves the given credit card. - * @param {!settings.PaymentsManager.CreditCardEntry} creditCard + * @param {!settings.CreditCardEntry} creditCard */ saveCreditCard(creditCard) {} @@ -70,14 +70,11 @@ getUpiIdList(callback) {} } - /** @typedef {chrome.autofillPrivate.CreditCardEntry} */ - PaymentsManager.CreditCardEntry; - /** * Implementation that accesses the private API. * @implements {settings.PaymentsManager} */ - class PaymentsManagerImpl { + /* #export */ class PaymentsManagerImpl { /** @override */ setPersonalDataManagerListener(listener) { chrome.autofillPrivate.onPersonalDataChanged.addListener(listener); @@ -142,7 +139,7 @@ properties: { /** * An array of all saved credit cards. - * @type {!Array<!settings.PaymentsManager.CreditCardEntry>} + * @type {!Array<!settings.CreditCardEntry>} */ creditCards: { type: Array, @@ -216,7 +213,7 @@ /** * @type {?function(!Array<!settings.AutofillManager.AddressEntry>, - * !Array<!settings.PaymentsManager.CreditCardEntry>)} + * !Array<!settings.CreditCardEntry>)} * @private */ setPersonalDataListener_: null, @@ -224,7 +221,7 @@ /** @override */ attached() { // Create listener function. - /** @type {function(!Array<!settings.PaymentsManager.CreditCardEntry>)} */ + /** @type {function(!Array<!settings.CreditCardEntry>)} */ const setCreditCardsListener = cardList => { this.creditCards = cardList; }; @@ -241,7 +238,7 @@ /** * @type {function(!Array<!settings.AutofillManager.AddressEntry>, - * !Array<!settings.PaymentsManager.CreditCardEntry>)} + * !Array<!settings.CreditCardEntry>)} */ const setPersonalDataListener = (addressList, cardList) => { this.creditCards = cardList; @@ -275,7 +272,7 @@ this.paymentsManager_.removePersonalDataManagerListener( /** @type {function(!Array<!settings.AutofillManager.AddressEntry>, - !Array<!settings.PaymentsManager.CreditCardEntry>)} + !Array<!settings.CreditCardEntry>)} */ (this.setPersonalDataListener_)); }, @@ -310,7 +307,8 @@ expirationYear: date.getFullYear().toString(), }; this.showCreditCardDialog_ = true; - this.activeDialogAnchor_ = this.$.addCreditCard; + this.activeDialogAnchor_ = + /** @type {HTMLElement} */ (this.$.addCreditCard); }, /** @private */ @@ -404,7 +402,7 @@ }, /** - * @param {!Array<!settings.PaymentsManager.CreditCardEntry>} creditCards + * @param {!Array<!settings.CreditCardEntry>} creditCards * @param {boolean} creditCardEnabled * @return {boolean} Whether to show the migration button. * @private
diff --git a/chrome/browser/resources/settings/autofill_page/show_password_behavior.js b/chrome/browser/resources/settings/autofill_page/show_password_behavior.js index d05ab64d..9992571 100644 --- a/chrome/browser/resources/settings/autofill_page/show_password_behavior.js +++ b/chrome/browser/resources/settings/autofill_page/show_password_behavior.js
@@ -2,13 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +// <if expr="chromeos"> +// #import {BlockingRequestManager} from './blocking_request_manager.m.js'; +// </if> +// #import {PasswordManagerImpl} from './password_manager_proxy.m.js'; + /** * This behavior bundles functionality required to show a password to the user. * It is used by both <password-list-item> and <password-edit-dialog>. * * @polymerBehavior */ -const ShowPasswordBehavior = { +/* #export */ const ShowPasswordBehavior = { properties: { /**
diff --git a/chrome/browser/resources/settings/autofill_page/upi_id_list_entry.html b/chrome/browser/resources/settings/autofill_page/upi_id_list_entry.html index 25d4918..1ed8e40 100644 --- a/chrome/browser/resources/settings/autofill_page/upi_id_list_entry.html +++ b/chrome/browser/resources/settings/autofill_page/upi_id_list_entry.html
@@ -2,6 +2,7 @@ <link rel="import" href="chrome://resources/cr_elements/cr_icon_button/cr_icon_button.html"> <link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html"> +<link rel="import" href="chrome://resources/html/i18n_behavior.html"> <link rel="import" href="../i18n_setup.html"> <link rel="import" href="../settings_shared_css.html">
diff --git a/chrome/browser/resources/settings/open_window_proxy.js b/chrome/browser/resources/settings/open_window_proxy.js index d36ea28e..b8458229 100644 --- a/chrome/browser/resources/settings/open_window_proxy.js +++ b/chrome/browser/resources/settings/open_window_proxy.js
@@ -7,6 +7,8 @@ * the browser. */ +// #import {addSingletonGetter} from 'chrome://resources/js/cr.m.js'; + cr.define('settings', function() { /** @interface */ class OpenWindowProxy { @@ -18,7 +20,7 @@ } /** @implements {settings.OpenWindowProxy} */ - class OpenWindowProxyImpl { + /* #export */ class OpenWindowProxyImpl { /** @override */ openURL(url) { window.open(url);
diff --git a/chrome/browser/resources/settings/people_page/BUILD.gn b/chrome/browser/resources/settings/people_page/BUILD.gn index dcd3db1..63b906e 100644 --- a/chrome/browser/resources/settings/people_page/BUILD.gn +++ b/chrome/browser/resources/settings/people_page/BUILD.gn
@@ -339,8 +339,6 @@ "profile_info_browser_proxy.js", "sync_browser_proxy.js", ] - namespace_rewrites = settings_namespace_rewrites + [ - "settings.StoredAccount|StoredAccount", - "settings.SyncPrefs|SyncPrefs", - ] + namespace_rewrites = + settings_namespace_rewrites + [ "settings.StoredAccount|StoredAccount" ] }
diff --git a/chrome/browser/resources/settings/people_page/import_data_browser_proxy.js b/chrome/browser/resources/settings/people_page/import_data_browser_proxy.js index 580abd86..afb4cb38 100644 --- a/chrome/browser/resources/settings/people_page/import_data_browser_proxy.js +++ b/chrome/browser/resources/settings/people_page/import_data_browser_proxy.js
@@ -9,6 +9,7 @@ * @typedef {{ * name: string, * index: number, + * profileName: string, * history: boolean, * favorites: boolean, * passwords: boolean,
diff --git a/chrome/browser/resources/settings/people_page/import_data_dialog.html b/chrome/browser/resources/settings/people_page/import_data_dialog.html index c644c6c9..f3d6ac9 100644 --- a/chrome/browser/resources/settings/people_page/import_data_dialog.html +++ b/chrome/browser/resources/settings/people_page/import_data_dialog.html
@@ -64,7 +64,12 @@ aria-label="$i18n{importFromLabel}" on-change="onBrowserProfileSelectionChange_"> <template is="dom-repeat" items="[[browserProfiles_]]"> - <option value="[[item.index]]">[[item.name]]</option> + <option value="[[item.index]]"> + [[item.name]] + <span hidden$="[[!item.profileName]]"> + - [[item.profileName]] + </span> + </option> </template> </select> <div class="description">$i18n{importDescription}</div>
diff --git a/chrome/browser/resources/settings/people_page/sync_browser_proxy.js b/chrome/browser/resources/settings/people_page/sync_browser_proxy.js index 336e8a2..0a381ce8 100644 --- a/chrome/browser/resources/settings/people_page/sync_browser_proxy.js +++ b/chrome/browser/resources/settings/people_page/sync_browser_proxy.js
@@ -89,7 +89,7 @@ * typedUrlsSynced: boolean, * }} */ - let SyncPrefs; + /* #export */ let SyncPrefs; /** @enum {string} */ /* #export */ const PageStatus = {
diff --git a/chrome/browser/resources/settings/plural_string_proxy.js b/chrome/browser/resources/settings/plural_string_proxy.js index 56df066d..dbb564b 100644 --- a/chrome/browser/resources/settings/plural_string_proxy.js +++ b/chrome/browser/resources/settings/plural_string_proxy.js
@@ -6,6 +6,10 @@ * @fileoverview A helper object used to get a pluralized string. */ +// clang-format off +// #import {addSingletonGetter, sendWithPromise} from 'chrome://resources/js/cr.m.js'; +// clang-format on + cr.define('settings', function() { /** @interface */ class PluralStringProxy { @@ -20,7 +24,7 @@ } /** @implements {settings.PluralStringProxy} */ - class PluralStringProxyImpl { + /* #export */ class PluralStringProxyImpl { /** @override */ getPluralString(messageName, itemCount) { return cr.sendWithPromise('getPluralString', messageName, itemCount);
diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.js b/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.js index a1c6183..2fac4ed 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.js +++ b/chrome/browser/resources/settings/privacy_page/privacy_page_browser_proxy.js
@@ -69,11 +69,18 @@ getSecureDnsSetting() {} /** - * Determines whether the entry contains at least one valid URL template. + * Returns the first valid URL template, if any. * @param {string} entry - * @return {!Promise<boolean>} + * @return {!Promise<string>} */ validateCustomDnsEntry(entry) {} + + /** + * Returns whether a test query to the secure DNS template succeeded. + * @param {string} template + * @return {!Promise<boolean>} + */ + probeCustomDnsTemplate(template) {} } /** @@ -119,6 +126,11 @@ validateCustomDnsEntry(entry) { return cr.sendWithPromise('validateCustomDnsEntry', entry); } + + /** @override */ + probeCustomDnsTemplate(template) { + return cr.sendWithPromise('probeCustomDnsTemplate', template); + } } cr.addSingletonGetter(PrivacyPageBrowserProxyImpl);
diff --git a/chrome/browser/resources/settings/privacy_page/secure_dns_input.js b/chrome/browser/resources/settings/privacy_page/secure_dns_input.js index 40f1071a..f80dcb3c 100644 --- a/chrome/browser/resources/settings/privacy_page/secure_dns_input.js +++ b/chrome/browser/resources/settings/privacy_page/secure_dns_input.js
@@ -49,20 +49,31 @@ /** * When the custom input field loses focus, validate the current value and - * trigger an event with the result. Show an error message if the validated - * value is still the most recent value, is invalid, and is non-empty. + * trigger an event with the result. If the value is valid, also attempt a + * test query. Show an error message if the tested value is still the most + * recent value, is non-empty, and was either invalid or failed the test + * query. + * @private */ - validate: function() { + validate: async function() { + this.showError_ = false; const valueToValidate = this.value; - this.browserProxy_.validateCustomDnsEntry(valueToValidate).then(valid => { - this.showError_ = - valueToValidate === this.value && !valid && valueToValidate !== ''; - if (this.showError_) { - this.errorText_ = loadTimeData.getString('secureDnsCustomFormatError'); - } - - this.fire('value-update', {isValid: valid, text: valueToValidate}); - }); + const validTemplate = + await this.browserProxy_.validateCustomDnsEntry(valueToValidate); + const successfulProbe = validTemplate && + await this.browserProxy_.probeCustomDnsTemplate(validTemplate); + // If there was no valid template or a valid template doesn't successfully + // answer a probe query, show an error as long as the input field value + // hasn't changed and is non-empty. + if (valueToValidate === this.value && this.value !== '' && + !successfulProbe) { + this.errorText_ = loadTimeData.getString( + validTemplate ? 'secureDnsCustomConnectionError' : + 'secureDnsCustomFormatError'); + this.showError_ = true; + } + this.fire( + 'value-update', {isValid: !!validTemplate, text: valueToValidate}); }, /**
diff --git a/chrome/browser/resources/settings/settings.gni b/chrome/browser/resources/settings/settings.gni index 589a27b..c82834d5 100644 --- a/chrome/browser/resources/settings/settings.gni +++ b/chrome/browser/resources/settings/settings.gni
@@ -6,12 +6,16 @@ # targets in Settings. settings_namespace_rewrites = [ "cr_slider.SliderTick|SliderTick", + "settings.address.CountryDetailManager|CountryDetailManager", "settings.AboutPageBrowserProxy|AboutPageBrowserProxy", "settings.AppearanceBrowserProxy|AppearanceBrowserProxy", + "settings.AutofillManager|AutofillManager", + "settings.BlockingRequestManager|BlockingRequestManager", "settings.CaptionsBrowserProxy|CaptionsBrowserProxy", "settings.ChromeCleanupProxy|ChromeCleanupProxy", "settings.ChromeCleanupRemovalListItem|ChromeCleanupRemovalListItem", "settings.ClearBrowsingDataBrowserProxy|ClearBrowsingDataBrowserProxy", + "settings.CreditCardEntry|CreditCardEntry", "settings.DefaultBrowserBrowserProxy|DefaultBrowserBrowserProxy", "settings.DownloadsBrowserProxy|DownloadsBrowserProxy", "settings.EDIT_STARTUP_URL_EVENT|EDIT_STARTUP_URL_EVENT", @@ -26,8 +30,11 @@ "settings.MainPageBehavior|MainPageBehavior", "settings.MinimumRoutes|MinimumRoutes", "settings.OnStartupBrowserProxy|OnStartupBrowserProxy", + "settings.OpenWindowProxy|OpenWindowProxy", "settings.PageStatus|PageStatus", + "settings.PaymentsManager|PaymentsManager", "settings.pageVisibility|pageVisibility", + "settings.PluralStringProxy|PluralStringProxy", "Settings.PrefUtil.prefToString|prefToString", "Settings.PrefUtil.stringToPrefValue|stringToPrefValue", "settings.PrintingBrowserProxy|PrintingBrowserProxy", @@ -40,6 +47,7 @@ "settings.StartupUrlsPageBrowserProxy|StartupUrlsPageBrowserProxy", "settings.StatusAction|StatusAction", "settings.SyncBrowserProxy|SyncBrowserProxy", + "settings.SyncPrefs|SyncPrefs", "settings.SyncStatus|SyncStatus", "settings.SystemPageBrowserProxy|SystemPageBrowserProxy", "settings.RouteObserverBehavior|RouteObserverBehavior", @@ -50,6 +58,9 @@ ] settings_auto_imports = [ + "chrome/browser/resources/settings/autofill_page/blocking_request_manager.html|BlockingRequestManager", + "chrome/browser/resources/settings/autofill_page/credit_card_list_entry.html|CreditCardEntry", + "chrome/browser/resources/settings/autofill_page/show_password_behavior.html|ShowPasswordBehavior", "chrome/browser/resources/settings/controls/pref_control_behavior.html|PrefControlBehavior", "chrome/browser/resources/settings/controls/settings_boolean_control_behavior.html|SettingsBooleanControlBehavior", "chrome/browser/resources/settings/downloads_page/downloads_browser_proxy.html|DownloadsBrowserProxy,DownloadsBrowserProxyImpl",
diff --git a/chrome/browser/resources/settings/settings.js b/chrome/browser/resources/settings/settings.js index 8936056..b876ae5 100644 --- a/chrome/browser/resources/settings/settings.js +++ b/chrome/browser/resources/settings/settings.js
@@ -6,6 +6,9 @@ import './about_page/about_page.m.js'; import './appearance_page/appearance_page.m.js'; import './appearance_page/appearance_fonts_page.m.js'; +import './autofill_page/autofill_page.m.js'; +import './autofill_page/password_check.m.js'; +import './autofill_page/passwords_section.m.js'; import './basic_page/basic_page.m.js'; import './clear_browsing_data_dialog/clear_browsing_data_dialog.m.js'; import './controls/controlled_button.m.js'; @@ -47,6 +50,8 @@ import './languages_page/edit_dictionary_page.m.js'; // </if> +export {getToastManager} from 'chrome://resources/cr_elements/cr_toast/cr_toast_manager.m.js'; + // <if expr="_google_chrome and is_win"> export {CHROME_CLEANUP_DEFAULT_ITEMS_TO_SHOW} from './chrome_cleanup_page/items_to_remove_list.m.js'; export {ChromeCleanupIdleReason} from './chrome_cleanup_page/chrome_cleanup_page.m.js'; @@ -59,9 +64,15 @@ export {SystemPageBrowserProxyImpl} from './system_page/system_page_browser_proxy.m.js'; // </if> +// <if expr="chromeos"> +export {BlockingRequestManager} from './autofill_page/blocking_request_manager.m.js'; +// </if> + export {AboutPageBrowserProxy, AboutPageBrowserProxyImpl, UpdateStatus} from './about_page/about_page_browser_proxy.m.js'; export {AppearanceBrowserProxy, AppearanceBrowserProxyImpl} from './appearance_page/appearance_browser_proxy.m.js'; +export {AutofillManagerImpl} from './autofill_page/autofill_section.m.js'; export {ClearBrowsingDataBrowserProxyImpl} from './clear_browsing_data_dialog/clear_browsing_data_browser_proxy.m.js'; +export {CountryDetailManagerImpl} from './autofill_page/address_edit_dialog.m.js'; export {CrSettingsPrefs} from './prefs/prefs_types.m.js'; export {DownloadsBrowserProxyImpl} from './downloads_page/downloads_browser_proxy.m.js'; export {ExtensionControlBrowserProxyImpl} from './extension_control_browser_proxy.m.js'; @@ -73,8 +84,11 @@ export {OnStartupBrowserProxy, OnStartupBrowserProxyImpl} from './on_startup_page/on_startup_browser_proxy.m.js'; export {EDIT_STARTUP_URL_EVENT} from './on_startup_page/startup_url_entry.m.js'; export {StartupUrlsPageBrowserProxy, StartupUrlsPageBrowserProxyImpl} from './on_startup_page/startup_urls_page_browser_proxy.m.js'; +export {OpenWindowProxyImpl} from './open_window_proxy.m.js'; export {PageStatus, StatusAction, SyncBrowserProxyImpl} from './people_page/sync_browser_proxy.m.js'; export {pageVisibility} from './page_visibility.m.js'; +export {PasswordManagerImpl} from './autofill_page/password_manager_proxy.m.js'; +export {PaymentsManagerImpl} from './autofill_page/payments_section.m.js'; export {prefToString, stringToPrefValue} from './prefs/pref_util.m.js'; export {routes} from './route.m.js'; export {ResetBrowserProxyImpl} from './reset_page/reset_browser_proxy.m.js';
diff --git a/chrome/browser/resources/settings/settings_resources_v3.grdp b/chrome/browser/resources/settings/settings_resources_v3.grdp index 3b0ac886..e9fe0ee6 100644 --- a/chrome/browser/resources/settings/settings_resources_v3.grdp +++ b/chrome/browser/resources/settings/settings_resources_v3.grdp
@@ -50,6 +50,84 @@ file="${root_gen_dir}/chrome/browser/resources/settings/appearance_page/home_url_input.m.js" use_base_dir="false" type="BINDATA" /> + <include name="IDR_SETTINGS_AUTOFILL_PAGE_AUTOFILL_PAGE_M_JS" + file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/autofill_page.m.js" + use_base_dir="false" + type="BINDATA" /> + <include name="IDR_SETTINGS_AUTOFILL_PAGE_PAYMENTS_LIST_M_JS" + file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/payments_list.m.js" + use_base_dir="false" + type="BINDATA" /> + <include name="IDR_SETTINGS_AUTOFILL_PAGE_CREDIT_CARD_LIST_ENTRY_M_JS" + file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/credit_card_list_entry.m.js" + use_base_dir="false" + type="BINDATA" /> + <include name="IDR_SETTINGS_AUTOFILL_PAGE_UPI_ID_LIST_ENTRY_M_JS" + file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/upi_id_list_entry.m.js" + use_base_dir="false" + type="BINDATA" /> + <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORDS_SHARED_CSS_M_JS" + file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/passwords_shared_css.m.js" + use_base_dir="false" + type="BINDATA" /> + <include name="IDR_SETTINGS_AUTOFILL_PAGE_CREDIT_CARD_EDIT_DIALOG_M_JS" + file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/credit_card_edit_dialog.m.js" + use_base_dir="false" + type="BINDATA" /> + <include name="IDR_SETTINGS_AUTOFILL_PAGE_AUTOFILL_SECTION_M_JS" + file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/autofill_section.m.js" + use_base_dir="false" + type="BINDATA" /> + <include name="IDR_SETTINGS_AUTOFILL_PAGE_ADDRESS_EDIT_DIALOG_M_JS" + file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/address_edit_dialog.m.js" + use_base_dir="false" + type="BINDATA" /> + <if expr="chromeos"> + <include name="IDR_SETTINGS_AUTOFILL_PAGE_BLOCKING_REQUEST_MANAGER_M_JS" + file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/blocking_request_manager.m.js" + use_base_dir="false" + type="BINDATA" /> + </if> + <include name="IDR_SETTINGS_AUTOFILL_PAGE_SHOW_PASSWORD_BEHAVIOR_M_JS" + file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/show_password_behavior.m.js" + use_base_dir="false" + type="BINDATA" + preprocess="true" /> + <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORD_CHECK_M_JS" + file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/password_check.m.js" + use_base_dir="false" + type="BINDATA" /> + <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORD_CHECK_LIST_ITEM_M_JS" + file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/password_check_list_item.m.js" + use_base_dir="false" + type="BINDATA" /> + <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORD_LIST_ITEM_M_JS" + file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/password_list_item.m.js" + use_base_dir="false" + type="BINDATA" /> + <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORD_MANAGER_PROXY_M_JS" + file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/password_manager_proxy.m.js" + use_base_dir="false" + type="BINDATA" /> + <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORDS_SECTION_M_JS" + file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/passwords_section.m.js" + use_base_dir="false" + type="BINDATA" + preprocess="true" /> + <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORD_EDIT_DIALOG_M_JS" + file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/password_edit_dialog.m.js" + use_base_dir="false" + type="BINDATA" + preprocess="true" /> + <include name="IDR_SETTINGS_AUTOFILL_PAGE_PASSWORDS_EXPORT_DIALOG_M_JS" + file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/passwords_export_dialog.m.js" + use_base_dir="false" + type="BINDATA" + preprocess="true" /> + <include name="IDR_SETTINGS_AUTOFILL_PAGE_PAYMENTS_SECTION_M_JS" + file="${root_gen_dir}/chrome/browser/resources/settings/autofill_page/payments_section.m.js" + use_base_dir="false" + type="BINDATA" /> <include name="IDR_SETTINGS_BASIC_PAGE_BASIC_PAGE_M_JS" file="${root_gen_dir}/chrome/browser/resources/settings/basic_page/basic_page.m.js" use_base_dir="false" @@ -248,11 +326,19 @@ file="${root_gen_dir}/chrome/browser/resources/settings/on_startup_page/startup_urls_page_browser_proxy.m.js" use_base_dir="false" type="BINDATA" /> + <include name="IDR_SETTINGS_OPEN_WINDOW_PROXY_M_JS" + file="${root_gen_dir}/chrome/browser/resources/settings/open_window_proxy.m.js" + use_base_dir="false" + type="BINDATA" /> <include name="IDR_SETTINGS_PAGE_VISIBILITY_M_JS" file="${root_gen_dir}/chrome/browser/resources/settings/page_visibility.m.js" use_base_dir="false" preprocess="true" type="BINDATA" /> + <include name="IDR_SETTINGS_PLURAL_STRING_PROXY_M_JS" + file="${root_gen_dir}/chrome/browser/resources/settings/plural_string_proxy.m.js" + use_base_dir="false" + type="BINDATA" /> <include name="IDR_SETTINGS_PREFS_PREFS_M_JS" file="${root_gen_dir}/chrome/browser/resources/settings/prefs/prefs.m.js" use_base_dir="false"
diff --git a/chrome/browser/resources/settings/settings_routes.js b/chrome/browser/resources/settings/settings_routes.js index 746c8a6d..770be455d 100644 --- a/chrome/browser/resources/settings/settings_routes.js +++ b/chrome/browser/resources/settings/settings_routes.js
@@ -35,6 +35,7 @@ * CAPTIONS: !settings.Route, * CERTIFICATES: !settings.Route, * CHANGE_PICTURE: !settings.Route, + * CHECK_PASSWORDS: !settings.Route, * CHROME_CLEANUP: !settings.Route, * CLEAR_BROWSER_DATA: !settings.Route, * CLOUD_PRINTERS: !settings.Route,
diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_page.js b/chrome/browser/resources/settings/site_settings_page/site_settings_page.js index c6104715..f1cb2246 100644 --- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.js +++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.js
@@ -118,7 +118,7 @@ label: 'siteSettingsCookies', icon: 'settings:cookie', enabledLabel: 'siteSettingsCookiesAllowed', - disabledLabel: 'siteSettingsCookiesAllowed', + disabledLabel: 'siteSettingsBlocked', otherLabel: 'deleteDataPostSession', }, {
diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsing/BUILD.gn index adbcadf..42cacbd 100644 --- a/chrome/browser/safe_browsing/BUILD.gn +++ b/chrome/browser/safe_browsing/BUILD.gn
@@ -103,20 +103,14 @@ "//chrome/browser/engagement:mojo_bindings", "//chrome/common/safe_browsing:proto", "//components/safe_browsing/content", - "//components/safe_browsing/core:csd_proto", - "//components/safe_browsing/core:file_type_policies", - - # TODO(crbug/996380): This is needed because the DownloadProtectionService - # is being built on Android. Since we don't actually use any - # DownloadProtectionService features on Android, we should fix that - # dependency and move this to the 'safe_browsing_mode == 1' section. "//components/safe_browsing/content/browser", "//components/safe_browsing/content/password_protection", "//components/safe_browsing/content/triggers:ad_popup_trigger", "//components/safe_browsing/content/triggers:ad_redirect_trigger", "//components/safe_browsing/content/triggers:ad_sampler_trigger", "//components/safe_browsing/content/triggers:suspicious_site_trigger", - "//components/safe_browsing/core:webprotect_proto", + "//components/safe_browsing/core:csd_proto", + "//components/safe_browsing/core:file_type_policies", "//components/safe_browsing/core/browser", "//components/safe_browsing/core/common", "//components/safe_browsing/core/common:safe_browsing_prefs", @@ -249,6 +243,7 @@ "//components/content_settings/core/browser", "//components/language/core/common", "//components/prefs", + "//components/safe_browsing/core:webprotect_proto", "//components/safe_browsing/core/db", "//components/security_interstitials/content:security_interstitial_page", "//components/security_interstitials/core:unsafe_resource",
diff --git a/chrome/browser/safe_browsing/android/services_delegate_android.cc b/chrome/browser/safe_browsing/android/services_delegate_android.cc index 5bfd0de..47a0fe5 100644 --- a/chrome/browser/safe_browsing/android/services_delegate_android.cc +++ b/chrome/browser/safe_browsing/android/services_delegate_android.cc
@@ -89,10 +89,6 @@ return nullptr; } -DownloadProtectionService* ServicesDelegateAndroid::GetDownloadService() { - return nullptr; -} - void ServicesDelegateAndroid::StartOnIOThread( scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory, const V4ProtocolConfig& v4_config) {
diff --git a/chrome/browser/safe_browsing/android/services_delegate_android.h b/chrome/browser/safe_browsing/android/services_delegate_android.h index 709454e..436f7a6 100644 --- a/chrome/browser/safe_browsing/android/services_delegate_android.h +++ b/chrome/browser/safe_browsing/android/services_delegate_android.h
@@ -38,7 +38,6 @@ const DelayedAnalysisCallback& callback) override; void AddDownloadManager(content::DownloadManager* download_manager) override; ClientSideDetectionService* GetCsdService() override; - DownloadProtectionService* GetDownloadService() override; void StartOnIOThread( scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
diff --git a/chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_dialog_views.cc b/chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_dialog_views.cc index 91fd152..ffb4e77f 100644 --- a/chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_dialog_views.cc +++ b/chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_dialog_views.cc
@@ -105,7 +105,10 @@ void Update() { SetImage(dialog()->GetTopImage()); } protected: - void OnThemeChanged() override { Update(); } + void OnThemeChanged() override { + views::ImageView::OnThemeChanged(); + Update(); + } }; class DeepScanningSideIconImageView : public DeepScanningBaseView, @@ -123,7 +126,10 @@ } protected: - void OnThemeChanged() override { Update(); } + void OnThemeChanged() override { + views::ImageView::OnThemeChanged(); + Update(); + } }; class DeepScanningSideIconSpinnerView : public DeepScanningBaseView, @@ -139,7 +145,10 @@ } protected: - void OnThemeChanged() override { Update(); } + void OnThemeChanged() override { + views::Throbber::OnThemeChanged(); + Update(); + } }; class DeepScanningMessageView : public DeepScanningBaseView, @@ -153,7 +162,10 @@ } protected: - void OnThemeChanged() override { Update(); } + void OnThemeChanged() override { + views::Label::OnThemeChanged(); + Update(); + } }; // static
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.h b/chrome/browser/safe_browsing/safe_browsing_service.h index 272dbc79..0fda35d 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.h +++ b/chrome/browser/safe_browsing/safe_browsing_service.h
@@ -64,7 +64,9 @@ class PingManager; class VerdictCacheManager; class ClientSideDetectionService; +#if BUILDFLAG(FULL_SAFE_BROWSING) class DownloadProtectionService; +#endif class PasswordProtectionService; class SafeBrowsingDatabaseManager; class SafeBrowsingNavigationObserverManager; @@ -117,11 +119,13 @@ return services_delegate_->GetCsdService(); } +#if BUILDFLAG(FULL_SAFE_BROWSING) // The DownloadProtectionService is not valid after the SafeBrowsingService // is destroyed. DownloadProtectionService* download_protection_service() const { return services_delegate_->GetDownloadService(); } +#endif // NetworkContext and URLLoaderFactory used for safe browsing requests. // Called on UI thread.
diff --git a/chrome/browser/safe_browsing/services_delegate.h b/chrome/browser/safe_browsing/services_delegate.h index 68ba051..6c45aba 100644 --- a/chrome/browser/safe_browsing/services_delegate.h +++ b/chrome/browser/safe_browsing/services_delegate.h
@@ -9,6 +9,7 @@ #include <string> #include "base/memory/ref_counted.h" +#include "build/build_config.h" #include "chrome/browser/safe_browsing/chrome_password_protection_service.h" #include "chrome/browser/safe_browsing/incident_reporting/delayed_analysis_callback.h" #include "components/safe_browsing/content/password_protection/password_protection_service.h" @@ -35,7 +36,9 @@ class BinaryUploadService; class ClientSideDetectionService; +#if !defined(OS_ANDROID) class DownloadProtectionService; +#endif class IncidentReportingService; class PasswordProtectionService; class ResourceRequestDetector; @@ -59,7 +62,9 @@ class ServicesCreator { public: virtual bool CanCreateDatabaseManager() = 0; +#if !defined(OS_ANDROID) virtual bool CanCreateDownloadProtectionService() = 0; +#endif virtual bool CanCreateIncidentReportingService() = 0; virtual bool CanCreateResourceRequestDetector() = 0; virtual bool CanCreateBinaryUploadService() = 0; @@ -67,7 +72,9 @@ // Caller takes ownership of the returned object. Cannot use std::unique_ptr // because services may not be implemented for some build configs. virtual SafeBrowsingDatabaseManager* CreateDatabaseManager() = 0; +#if !defined(OS_ANDROID) virtual DownloadProtectionService* CreateDownloadProtectionService() = 0; +#endif virtual IncidentReportingService* CreateIncidentReportingService() = 0; virtual ResourceRequestDetector* CreateResourceRequestDetector() = 0; virtual BinaryUploadService* CreateBinaryUploadService() = 0; @@ -117,8 +124,9 @@ // Returns nullptr for any service that is not available. virtual ClientSideDetectionService* GetCsdService() = 0; +#if !defined(OS_ANDROID) virtual DownloadProtectionService* GetDownloadService() = 0; - +#endif virtual void StartOnIOThread( scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory, const V4ProtocolConfig& v4_config) = 0;
diff --git a/chrome/browser/safe_browsing/test_safe_browsing_service.cc b/chrome/browser/safe_browsing/test_safe_browsing_service.cc index 13b7b95..b66135f7 100644 --- a/chrome/browser/safe_browsing/test_safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/test_safe_browsing_service.cc
@@ -89,9 +89,11 @@ bool TestSafeBrowsingService::CanCreateDatabaseManager() { return !use_v4_local_db_manager_; } +#if BUILDFLAG(FULL_SAFE_BROWSING) bool TestSafeBrowsingService::CanCreateDownloadProtectionService() { return false; } +#endif bool TestSafeBrowsingService::CanCreateIncidentReportingService() { return true; } @@ -112,11 +114,13 @@ #endif // BUILDFLAG(FULL_SAFE_BROWSING) } +#if BUILDFLAG(FULL_SAFE_BROWSING) DownloadProtectionService* TestSafeBrowsingService::CreateDownloadProtectionService() { NOTIMPLEMENTED(); return nullptr; } +#endif IncidentReportingService* TestSafeBrowsingService::CreateIncidentReportingService() { #if BUILDFLAG(FULL_SAFE_BROWSING)
diff --git a/chrome/browser/safe_browsing/test_safe_browsing_service.h b/chrome/browser/safe_browsing/test_safe_browsing_service.h index f535ad8..fe2ccf27 100644 --- a/chrome/browser/safe_browsing/test_safe_browsing_service.h +++ b/chrome/browser/safe_browsing/test_safe_browsing_service.h
@@ -9,6 +9,7 @@ #include "chrome/browser/safe_browsing/services_delegate.h" #include "chrome/browser/safe_browsing/ui_manager.h" +#include "components/safe_browsing/buildflags.h" #include "components/safe_browsing/core/db/v4_protocol_manager_util.h" namespace safe_browsing { @@ -71,12 +72,16 @@ // ServicesDelegate::ServicesCreator: bool CanCreateDatabaseManager() override; +#if BUILDFLAG(FULL_SAFE_BROWSING) bool CanCreateDownloadProtectionService() override; +#endif bool CanCreateIncidentReportingService() override; bool CanCreateResourceRequestDetector() override; bool CanCreateBinaryUploadService() override; SafeBrowsingDatabaseManager* CreateDatabaseManager() override; +#if BUILDFLAG(FULL_SAFE_BROWSING) DownloadProtectionService* CreateDownloadProtectionService() override; +#endif IncidentReportingService* CreateIncidentReportingService() override; ResourceRequestDetector* CreateResourceRequestDetector() override; BinaryUploadService* CreateBinaryUploadService() override;
diff --git a/chrome/browser/search_provider_logos/logo_service_factory.cc b/chrome/browser/search_provider_logos/logo_service_factory.cc index e00c0fb1..0650a2b 100644 --- a/chrome/browser/search_provider_logos/logo_service_factory.cc +++ b/chrome/browser/search_provider_logos/logo_service_factory.cc
@@ -17,10 +17,6 @@ #include "content/public/browser/storage_partition.h" #include "services/network/public/cpp/shared_url_loader_factory.h" -#if defined(OS_ANDROID) -#include "chrome/browser/android/cached_feature_flags.h" -#endif - using search_provider_logos::LogoService; using search_provider_logos::LogoServiceImpl;
diff --git a/chrome/browser/sessions/session_service_test_helper.cc b/chrome/browser/sessions/session_service_test_helper.cc index c479123..25f2222 100644 --- a/chrome/browser/sessions/session_service_test_helper.cc +++ b/chrome/browser/sessions/session_service_test_helper.cc
@@ -116,10 +116,10 @@ void SessionServiceTestHelper::RunTaskOnBackendThread( const base::Location& from_here, - const base::Closure& task) { + base::OnceClosure task) { sessions::CommandStorageManagerTestHelper test_helper( service_->GetCommandStorageManagerForTest()); - test_helper.RunTaskOnBackendThread(from_here, task); + test_helper.RunTaskOnBackendThread(from_here, std::move(task)); } void SessionServiceTestHelper::SetAvailableRange(
diff --git a/chrome/browser/sessions/session_service_test_helper.h b/chrome/browser/sessions/session_service_test_helper.h index 4e869b3..9df1908 100644 --- a/chrome/browser/sessions/session_service_test_helper.h +++ b/chrome/browser/sessions/session_service_test_helper.h
@@ -82,7 +82,7 @@ SessionService* service() { return service_.get(); } void RunTaskOnBackendThread(const base::Location& from_here, - const base::Closure& task); + base::OnceClosure task); void SetAvailableRange(const SessionID& tab_id, const std::pair<int, int>& range);
diff --git a/chrome/browser/sessions/session_service_unittest.cc b/chrome/browser/sessions/session_service_unittest.cc index 4a69077..a50c9bd 100644 --- a/chrome/browser/sessions/session_service_unittest.cc +++ b/chrome/browser/sessions/session_service_unittest.cc
@@ -1219,7 +1219,8 @@ base::CancelableTaskTracker cancelable_task_tracker; base::RunLoop run_loop; helper_.RunTaskOnBackendThread( - FROM_HERE, base::Bind(&SimulateWaitForTesting, base::Unretained(&flag))); + FROM_HERE, + base::BindOnce(&SimulateWaitForTesting, base::Unretained(&flag))); service()->GetLastSession(base::Bind(&OnGotPreviousSession), &cancelable_task_tracker); helper_.RunTaskOnBackendThread(FROM_HERE, run_loop.QuitClosure());
diff --git a/chrome/browser/ui/app_list/search/OWNERS b/chrome/browser/ui/app_list/search/OWNERS index c865a01..23bef942 100644 --- a/chrome/browser/ui/app_list/search/OWNERS +++ b/chrome/browser/ui/app_list/search/OWNERS
@@ -1,9 +1,4 @@ # Mainly for ML search-ranking purposes, see app_list/OWNERS for other reviews. -per-file search_controller*=jiameng@chromium.org -per-file mixer*=jiameng@chromium.org -per-file zero_state_file_provider*=file:search_result_ranker/OWNERS -per-file zero_state_file_result*=file:search_result_ranker/OWNERS -per-file drive_quick_access_provider*=file:search_result_ranker/OWNERS -per-file drive_quick_access_result*=file:search_result_ranker/OWNERS +jiameng@chromium.org # COMPONENT: UI>Shell>Launcher
diff --git a/chrome/browser/ui/ash/tablet_mode_page_behavior.cc b/chrome/browser/ui/ash/tablet_mode_page_behavior.cc index 56a4ef3..755ce39 100644 --- a/chrome/browser/ui/ash/tablet_mode_page_behavior.cc +++ b/chrome/browser/ui/ash/tablet_mode_page_behavior.cc
@@ -18,7 +18,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/service_manager_connection.h" #include "services/service_manager/public/cpp/connector.h" -#include "ui/base/material_design/material_design_controller.h" +#include "ui/base/pointer/touch_ui_controller.h" TabletModePageBehavior::TabletModePageBehavior() { ash::TabletMode::Get()->AddObserver(this); @@ -32,7 +32,7 @@ void TabletModePageBehavior::OnTabletModeToggled(bool enabled) { SetMobileLikeBehaviorEnabled(enabled); - ui::MaterialDesignController::GetInstance()->OnTabletModeToggled(enabled); + ui::TouchUiController::Get()->OnTabletModeToggled(enabled); } void TabletModePageBehavior::OnTabletModeStarting() {
diff --git a/chrome/browser/ui/bookmarks/bookmark_utils.cc b/chrome/browser/ui/bookmarks/bookmark_utils.cc index 93a67d0..9b4eb05e 100644 --- a/chrome/browser/ui/bookmarks/bookmark_utils.cc +++ b/chrome/browser/ui/bookmarks/bookmark_utils.cc
@@ -25,7 +25,7 @@ #include "extensions/buildflags/buildflags.h" #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/dragdrop/drop_target_event.h" -#include "ui/base/material_design/material_design_controller.h" +#include "ui/base/pointer/touch_ui_controller.h" #if BUILDFLAG(ENABLE_EXTENSIONS) #include "chrome/browser/extensions/api/commands/command_service.h" @@ -331,7 +331,7 @@ .GetNativeImageNamed(resource_id) .ToImageSkia(); #else - folder = GetFolderIcon(ui::MaterialDesignController::GetInstance()->touch_ui() + folder = GetFolderIcon(ui::TouchUiController::Get()->touch_ui() ? vector_icons::kFolderTouchIcon : vector_icons::kFolderIcon, text_color); @@ -352,7 +352,7 @@ .GetNativeImageNamed(resource_id) .ToImageSkia(); #else - folder = GetFolderIcon(ui::MaterialDesignController::GetInstance()->touch_ui() + folder = GetFolderIcon(ui::TouchUiController::Get()->touch_ui() ? vector_icons::kFolderManagedTouchIcon : vector_icons::kFolderManagedIcon, text_color);
diff --git a/chrome/browser/ui/content_settings/content_setting_image_model.cc b/chrome/browser/ui/content_settings/content_setting_image_model.cc index 6cfd30a..de103df3 100644 --- a/chrome/browser/ui/content_settings/content_setting_image_model.cc +++ b/chrome/browser/ui/content_settings/content_setting_image_model.cc
@@ -38,7 +38,7 @@ #include "content/public/browser/web_contents.h" #include "services/device/public/cpp/device_features.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/material_design/material_design_controller.h" +#include "ui/base/pointer/touch_ui_controller.h" #include "ui/gfx/color_palette.h" #include "ui/gfx/color_utils.h" #include "ui/gfx/favicon_size.h" @@ -461,7 +461,7 @@ const gfx::VectorIcon* icon = &image_details->icon; // Touch mode uses a different tab audio icon. if (image_details->content_type == ContentSettingsType::SOUND && - ui::MaterialDesignController::GetInstance()->touch_ui()) { + ui::TouchUiController::Get()->touch_ui()) { icon = &kTabAudioRoundedIcon; } set_icon(*icon, *badge_id);
diff --git a/chrome/browser/ui/layout_constants.cc b/chrome/browser/ui/layout_constants.cc index ee70dfa..dbfc928 100644 --- a/chrome/browser/ui/layout_constants.cc +++ b/chrome/browser/ui/layout_constants.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ui/layout_constants.h" #include "base/logging.h" -#include "ui/base/material_design/material_design_controller.h" +#include "ui/base/pointer/touch_ui_controller.h" #if defined(OS_MACOSX) int GetCocoaLayoutConstant(LayoutConstant constant) { @@ -27,7 +27,7 @@ #endif int GetLayoutConstant(LayoutConstant constant) { - const bool touch_ui = ui::MaterialDesignController::GetInstance()->touch_ui(); + const bool touch_ui = ui::TouchUiController::Get()->touch_ui(); switch (constant) { case BOOKMARK_BAR_HEIGHT: // The fixed margin ensures the bookmark buttons appear centered relative @@ -85,7 +85,7 @@ } gfx::Insets GetLayoutInsets(LayoutInset inset) { - const bool touch_ui = ui::MaterialDesignController::GetInstance()->touch_ui(); + const bool touch_ui = ui::TouchUiController::Get()->touch_ui(); switch (inset) { case LOCATION_BAR_ICON_INTERIOR_PADDING: return touch_ui ? gfx::Insets(5, 10) : gfx::Insets(4, 8);
diff --git a/chrome/browser/ui/tabs/tab_style.cc b/chrome/browser/ui/tabs/tab_style.cc index 6329338..ccf846d7 100644 --- a/chrome/browser/ui/tabs/tab_style.cc +++ b/chrome/browser/ui/tabs/tab_style.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/tabs/tab_style.h" -#include "ui/base/material_design/material_design_controller.h" +#include "ui/base/pointer/touch_ui_controller.h" #include "ui/views/layout/layout_provider.h" namespace { @@ -15,7 +15,7 @@ // Returns the height of the separator between tabs. int GetSeparatorHeight() { - return ui::MaterialDesignController::GetInstance()->touch_ui() ? 24 : 20; + return ui::TouchUiController::Get()->touch_ui() ? 24 : 20; } } // namespace
diff --git a/chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.h b/chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.h index 5926506..61754aa5 100644 --- a/chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.h +++ b/chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.h
@@ -14,7 +14,7 @@ #include "chrome/browser/ui/extensions/extension_action_test_helper.h" #include "chrome/test/base/browser_with_test_window_test.h" #include "extensions/common/extension_builder.h" -#include "ui/base/material_design/material_design_controller.h" +#include "ui/base/pointer/touch_ui_controller.h" class ScopedTestingLocalState; class ToolbarActionsBar; @@ -90,7 +90,7 @@ // The overflow container's ExtensionActionTestHelper. std::unique_ptr<ExtensionActionTestHelper> overflow_browser_action_test_util_; - ui::MaterialDesignController::TouchUiScoperForTesting touch_ui_scoper_; + ui::TouchUiController::TouchUiScoperForTesting touch_ui_scoper_; // Local state for the browser process. std::unique_ptr<ScopedTestingLocalState> local_state_;
diff --git a/chrome/browser/ui/views/autofill/autofill_popup_view_native_views.cc b/chrome/browser/ui/views/autofill/autofill_popup_view_native_views.cc index b41f108..74a55a8 100644 --- a/chrome/browser/ui/views/autofill/autofill_popup_view_native_views.cc +++ b/chrome/browser/ui/views/autofill/autofill_popup_view_native_views.cc
@@ -954,6 +954,7 @@ } void AutofillPopupRowView::OnThemeChanged() { + views::View::OnThemeChanged(); RefreshStyle(); } @@ -1027,6 +1028,7 @@ } void AutofillPopupViewNativeViews::OnThemeChanged() { + AutofillPopupBaseView::OnThemeChanged(); SetBackground(views::CreateSolidBackground(GetBackgroundColor())); // |scroll_view_| and |footer_container_| will be null if there is no body // or footer content, respectively.
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc index 2ef631c..4c8560c 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -72,8 +72,8 @@ #include "ui/accessibility/ax_node_data.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/material_design/material_design_controller.h" #include "ui/base/page_transition_types.h" +#include "ui/base/pointer/touch_ui_controller.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" #include "ui/base/window_open_disposition.h" @@ -453,6 +453,7 @@ ~ButtonSeparatorView() override = default; void OnThemeChanged() override { + views::Separator::OnThemeChanged(); SetColor(GetThemeProvider()->GetColor( ThemeProperties::COLOR_TOOLBAR_VERTICAL_SEPARATOR)); } @@ -1061,6 +1062,7 @@ } void BookmarkBarView::OnThemeChanged() { + views::AccessiblePaneView::OnThemeChanged(); UpdateAppearanceForTheme(); } @@ -1548,8 +1550,7 @@ bool themify_icon = node->url().SchemeIs(content::kChromeUIScheme); gfx::ImageSkia favicon = model_->GetFavicon(node).AsImageSkia(); if (favicon.isNull()) { - if (ui::MaterialDesignController::GetInstance()->touch_ui() && - GetThemeProvider()) { + if (ui::TouchUiController::Get()->touch_ui() && GetThemeProvider()) { // This favicon currently does not match the default favicon icon used // elsewhere in the codebase. // See https://crbug/814447 @@ -1897,7 +1898,7 @@ const SkColor overflow_color = theme_provider->GetColor(ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON); - const bool touch_ui = ui::MaterialDesignController::GetInstance()->touch_ui(); + const bool touch_ui = ui::TouchUiController::Get()->touch_ui(); overflow_button_->SetImage( views::Button::STATE_NORMAL, gfx::CreateVectorIcon(
diff --git a/chrome/browser/ui/views/chrome_layout_provider.cc b/chrome/browser/ui/views/chrome_layout_provider.cc index 84be79e..1e3f2f3 100644 --- a/chrome/browser/ui/views/chrome_layout_provider.cc +++ b/chrome/browser/ui/views/chrome_layout_provider.cc
@@ -8,7 +8,7 @@ #include "base/logging.h" #include "chrome/browser/ui/views/chrome_typography.h" -#include "ui/base/material_design/material_design_controller.h" +#include "ui/base/pointer/touch_ui_controller.h" #include "ui/gfx/shadow_value.h" namespace { @@ -51,15 +51,14 @@ gfx::Insets ChromeLayoutProvider::GetInsetsMetric(int metric) const { DCHECK_LT(metric, views::VIEWS_INSETS_MAX); - const bool touch_ui = ui::MaterialDesignController::GetInstance()->touch_ui(); + const bool touch_ui = ui::TouchUiController::Get()->touch_ui(); switch (metric) { case views::INSETS_DIALOG: case views::INSETS_DIALOG_SUBSECTION: return gfx::Insets(kHarmonyLayoutUnit); case views::INSETS_CHECKBOX_RADIO_BUTTON: { gfx::Insets insets = LayoutProvider::GetInsetsMetric(metric); - // Material Design requires that checkboxes and radio buttons are aligned - // flush to the left edge. + // Checkboxes and radio buttons should be aligned flush to the left edge. return gfx::Insets(insets.top(), 0, insets.bottom(), insets.right()); } case views::INSETS_VECTOR_IMAGE_BUTTON:
diff --git a/chrome/browser/ui/views/chrome_typography.cc b/chrome/browser/ui/views/chrome_typography.cc index 7c5a3206..58f9eea 100644 --- a/chrome/browser/ui/views/chrome_typography.cc +++ b/chrome/browser/ui/views/chrome_typography.cc
@@ -7,7 +7,7 @@ #include "build/build_config.h" #include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "ui/base/default_style.h" -#include "ui/base/material_design/material_design_controller.h" +#include "ui/base/pointer/touch_ui_controller.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/platform_font.h" @@ -57,8 +57,7 @@ gfx::Font::Weight* weight) { switch (context) { case CONTEXT_TOOLBAR_BUTTON: { - int height = - ui::MaterialDesignController::GetInstance()->touch_ui() ? 22 : 17; + int height = ui::TouchUiController::Get()->touch_ui() ? 22 : 17; // We only want the font size to be constrained by available height, and // don't actually have a target font size, so we just need to supply any // sufficiently-large value for the second argument here. |height| will @@ -73,11 +72,10 @@ } case CONTEXT_OMNIBOX_PRIMARY: case CONTEXT_OMNIBOX_DEEMPHASIZED: { - using MD = ui::MaterialDesignController; const int omnibox_primary_delta = GetFontSizeDeltaBoundedByAvailableHeight( LocationBarView::GetAvailableTextHeight(), - MD::GetInstance()->touch_ui() ? 15 : 14); + ui::TouchUiController::Get()->touch_ui() ? 15 : 14); *size_delta = omnibox_primary_delta; if (context == CONTEXT_OMNIBOX_DEEMPHASIZED) { (*size_delta)--;
diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/browser/ui/views/download/download_item_view.cc index e5da4015..61f8487 100644 --- a/chrome/browser/ui/views/download/download_item_view.cc +++ b/chrome/browser/ui/views/download/download_item_view.cc
@@ -666,6 +666,7 @@ } void DownloadItemView::OnThemeChanged() { + views::View::OnThemeChanged(); UpdateColorsFromTheme(); SchedulePaint(); UpdateDropdownButton();
diff --git a/chrome/browser/ui/views/download/download_shelf_view.cc b/chrome/browser/ui/views/download/download_shelf_view.cc index 1d5db1d2..ce5fc51 100644 --- a/chrome/browser/ui/views/download/download_shelf_view.cc +++ b/chrome/browser/ui/views/download/download_shelf_view.cc
@@ -332,6 +332,7 @@ } void DownloadShelfView::OnThemeChanged() { + views::AccessiblePaneView::OnThemeChanged(); UpdateColorsFromTheme(); }
diff --git a/chrome/browser/ui/views/extensions/extensions_menu_item_view.cc b/chrome/browser/ui/views/extensions/extensions_menu_item_view.cc index 5b1c823..d238930 100644 --- a/chrome/browser/ui/views/extensions/extensions_menu_item_view.cc +++ b/chrome/browser/ui/views/extensions/extensions_menu_item_view.cc
@@ -108,6 +108,7 @@ } void ExtensionsMenuItemView::OnThemeChanged() { + views::View::OnThemeChanged(); const SkColor icon_color = GetNativeTheme()->GetSystemColor( ui::NativeTheme::kColorId_DefaultIconColor); pin_button_->set_ink_drop_base_color(icon_color);
diff --git a/chrome/browser/ui/views/extensions/extensions_toolbar_button.cc b/chrome/browser/ui/views/extensions/extensions_toolbar_button.cc index cf345ad..2a40adf 100644 --- a/chrome/browser/ui/views/extensions/extensions_toolbar_button.cc +++ b/chrome/browser/ui/views/extensions/extensions_toolbar_button.cc
@@ -12,7 +12,7 @@ #include "components/vector_icons/vector_icons.h" #include "extensions/browser/extension_registry.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/material_design/material_design_controller.h" +#include "ui/base/pointer/touch_ui_controller.h" #include "ui/base/theme_provider.h" #include "ui/gfx/paint_vector_icon.h" #include "ui/views/accessibility/view_accessibility.h" @@ -86,7 +86,7 @@ } int ExtensionsToolbarButton::GetIconSize() const { - const bool touch_ui = ui::MaterialDesignController::GetInstance()->touch_ui(); + const bool touch_ui = ui::TouchUiController::Get()->touch_ui(); return (touch_ui && !browser_->app_controller()) ? kDefaultTouchableIconSize : kDefaultIconSize; }
diff --git a/chrome/browser/ui/views/extensions/extensions_toolbar_container.cc b/chrome/browser/ui/views/extensions/extensions_toolbar_container.cc index 00d3905b..bdca3419 100644 --- a/chrome/browser/ui/views/extensions/extensions_toolbar_container.cc +++ b/chrome/browser/ui/views/extensions/extensions_toolbar_container.cc
@@ -236,17 +236,24 @@ void ExtensionsToolbarContainer::OnContextMenuShown( ToolbarActionViewController* extension) { - extension_with_open_context_menu_id_ = extension->GetId(); - UpdateIconVisibility(extension_with_open_context_menu_id_.value()); + // Only update the extension's toolbar visibility if the context menu is being + // shown from an extension visible in the toolbar. + if (!ExtensionsMenuView::IsShowing()) { + extension_with_open_context_menu_id_ = extension->GetId(); + UpdateIconVisibility(extension_with_open_context_menu_id_.value()); + } } void ExtensionsToolbarContainer::OnContextMenuClosed( ToolbarActionViewController* extension) { - DCHECK(extension_with_open_context_menu_id_.has_value()); - base::Optional<extensions::ExtensionId> const - extension_with_open_context_menu = extension_with_open_context_menu_id_; - extension_with_open_context_menu_id_.reset(); - UpdateIconVisibility(extension_with_open_context_menu.value()); + // |extension_with_open_context_menu_id_| does not have a value when a context + // menu is being shown from within the extensions menu. + if (extension_with_open_context_menu_id_.has_value()) { + base::Optional<extensions::ExtensionId> const + extension_with_open_context_menu = extension_with_open_context_menu_id_; + extension_with_open_context_menu_id_.reset(); + UpdateIconVisibility(extension_with_open_context_menu.value()); + } } bool ExtensionsToolbarContainer::IsActionVisibleOnToolbar(
diff --git a/chrome/browser/ui/views/find_bar_view.cc b/chrome/browser/ui/views/find_bar_view.cc index 8440fe3..12c99104 100644 --- a/chrome/browser/ui/views/find_bar_view.cc +++ b/chrome/browser/ui/views/find_bar_view.cc
@@ -446,6 +446,7 @@ } void FindBarView::OnThemeChanged() { + views::View::OnThemeChanged(); ui::NativeTheme* theme = GetNativeTheme(); SkColor bg_color = SkColorSetA(theme->GetSystemColor(
diff --git a/chrome/browser/ui/views/frame/browser_frame.cc b/chrome/browser/ui/views/frame/browser_frame.cc index 61f35a0..ec7f5d1 100644 --- a/chrome/browser/ui/views/frame/browser_frame.cc +++ b/chrome/browser/ui/views/frame/browser_frame.cc
@@ -28,7 +28,7 @@ #include "chrome/browser/ui/web_applications/app_browser_controller.h" #include "chrome/common/chrome_switches.h" #include "ui/base/hit_test.h" -#include "ui/base/material_design/material_design_controller.h" +#include "ui/base/pointer/touch_ui_controller.h" #include "ui/events/event_handler.h" #include "ui/gfx/font_list.h" #include "ui/native_theme/native_theme_dark_aura.h" @@ -67,7 +67,6 @@ set_is_secondary_widget(false); // Don't focus anything on creation, selecting a tab will set the focus. set_focus_on_creation(false); - md_observer_.Add(ui::MaterialDesignController::GetInstance()); } BrowserFrame::~BrowserFrame() {}
diff --git a/chrome/browser/ui/views/frame/browser_frame.h b/chrome/browser/ui/views/frame/browser_frame.h index d4e0222..fb4489a 100644 --- a/chrome/browser/ui/views/frame/browser_frame.h +++ b/chrome/browser/ui/views/frame/browser_frame.h
@@ -8,11 +8,9 @@ #include "base/compiler_specific.h" #include "base/logging.h" #include "base/macros.h" -#include "base/scoped_observer.h" #include "build/build_config.h" #include "content/public/browser/keyboard_event_processing_result.h" -#include "ui/base/material_design/material_design_controller.h" -#include "ui/base/material_design/material_design_controller_observer.h" +#include "ui/base/pointer/touch_ui_controller.h" #include "ui/views/context_menu_controller.h" #include "ui/views/widget/widget.h" @@ -41,9 +39,7 @@ } // This is a virtual interface that allows system specific browser frames. -class BrowserFrame : public views::Widget, - public views::ContextMenuController, - public ui::MaterialDesignControllerObserver { +class BrowserFrame : public views::Widget, public views::ContextMenuController { public: explicit BrowserFrame(BrowserView* browser_view); ~BrowserFrame() override; @@ -128,11 +124,9 @@ return native_browser_frame_; } - protected: - // ui::MaterialDesignControllerObserver: - void OnTouchUiChanged() override; - private: + void OnTouchUiChanged(); + // Callback for MenuRunner. void OnMenuClosed(); @@ -155,9 +149,10 @@ // NativeBrowserFrame::UsesNativeSystemMenu() returns false. std::unique_ptr<views::MenuRunner> menu_runner_; - ScopedObserver<ui::MaterialDesignController, - ui::MaterialDesignControllerObserver> - md_observer_{this}; + std::unique_ptr<ui::TouchUiController::Subscription> subscription_ = + ui::TouchUiController::Get()->RegisterCallback( + base::BindRepeating(&BrowserFrame::OnTouchUiChanged, + base::Unretained(this))); DISALLOW_COPY_AND_ASSIGN(BrowserFrame); };
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc index c3acdcd..93b4f87 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc
@@ -88,7 +88,7 @@ #include "ui/aura/test/env_test_helper.h" #include "ui/base/class_property.h" #include "ui/base/hit_test.h" -#include "ui/base/material_design/material_design_controller.h" +#include "ui/base/pointer/touch_ui_controller.h" #include "ui/compositor/scoped_animation_duration_scale_mode.h" #include "ui/events/base_event_utils.h" #include "ui/events/event.h" @@ -159,7 +159,7 @@ ~TopChromeMdParamTest() override = default; private: - ui::MaterialDesignController::TouchUiScoperForTesting touch_ui_scoper_; + ui::TouchUiController::TouchUiScoperForTesting touch_ui_scoper_; }; // Template to be used when a test does not work with the webUI tabstrip.
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index cd35c8b..30b160f 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -369,7 +369,10 @@ class ContentsSeparator : public views::Separator { private: // views::View: - void OnThemeChanged() override { UpdateColor(); } + void OnThemeChanged() override { + views::Separator::OnThemeChanged(); + UpdateColor(); + } void AddedToWidget() override { UpdateColor(); } void UpdateColor() { @@ -489,7 +492,6 @@ : views::ClientView(nullptr, nullptr), browser_(std::move(browser)) { browser_->tab_strip_model()->AddObserver(this); immersive_mode_controller_ = chrome::CreateImmersiveModeController(); - md_observer_.Add(ui::MaterialDesignController::GetInstance()); // Top container holds tab strip region and toolbar and lives at the front of // the view hierarchy. @@ -2721,6 +2723,7 @@ } void BrowserView::OnThemeChanged() { + views::ClientView::OnThemeChanged(); if (!initialized_) return; @@ -3433,12 +3436,6 @@ } /////////////////////////////////////////////////////////////////////////////// -// BrowserView, ui::MaterialDesignControllerObserver implementation: -void BrowserView::OnTouchUiChanged() { - MaybeInitializeWebUITabStrip(); -} - -/////////////////////////////////////////////////////////////////////////////// // BrowserView, banners::AppBannerManager::Observer implementation: void BrowserView::OnAppBannerManagerChangedForTesting( banners::AppBannerManager* new_manager) {
diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h index c1ca574..f96585f 100644 --- a/chrome/browser/ui/views/frame/browser_view.h +++ b/chrome/browser/ui/views/frame/browser_view.h
@@ -42,9 +42,8 @@ #include "chrome/common/buildflags.h" #include "components/infobars/core/infobar_container.h" #include "ui/base/accelerators/accelerator.h" -#include "ui/base/material_design/material_design_controller.h" -#include "ui/base/material_design/material_design_controller_observer.h" #include "ui/base/models/simple_menu_model.h" +#include "ui/base/pointer/touch_ui_controller.h" #include "ui/gfx/native_widget_types.h" #include "ui/views/controls/button/button.h" #include "ui/views/controls/webview/unhandled_keyboard_event_handler.h" @@ -107,7 +106,6 @@ public ExclusiveAccessBubbleViewsContext, public extensions::ExtensionKeybindingRegistry::Delegate, public ImmersiveModeController::Observer, - public ui::MaterialDesignControllerObserver, public banners::AppBannerManager::Observer { public: // The browser view's class name. @@ -542,9 +540,6 @@ void OnImmersiveFullscreenExited() override; void OnImmersiveModeControllerDestroyed() override; - // ui::MaterialDesignControllerObserver: - void OnTouchUiChanged() override; - // banners::AppBannerManager::Observer: void OnAppBannerManagerChangedForTesting( banners::AppBannerManager* new_manager) override; @@ -861,9 +856,10 @@ std::unique_ptr<ImmersiveModeController> immersive_mode_controller_; - ScopedObserver<ui::MaterialDesignController, - ui::MaterialDesignControllerObserver> - md_observer_{this}; + std::unique_ptr<ui::TouchUiController::Subscription> subscription_ = + ui::TouchUiController::Get()->RegisterCallback( + base::BindRepeating(&BrowserView::MaybeInitializeWebUITabStrip, + base::Unretained(this))); std::unique_ptr<WebContentsCloseHandler> web_contents_close_handler_;
diff --git a/chrome/browser/ui/views/frame/contents_web_view.cc b/chrome/browser/ui/views/frame/contents_web_view.cc index c228f113..7f3868b 100644 --- a/chrome/browser/ui/views/frame/contents_web_view.cc +++ b/chrome/browser/ui/views/frame/contents_web_view.cc
@@ -49,6 +49,7 @@ } void ContentsWebView::OnThemeChanged() { + views::WebView::OnThemeChanged(); UpdateBackgroundColor(); }
diff --git a/chrome/browser/ui/views/frame/top_container_loading_bar.cc b/chrome/browser/ui/views/frame/top_container_loading_bar.cc index cc9c75809..f16e438 100644 --- a/chrome/browser/ui/views/frame/top_container_loading_bar.cc +++ b/chrome/browser/ui/views/frame/top_container_loading_bar.cc
@@ -25,6 +25,7 @@ } void LoadingBarView::OnThemeChanged() { + views::View::OnThemeChanged(); SchedulePaint(); }
diff --git a/chrome/browser/ui/views/frame/webui_tab_strip_container_view.cc b/chrome/browser/ui/views/frame/webui_tab_strip_container_view.cc index 6f26690..5386e31 100644 --- a/chrome/browser/ui/views/frame/webui_tab_strip_container_view.cc +++ b/chrome/browser/ui/views/frame/webui_tab_strip_container_view.cc
@@ -290,7 +290,7 @@ // static bool WebUITabStripContainerView::UseTouchableTabStrip() { return base::FeatureList::IsEnabled(features::kWebUITabStrip) && - ui::MaterialDesignController::GetInstance()->touch_ui(); + ui::TouchUiController::Get()->touch_ui(); } // static
diff --git a/chrome/browser/ui/views/frame/webui_tab_strip_container_view_unittest.cc b/chrome/browser/ui/views/frame/webui_tab_strip_container_view_unittest.cc index 5e40cf11..7609f62 100644 --- a/chrome/browser/ui/views/frame/webui_tab_strip_container_view_unittest.cc +++ b/chrome/browser/ui/views/frame/webui_tab_strip_container_view_unittest.cc
@@ -14,7 +14,7 @@ #include "chrome/browser/ui/webui/tab_strip/tab_strip_ui.h" #include "chrome/test/base/test_browser_window.h" #include "content/public/common/drop_data.h" -#include "ui/base/material_design/material_design_controller.h" +#include "ui/base/pointer/touch_ui_controller.h" class WebUITabStripContainerViewTest : public TestWithBrowserView { public: @@ -28,7 +28,7 @@ private: base::test::ScopedFeatureList feature_override_; - ui::MaterialDesignController::TouchUiScoperForTesting touch_ui_scoper_{true}; + ui::TouchUiController::TouchUiScoperForTesting touch_ui_scoper_{true}; }; TEST_F(WebUITabStripContainerViewTest, TabStripStartsClosed) { @@ -42,14 +42,12 @@ EXPECT_NE(nullptr, browser_view()->webui_tab_strip()); EXPECT_FALSE(browser_view()->IsTabStripVisible()); - ui::MaterialDesignController::TouchUiScoperForTesting disable_touch_mode( - false); + ui::TouchUiController::TouchUiScoperForTesting disable_touch_mode(false); browser_view()->Layout(); EXPECT_FALSE(WebUITabStripContainerView::UseTouchableTabStrip()); EXPECT_TRUE(browser_view()->IsTabStripVisible()); - ui::MaterialDesignController::TouchUiScoperForTesting reenable_touch_mode( - true); + ui::TouchUiController::TouchUiScoperForTesting reenable_touch_mode(true); browser_view()->Layout(); EXPECT_TRUE(WebUITabStripContainerView::UseTouchableTabStrip()); EXPECT_FALSE(browser_view()->IsTabStripVisible()); @@ -141,9 +139,7 @@ TEST_F(WebUITabStripDevToolsTest, DevToolsWindowHasNoTabStrip) { EXPECT_EQ(nullptr, browser_view()->webui_tab_strip()); - ui::MaterialDesignController::TouchUiScoperForTesting disable_touch_mode( - false); - ui::MaterialDesignController::TouchUiScoperForTesting reenable_touch_mode( - true); + ui::TouchUiController::TouchUiScoperForTesting disable_touch_mode(false); + ui::TouchUiController::TouchUiScoperForTesting reenable_touch_mode(true); EXPECT_EQ(nullptr, browser_view()->webui_tab_strip()); }
diff --git a/chrome/browser/ui/views/frame/webui_tab_strip_interactive_uitest.cc b/chrome/browser/ui/views/frame/webui_tab_strip_interactive_uitest.cc index b69ef53..cfc418a5 100644 --- a/chrome/browser/ui/views/frame/webui_tab_strip_interactive_uitest.cc +++ b/chrome/browser/ui/views/frame/webui_tab_strip_interactive_uitest.cc
@@ -13,7 +13,7 @@ #include "chrome/browser/ui/views/toolbar/toolbar_view.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/interactive_test_utils.h" -#include "ui/base/material_design/material_design_controller.h" +#include "ui/base/pointer/touch_ui_controller.h" #include "ui/views/controls/webview/webview.h" class WebUITabStripInteractiveTest : public InProcessBrowserTest { @@ -26,7 +26,7 @@ private: base::test::ScopedFeatureList feature_override_; - ui::MaterialDesignController::TouchUiScoperForTesting touch_ui_scoper_{true}; + ui::TouchUiController::TouchUiScoperForTesting touch_ui_scoper_{true}; }; // Regression test for crbug.com/1027375.
diff --git a/chrome/browser/ui/views/global_media_controls/media_toolbar_button_view.cc b/chrome/browser/ui/views/global_media_controls/media_toolbar_button_view.cc index 2340d0a..d1c96534 100644 --- a/chrome/browser/ui/views/global_media_controls/media_toolbar_button_view.cc +++ b/chrome/browser/ui/views/global_media_controls/media_toolbar_button_view.cc
@@ -18,7 +18,7 @@ #include "components/vector_icons/vector_icons.h" #include "media/base/media_switches.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/material_design/material_design_controller.h" +#include "ui/base/pointer/touch_ui_controller.h" #include "ui/base/theme_provider.h" #include "ui/gfx/paint_vector_icon.h" #include "ui/native_theme/native_theme.h" @@ -139,7 +139,7 @@ if (!GetWidget()) return; - const bool touch_ui = ui::MaterialDesignController::GetInstance()->touch_ui(); + const bool touch_ui = ui::TouchUiController::Get()->touch_ui(); const gfx::VectorIcon& icon = touch_ui ? kMediaToolbarButtonTouchIcon : kMediaToolbarButtonIcon; UpdateIconsWithStandardColors(icon);
diff --git a/chrome/browser/ui/views/infobars/infobar_view.cc b/chrome/browser/ui/views/infobars/infobar_view.cc index 53732ab..a6de5a8 100644 --- a/chrome/browser/ui/views/infobars/infobar_view.cc +++ b/chrome/browser/ui/views/infobars/infobar_view.cc
@@ -226,6 +226,7 @@ } void InfoBarView::OnThemeChanged() { + views::View::OnThemeChanged(); const SkColor background_color = GetColor(kInfoBarLabelBackgroundColor); SetBackground(views::CreateSolidBackground(background_color));
diff --git a/chrome/browser/ui/views/location_bar/custom_tab_bar_view.cc b/chrome/browser/ui/views/location_bar/custom_tab_bar_view.cc index 239a88c..103ff75 100644 --- a/chrome/browser/ui/views/location_bar/custom_tab_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/custom_tab_bar_view.cc
@@ -287,6 +287,7 @@ } void CustomTabBarView::OnThemeChanged() { + views::AccessiblePaneView::OnThemeChanged(); base::Optional<SkColor> optional_theme_color = GetThemeColor(); title_bar_color_ = optional_theme_color.value_or(GetDefaultFrameColor());
diff --git a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc index 700aa045..c8dea8d 100644 --- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc +++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
@@ -12,7 +12,7 @@ #include "chrome/browser/ui/omnibox/omnibox_theme.h" #include "ui/accessibility/ax_node_data.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/material_design/material_design_controller.h" +#include "ui/base/pointer/touch_ui_controller.h" #include "ui/compositor/layer_animator.h" #include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/canvas.h" @@ -33,8 +33,6 @@ #include "ui/views/controls/image_view.h" #include "ui/views/widget/widget.h" -using MD = ui::MaterialDesignController; - namespace { // Amount of space reserved for the separator that appears after the icon or @@ -78,6 +76,7 @@ } void IconLabelBubbleView::SeparatorView::OnThemeChanged() { + views::View::OnThemeChanged(); SchedulePaint(); } @@ -161,8 +160,6 @@ alert_view->GetCustomData().role = ax::mojom::Role::kAlert; alert_virtual_view_ = alert_view.get(); GetViewAccessibility().AddVirtualChildView(std::move(alert_view)); - - md_observer_.Add(MD::GetInstance()); } IconLabelBubbleView::~IconLabelBubbleView() {} @@ -248,6 +245,15 @@ return false; } +void IconLabelBubbleView::OnTouchUiChanged() { + UpdateBorder(); + + // PreferredSizeChanged() incurs an expensive layout of the location bar, so + // only call it when this view is showing. + if (GetVisible()) + PreferredSizeChanged(); +} + gfx::Size IconLabelBubbleView::CalculatePreferredSize() const { return GetSizeForLabelWidth(label()->GetPreferredSize().width()); } @@ -388,15 +394,6 @@ node_data->SetNameExplicitlyEmpty(); } -void IconLabelBubbleView::OnTouchUiChanged() { - UpdateBorder(); - - // PreferredSizeChanged() incurs an expensive layout of the location bar, so - // only call it when this view is showing. - if (GetVisible()) - PreferredSizeChanged(); -} - void IconLabelBubbleView::SetImage(const gfx::ImageSkia& image_skia) { DCHECK(!image_skia.isNull()); LabelButton::SetImage(STATE_NORMAL, image_skia); @@ -426,7 +423,8 @@ int IconLabelBubbleView::GetInternalSpacing() const { if (image()->GetPreferredSize().IsEmpty()) return 0; - return (MD::GetInstance()->touch_ui() ? 10 : 8) + GetExtraInternalSpacing(); + return (ui::TouchUiController::Get()->touch_ui() ? 10 : 8) + + GetExtraInternalSpacing(); } int IconLabelBubbleView::GetExtraInternalSpacing() const {
diff --git a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h index 8565a71..ab4b2d41 100644 --- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h +++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h
@@ -13,8 +13,7 @@ #include "base/scoped_observer.h" #include "base/strings/string16.h" #include "third_party/skia/include/core/SkPath.h" -#include "ui/base/material_design/material_design_controller.h" -#include "ui/base/material_design/material_design_controller_observer.h" +#include "ui/base/pointer/touch_ui_controller.h" #include "ui/gfx/geometry/insets.h" #include "ui/gfx/geometry/size.h" #include "ui/views/animation/ink_drop_host_view.h" @@ -41,8 +40,7 @@ // base for the classes that handle the location icon (including the EV bubble), // tab-to-search UI, and content settings. class IconLabelBubbleView : public views::InkDropObserver, - public views::LabelButton, - public ui::MaterialDesignControllerObserver { + public views::LabelButton { public: static constexpr int kTrailingPaddingPreMd = 2; @@ -122,6 +120,8 @@ // prevent the bubble from reshowing on a mouse release. virtual bool IsBubbleShowing() const; + virtual void OnTouchUiChanged(); + // views::LabelButton: gfx::Size CalculatePreferredSize() const override; void Layout() override; @@ -139,9 +139,6 @@ void AnimationCanceled(const gfx::Animation* animation) override; void GetAccessibleNodeData(ui::AXNodeData* node_data) override; - // ui::MaterialDesignControllerObserver: - void OnTouchUiChanged() override; - const gfx::FontList& font_list() const { return label()->font_list(); } void SetImage(const gfx::ImageSkia& image); @@ -268,9 +265,10 @@ // virtual child of this view. views::AXVirtualView* alert_virtual_view_; - ScopedObserver<ui::MaterialDesignController, - ui::MaterialDesignControllerObserver> - md_observer_{this}; + std::unique_ptr<ui::TouchUiController::Subscription> subscription_ = + ui::TouchUiController::Get()->RegisterCallback( + base::BindRepeating(&IconLabelBubbleView::OnTouchUiChanged, + base::Unretained(this))); DISALLOW_COPY_AND_ASSIGN(IconLabelBubbleView); };
diff --git a/chrome/browser/ui/views/location_bar/keyword_hint_view.cc b/chrome/browser/ui/views/location_bar/keyword_hint_view.cc index 041c629d..7416876 100644 --- a/chrome/browser/ui/views/location_bar/keyword_hint_view.cc +++ b/chrome/browser/ui/views/location_bar/keyword_hint_view.cc
@@ -185,6 +185,7 @@ } void KeywordHintView::OnThemeChanged() { + views::Button::OnThemeChanged(); const ui::ThemeProvider* theme_provider = GetThemeProvider(); const SkColor leading_label_text_color =
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc index 2be5ab7..6e87cfdb 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -97,7 +97,6 @@ #include "ui/base/ime/input_method.h" #include "ui/base/ime/input_method_keyboard_controller.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/material_design/material_design_controller.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" #include "ui/base/ui_base_features.h" @@ -164,7 +163,6 @@ focus_ring_->SetPathGenerator( std::make_unique<views::PillHighlightPathGenerator>()); } - md_observer_.Add(ui::MaterialDesignController::GetInstance()); } LocationBarView::~LocationBarView() {} @@ -610,6 +608,7 @@ } void LocationBarView::OnThemeChanged() { + views::View::OnThemeChanged(); // ToolbarView::Init() adds |this| to the view hierarchy before initializing, // which will trigger an early theme change. if (!IsInitialized()) @@ -828,7 +827,7 @@ } void LocationBarView::RefreshClearAllButtonIcon() { - const bool touch_ui = ui::MaterialDesignController::GetInstance()->touch_ui(); + const bool touch_ui = ui::TouchUiController::Get()->touch_ui(); const gfx::VectorIcon& icon = touch_ui ? omnibox::kClearIcon : kTabCloseNormalIcon; SetImageFromVectorIcon(clear_all_button_, icon,
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h index baeba40..6ee9457 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.h +++ b/chrome/browser/ui/views/location_bar/location_bar_view.h
@@ -27,7 +27,7 @@ #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h" #include "chrome/browser/ui/views/page_action/page_action_icon_view.h" #include "components/security_state/core/security_state.h" -#include "ui/base/material_design/material_design_controller_observer.h" +#include "ui/base/pointer/touch_ui_controller.h" #include "ui/gfx/animation/slide_animation.h" #include "ui/gfx/font.h" #include "ui/gfx/geometry/rect.h" @@ -73,8 +73,7 @@ public IconLabelBubbleView::Delegate, public LocationIconView::Delegate, public ContentSettingImageView::Delegate, - public PageActionIconView::Delegate, - public ui::MaterialDesignControllerObserver { + public PageActionIconView::Delegate { public: class Delegate { public: @@ -325,8 +324,7 @@ // DropdownBarHostDelegate: void FocusAndSelectAll() override; - // ui::MaterialDesignControllerObserver: - void OnTouchUiChanged() override; + void OnTouchUiChanged(); // Called with an async fetched for the keyword view. void OnKeywordFaviconFetched(const gfx::Image& icon); @@ -394,9 +392,10 @@ bool is_initialized_ = false; - ScopedObserver<ui::MaterialDesignController, - ui::MaterialDesignControllerObserver> - md_observer_{this}; + std::unique_ptr<ui::TouchUiController::Subscription> subscription_ = + ui::TouchUiController::Get()->RegisterCallback( + base::BindRepeating(&LocationBarView::OnTouchUiChanged, + base::Unretained(this))); base::WeakPtrFactory<LocationBarView> weak_factory_{this};
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view_browsertest.cc b/chrome/browser/ui/views/location_bar/location_bar_view_browsertest.cc index f825be3..3a58a37 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view_browsertest.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view_browsertest.cc
@@ -36,7 +36,7 @@ #include "services/network/public/cpp/features.h" #include "services/network/public/mojom/url_response_head.mojom.h" #include "third_party/blink/public/common/page/page_zoom.h" -#include "ui/base/material_design/material_design_controller.h" +#include "ui/base/pointer/touch_ui_controller.h" class LocationBarViewBrowserTest : public InProcessBrowserTest { public: @@ -131,7 +131,7 @@ TouchLocationBarViewBrowserTest() = default; private: - ui::MaterialDesignController::TouchUiScoperForTesting touch_ui_scoper_{true}; + ui::TouchUiController::TouchUiScoperForTesting touch_ui_scoper_{true}; }; // Test the corners of the OmniboxViewViews do not get drawn on top of the
diff --git a/chrome/browser/ui/views/media_router/cast_dialog_sink_button.cc b/chrome/browser/ui/views/media_router/cast_dialog_sink_button.cc index 3b13515..57f9082f 100644 --- a/chrome/browser/ui/views/media_router/cast_dialog_sink_button.cc +++ b/chrome/browser/ui/views/media_router/cast_dialog_sink_button.cc
@@ -47,6 +47,7 @@ // views::ImageView: void OnThemeChanged() override { + views::ImageView::OnThemeChanged(); const SkColor icon_color = GetNativeTheme()->GetSystemColor( ui::NativeTheme::kColorId_DefaultIconColor); SetImage(gfx::CreateVectorIcon(::vector_icons::kInfoOutlineIcon,
diff --git a/chrome/browser/ui/views/media_router/cast_toolbar_button.cc b/chrome/browser/ui/views/media_router/cast_toolbar_button.cc index d657f92..7df6a71 100644 --- a/chrome/browser/ui/views/media_router/cast_toolbar_button.cc +++ b/chrome/browser/ui/views/media_router/cast_toolbar_button.cc
@@ -15,8 +15,8 @@ #include "chrome/grit/generated_resources.h" #include "components/vector_icons/vector_icons.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/material_design/material_design_controller.h" #include "ui/base/models/menu_model.h" +#include "ui/base/pointer/touch_ui_controller.h" #include "ui/base/theme_provider.h" #include "ui/gfx/color_palette.h" #include "ui/gfx/paint_vector_icon.h" @@ -191,8 +191,8 @@ GetIconColor(views::Button::STATE_DISABLED, &icon)); // This icon is smaller than the touchable-UI expected 24dp, so we need to pad // the insets to match. - SetLayoutInsetDelta(gfx::Insets( - ui::MaterialDesignController::GetInstance()->touch_ui() ? 4 : 0)); + SetLayoutInsetDelta( + gfx::Insets(ui::TouchUiController::Get()->touch_ui() ? 4 : 0)); } MediaRouterActionController* CastToolbarButton::GetActionController() const {
diff --git a/chrome/browser/ui/views/native_file_system/native_file_system_browsertest.cc b/chrome/browser/ui/views/native_file_system/native_file_system_browsertest.cc index 9fb0c07..3ebde887 100644 --- a/chrome/browser/ui/views/native_file_system/native_file_system_browsertest.cc +++ b/chrome/browser/ui/views/native_file_system/native_file_system_browsertest.cc
@@ -23,6 +23,7 @@ #include "components/content_settings/core/browser/host_content_settings_map.h" #include "components/network_session_configurator/common/network_switches.h" #include "components/permissions/permission_util.h" +#include "components/safe_browsing/buildflags.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" #include "net/dns/mock_host_resolver.h" @@ -200,8 +201,8 @@ content::EvalJs( web_contents, content::JsReplace("(async () => {" - " const w = await self.entry.createWriter();" - " await w.write(0, new Blob([$1]));" + " const w = await self.entry.createWritable();" + " await w.write(new Blob([$1]));" " await w.close();" " return (await self.entry.getFile()).size; })()", file_contents))); @@ -247,8 +248,8 @@ content::EvalJs( web_contents, content::JsReplace("(async () => {" - " const w = await self.entry.createWriter();" - " await w.write(0, new Blob([$1]));" + " const w = await self.entry.createWritable();" + " await w.write(new Blob([$1]));" " await w.close();" " return (await self.entry.getFile()).size; })()", file_contents))); @@ -304,7 +305,7 @@ " let fsChangePromise = new Promise((resolve) => {" " document.onfullscreenchange = resolve;" " });" - " const w = await self.entry.createWriter();" + " const w = await self.entry.createWritable();" " await fsChangePromise;" " return; })()")); @@ -313,6 +314,7 @@ EXPECT_FALSE(IsFullscreen()); } +#if BUILDFLAG(FULL_SAFE_BROWSING) IN_PROC_BROWSER_TEST_P(NativeFileSystemBrowserTest, SafeBrowsing) { const base::FilePath test_file = temp_dir_.GetPath().AppendASCII("test.exe"); @@ -369,13 +371,14 @@ "(async () => {" " let e = await self.chooseFileSystemEntries(" " {type: 'save-file'});" - " const w = await e.createWriter();" - " await w.write(0, 'abc');" + " const w = await e.createWritable();" + " await w.write('abc');" " await w.close();" " return e.name; })()")); EXPECT_TRUE(invoked_safe_browsing); } +#endif IN_PROC_BROWSER_TEST_P(NativeFileSystemBrowserTest, OpenFileWithContentSettingAllow) { @@ -416,8 +419,8 @@ content::EvalJs( web_contents, content::JsReplace("(async () => {" - " const w = await self.entry.createWriter();" - " await w.write(0, new Blob([$1]));" + " const w = await self.entry.createWritable();" + " await w.write(new Blob([$1]));" " await w.close();" " return (await self.entry.getFile()).size; })()", file_contents))); @@ -469,8 +472,8 @@ content::EvalJs( web_contents, content::JsReplace("(async () => {" - " const w = await self.entry.createWriter();" - " await w.write(0, new Blob([$1]));" + " const w = await self.entry.createWritable();" + " await w.write(new Blob([$1]));" " await w.close();" " return (await self.entry.getFile()).size; })()", file_contents))); @@ -576,8 +579,8 @@ content::EvalJs( third_party_iframe, content::JsReplace("(async () => {" - " const w = await self.entry.createWriter();" - " await w.write(0, new Blob([$1]));" + " const w = await self.entry.createWritable();" + " await w.write(new Blob([$1]));" " await w.close();" " return (await self.entry.getFile()).size; })()", initial_file_contents)));
diff --git a/chrome/browser/ui/views/native_file_system/native_file_system_usage_bubble_view.cc b/chrome/browser/ui/views/native_file_system/native_file_system_usage_bubble_view.cc index 59f7df9f..3b27174 100644 --- a/chrome/browser/ui/views/native_file_system/native_file_system_usage_bubble_view.cc +++ b/chrome/browser/ui/views/native_file_system/native_file_system_usage_bubble_view.cc
@@ -168,6 +168,7 @@ // views::View void OnThemeChanged() override { + views::View::OnThemeChanged(); const SkColor icon_color = GetNativeTheme()->GetSystemColor( ui::NativeTheme::kColorId_DefaultIconColor); views::SetImageFromVectorIconWithColor(
diff --git a/chrome/browser/ui/views/omnibox/omnibox_match_cell_view.cc b/chrome/browser/ui/views/omnibox/omnibox_match_cell_view.cc index d9e6ac88..86eaefc 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_match_cell_view.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_match_cell_view.cc
@@ -18,7 +18,7 @@ #include "components/omnibox/browser/vector_icons.h" #include "extensions/common/image_util.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/material_design/material_design_controller.h" +#include "ui/base/pointer/touch_ui_controller.h" #include "ui/gfx/canvas.h" #include "ui/gfx/color_palette.h" #include "ui/gfx/image/canvas_image_source.h" @@ -155,7 +155,7 @@ // static int OmniboxMatchCellView::GetTextIndent() { - return ui::MaterialDesignController::GetInstance()->touch_ui() ? 51 : 47; + return ui::TouchUiController::Get()->touch_ui() ? 51 : 47; } void OmniboxMatchCellView::OnMatchUpdate(const OmniboxResultView* result_view,
diff --git a/chrome/browser/ui/views/omnibox/omnibox_result_view.cc b/chrome/browser/ui/views/omnibox/omnibox_result_view.cc index 57634944..596486b8 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_result_view.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_result_view.cc
@@ -590,6 +590,7 @@ } void OmniboxResultView::OnThemeChanged() { + views::View::OnThemeChanged(); views::SetImageFromVectorIcon(remove_suggestion_button_, vector_icons::kCloseRoundedIcon, GetLayoutConstant(LOCATION_BAR_ICON_SIZE),
diff --git a/chrome/browser/ui/views/omnibox/omnibox_text_view.cc b/chrome/browser/ui/views/omnibox/omnibox_text_view.cc index 6d8a6aa..1468959 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_text_view.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_text_view.cc
@@ -17,7 +17,7 @@ #include "chrome/browser/ui/views/chrome_typography.h" #include "components/omnibox/browser/omnibox_field_trial.h" #include "components/omnibox/common/omnibox_features.h" -#include "ui/base/material_design/material_design_controller.h" +#include "ui/base/pointer/touch_ui_controller.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/gfx/color_palette.h"
diff --git a/chrome/browser/ui/views/omnibox/rounded_omnibox_results_frame.cc b/chrome/browser/ui/views/omnibox/rounded_omnibox_results_frame.cc index fb8fc5c..5239ed1c 100644 --- a/chrome/browser/ui/views/omnibox/rounded_omnibox_results_frame.cc +++ b/chrome/browser/ui/views/omnibox/rounded_omnibox_results_frame.cc
@@ -9,7 +9,7 @@ #include "chrome/browser/ui/layout_constants.h" #include "chrome/browser/ui/omnibox/omnibox_theme.h" #include "chrome/browser/ui/views/location_bar/location_bar_view.h" -#include "ui/base/material_design/material_design_controller.h" +#include "ui/base/pointer/touch_ui_controller.h" #include "ui/compositor/layer.h" #include "ui/gfx/color_palette.h" #include "ui/gfx/color_utils.h" @@ -67,6 +67,7 @@ ~OmniboxResultsContentsView() override = default; void OnThemeChanged() override { + views::View::OnThemeChanged(); const SkColor background_color = GetOmniboxColor(GetThemeProvider(), OmniboxPart::RESULTS_BACKGROUND); SetBackground(views::CreateSolidBackground(background_color)); @@ -81,6 +82,7 @@ : location_bar_(location_bar) {} void OnThemeChanged() override { + views::View::OnThemeChanged(); const SkColor background_color = GetOmniboxColor(GetThemeProvider(), OmniboxPart::RESULTS_BACKGROUND); @@ -204,9 +206,8 @@ // static gfx::Insets RoundedOmniboxResultsFrame::GetLocationBarAlignmentInsets() { - return ui::MaterialDesignController::GetInstance()->touch_ui() - ? gfx::Insets(6, 1, 5, 1) - : gfx::Insets(4, 6); + return ui::TouchUiController::Get()->touch_ui() ? gfx::Insets(6, 1, 5, 1) + : gfx::Insets(4, 6); } // static @@ -271,6 +272,7 @@ #endif // !USE_AURA void RoundedOmniboxResultsFrame::OnThemeChanged() { + views::View::OnThemeChanged(); const SkColor background_color = GetOmniboxColor(GetThemeProvider(), OmniboxPart::RESULTS_BACKGROUND);
diff --git a/chrome/browser/ui/views/page_action/page_action_icon_view.cc b/chrome/browser/ui/views/page_action/page_action_icon_view.cc index ba581d9..9571f6c 100644 --- a/chrome/browser/ui/views/page_action/page_action_icon_view.cc +++ b/chrome/browser/ui/views/page_action/page_action_icon_view.cc
@@ -175,9 +175,7 @@ void PageActionIconView::OnTouchUiChanged() { icon_size_ = GetLayoutConstant(LOCATION_BAR_ICON_SIZE); UpdateIconImage(); - UpdateBorder(); - if (GetVisible()) - PreferredSizeChanged(); + IconLabelBubbleView::OnTouchUiChanged(); } const char* PageActionIconView::GetClassName() const {
diff --git a/chrome/browser/ui/views/passwords/credential_leak_dialog_view.cc b/chrome/browser/ui/views/passwords/credential_leak_dialog_view.cc index 1e50da27..29b4dc43 100644 --- a/chrome/browser/ui/views/passwords/credential_leak_dialog_view.cc +++ b/chrome/browser/ui/views/passwords/credential_leak_dialog_view.cc
@@ -146,6 +146,7 @@ } void CredentialLeakDialogView::OnThemeChanged() { + views::DialogDelegateView::OnThemeChanged(); GetBubbleFrameView()->SetHeaderView( CreateIllustration(GetNativeTheme()->ShouldUseDarkColors())); }
diff --git a/chrome/browser/ui/views/passwords/password_generation_popup_view_views.cc b/chrome/browser/ui/views/passwords/password_generation_popup_view_views.cc index 4c6d3ea..a31d1f9 100644 --- a/chrome/browser/ui/views/passwords/password_generation_popup_view_views.cc +++ b/chrome/browser/ui/views/passwords/password_generation_popup_view_views.cc
@@ -237,6 +237,7 @@ } void PasswordGenerationPopupViewViews::OnThemeChanged() { + autofill::AutofillPopupBaseView::OnThemeChanged(); SetBackground(views::CreateSolidBackground(GetBackgroundColor())); password_view_->UpdateBackground(controller_->password_selected() ? GetSelectedBackgroundColor()
diff --git a/chrome/browser/ui/views/passwords/password_save_update_view.cc b/chrome/browser/ui/views/passwords/password_save_update_view.cc index d99233f..abcb6cb 100644 --- a/chrome/browser/ui/views/passwords/password_save_update_view.cc +++ b/chrome/browser/ui/views/passwords/password_save_update_view.cc
@@ -415,6 +415,7 @@ } void PasswordSaveUpdateView::OnThemeChanged() { + PasswordBubbleViewBase::OnThemeChanged(); if (int id = controller_.GetTopIllustration( color_utils::IsDark(GetBubbleFrameView()->GetBackgroundColor()))) { GetBubbleFrameView()->SetHeaderView(CreateHeaderImage(id));
diff --git a/chrome/browser/ui/views/passwords/password_save_update_with_account_store_view.cc b/chrome/browser/ui/views/passwords/password_save_update_with_account_store_view.cc index ad901f35..29b2eec 100644 --- a/chrome/browser/ui/views/passwords/password_save_update_with_account_store_view.cc +++ b/chrome/browser/ui/views/passwords/password_save_update_with_account_store_view.cc
@@ -490,6 +490,7 @@ } void PasswordSaveUpdateWithAccountStoreView::OnThemeChanged() { + PasswordBubbleViewBase::OnThemeChanged(); if (int id = controller_.GetTopIllustration( color_utils::IsDark(GetBubbleFrameView()->GetBackgroundColor()))) { GetBubbleFrameView()->SetHeaderView(CreateHeaderImage(id));
diff --git a/chrome/browser/ui/views/profiles/avatar_toolbar_button.cc b/chrome/browser/ui/views/profiles/avatar_toolbar_button.cc index 93e72b8..faf1d11 100644 --- a/chrome/browser/ui/views/profiles/avatar_toolbar_button.cc +++ b/chrome/browser/ui/views/profiles/avatar_toolbar_button.cc
@@ -75,8 +75,6 @@ // the left and the (potential) user name on the right. SetHorizontalAlignment(gfx::ALIGN_LEFT); - md_observer_.Add(ui::MaterialDesignController::GetInstance()); - // TODO(crbug.com/922525): DCHECK(parent_) instead of the if, once we always // have a parent. if (parent_) @@ -204,11 +202,6 @@ UpdateText(); } -void AvatarToolbarButton::OnTouchUiChanged() { - SetInsets(); - PreferredSizeChanged(); -} - void AvatarToolbarButton::OnHighlightChanged() { DCHECK(parent_); delegate_->OnHighlightChanged(); @@ -244,7 +237,7 @@ gfx::ImageSkia AvatarToolbarButton::GetAvatarIcon( ButtonState state, const gfx::Image& gaia_account_image) const { - const int icon_size = ui::MaterialDesignController::GetInstance()->touch_ui() + const int icon_size = ui::TouchUiController::Get()->touch_ui() ? kDefaultTouchableIconSize : kIconSizeForNonTouchUi; SkColor icon_color = GetForegroundColor(state); @@ -274,7 +267,7 @@ void AvatarToolbarButton::SetInsets() { // In non-touch mode we use a larger-than-normal icon size for avatars so we // need to compensate it by smaller insets. - const bool touch_ui = ui::MaterialDesignController::GetInstance()->touch_ui(); + const bool touch_ui = ui::TouchUiController::Get()->touch_ui(); gfx::Insets layout_insets( touch_ui ? 0 : (kDefaultIconSize - kIconSizeForNonTouchUi) / 2); SetLayoutInsetDelta(layout_insets);
diff --git a/chrome/browser/ui/views/profiles/avatar_toolbar_button.h b/chrome/browser/ui/views/profiles/avatar_toolbar_button.h index 3261b5c1..d246624 100644 --- a/chrome/browser/ui/views/profiles/avatar_toolbar_button.h +++ b/chrome/browser/ui/views/profiles/avatar_toolbar_button.h
@@ -11,15 +11,13 @@ #include "base/scoped_observer.h" #include "chrome/browser/ui/views/toolbar/toolbar_button.h" #include "chrome/browser/ui/views/toolbar/toolbar_icon_container_view.h" -#include "ui/base/material_design/material_design_controller.h" -#include "ui/base/material_design/material_design_controller_observer.h" +#include "ui/base/pointer/touch_ui_controller.h" #include "ui/events/event.h" class AvatarToolbarButtonDelegate; class Browser; class AvatarToolbarButton : public ToolbarButton, - public ui::MaterialDesignControllerObserver, ToolbarIconContainerView::Observer { public: // States of the button ordered in priority of getting displayed. @@ -72,9 +70,6 @@ void OnBlur() override; void OnThemeChanged() override; - // ui::MaterialDesignControllerObserver: - void OnTouchUiChanged() override; - // ToolbarIconContainerView::Observer: void OnHighlightChanged() override; @@ -84,14 +79,17 @@ void SetInsets(); + void OnTouchUiChanged(); + std::unique_ptr<AvatarToolbarButtonDelegate> delegate_; Browser* const browser_; ToolbarIconContainerView* const parent_; - ScopedObserver<ui::MaterialDesignController, - ui::MaterialDesignControllerObserver> - md_observer_{this}; + std::unique_ptr<ui::TouchUiController::Subscription> subscription_ = + ui::TouchUiController::Get()->RegisterCallback( + base::BindRepeating(&AvatarToolbarButton::SetInsets, + base::Unretained(this))); base::ObserverList<Observer>::Unchecked observer_list_;
diff --git a/chrome/browser/ui/views/profiles/badged_profile_photo.cc b/chrome/browser/ui/views/profiles/badged_profile_photo.cc index 79602a8..0698088 100644 --- a/chrome/browser/ui/views/profiles/badged_profile_photo.cc +++ b/chrome/browser/ui/views/profiles/badged_profile_photo.cc
@@ -62,6 +62,7 @@ // views::View void OnThemeChanged() override { + ::views::ImageView::OnThemeChanged(); switch (badge_type_) { case BadgedProfilePhoto::BADGE_TYPE_SUPERVISOR: SetImage(gfx::CreateVectorIcon(
diff --git a/chrome/browser/ui/views/profiles/profile_menu_view_base.cc b/chrome/browser/ui/views/profiles/profile_menu_view_base.cc index a4e7cf8..512c187 100644 --- a/chrome/browser/ui/views/profiles/profile_menu_view_base.cc +++ b/chrome/browser/ui/views/profiles/profile_menu_view_base.cc
@@ -153,6 +153,7 @@ // views::ImageButton: void OnThemeChanged() override { + views::ImageButton::OnThemeChanged(); constexpr int kImageSize = 28; constexpr float kShortcutIconToImageRatio = 9.0f / 16.0f; const int kBorderThickness = show_border_ ? 1 : 0; @@ -186,6 +187,7 @@ // views::ImageView: void OnThemeChanged() override { + views::ImageView::OnThemeChanged(); constexpr int kIconSize = 16; const SkColor icon_color = GetNativeTheme()->GetSystemColor( ui::NativeTheme::kColorId_DefaultIconColor); @@ -207,6 +209,7 @@ // views::ImageView: void OnThemeChanged() override { + views::ImageView::OnThemeChanged(); constexpr float kIconToImageRatio = 0.75f; constexpr int kIconSize = 20; const SkColor icon_color = GetNativeTheme()->GetSystemColor(
diff --git a/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_bubble_device_button.cc b/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_bubble_device_button.cc index f06bcb1f4..470ee82 100644 --- a/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_bubble_device_button.cc +++ b/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_bubble_device_button.cc
@@ -37,6 +37,7 @@ // views::View: void OnThemeChanged() override { + views::ImageView::OnThemeChanged(); const SkColor icon_color = GetNativeTheme()->GetSystemColor( ui::NativeTheme::kColorId_DefaultIconColor); SetImage(
diff --git a/chrome/browser/ui/views/status_bubble_views.cc b/chrome/browser/ui/views/status_bubble_views.cc index 38754d0..8247be7 100644 --- a/chrome/browser/ui/views/status_bubble_views.cc +++ b/chrome/browser/ui/views/status_bubble_views.cc
@@ -316,6 +316,7 @@ } void StatusBubbleViews::StatusView::OnThemeChanged() { + views::View::OnThemeChanged(); SetTextLabelColors(text_); }
diff --git a/chrome/browser/ui/views/tabs/alert_indicator.cc b/chrome/browser/ui/views/tabs/alert_indicator.cc index e7e5417..9e80932 100644 --- a/chrome/browser/ui/views/tabs/alert_indicator.cc +++ b/chrome/browser/ui/views/tabs/alert_indicator.cc
@@ -10,7 +10,7 @@ #include "chrome/browser/ui/layout_constants.h" #include "chrome/browser/ui/views/tabs/tab.h" #include "components/vector_icons/vector_icons.h" -#include "ui/base/material_design/material_design_controller.h" +#include "ui/base/pointer/touch_ui_controller.h" #include "ui/gfx/animation/multi_animation.h" #include "ui/gfx/canvas.h" #include "ui/gfx/image/image.h" @@ -81,7 +81,7 @@ SkColor button_color) { const gfx::VectorIcon* icon = nullptr; int image_width = GetLayoutConstant(TAB_ALERT_INDICATOR_ICON_WIDTH); - const bool touch_ui = ui::MaterialDesignController::GetInstance()->touch_ui(); + const bool touch_ui = ui::TouchUiController::Get()->touch_ui(); switch (alert_state) { case TabAlertState::AUDIO_PLAYING: icon = touch_ui ? &kTabAudioRoundedIcon : &kTabAudioIcon;
diff --git a/chrome/browser/ui/views/tabs/new_tab_button.cc b/chrome/browser/ui/views/tabs/new_tab_button.cc index ec08579..80709a2 100644 --- a/chrome/browser/ui/views/tabs/new_tab_button.cc +++ b/chrome/browser/ui/views/tabs/new_tab_button.cc
@@ -20,7 +20,7 @@ #include "chrome/grit/generated_resources.h" #include "components/feature_engagement/buildflags.h" #include "components/variations/variations_associated_data.h" -#include "ui/base/material_design/material_design_controller.h" +#include "ui/base/pointer/touch_ui_controller.h" #include "ui/base/theme_provider.h" #include "ui/gfx/color_utils.h" #include "ui/gfx/scoped_canvas.h" @@ -282,8 +282,7 @@ constexpr int kStrokeWidth = 2; flags.setStrokeWidth(kStrokeWidth); - const int radius = - ui::MaterialDesignController::GetInstance()->touch_ui() ? 7 : 6; + const int radius = ui::TouchUiController::Get()->touch_ui() ? 7 : 6; const int offset = GetCornerRadius() - radius; // The cap will be added outside the end of the stroke; inset to compensate. constexpr int kCapRadius = kStrokeWidth / 2;
diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc index a7993f33..a9357e2 100644 --- a/chrome/browser/ui/views/tabs/tab.cc +++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -57,8 +57,8 @@ #include "ui/accessibility/ax_enums.mojom.h" #include "ui/accessibility/ax_node_data.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/material_design/material_design_controller.h" #include "ui/base/models/list_selection_model.h" +#include "ui/base/pointer/touch_ui_controller.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" #include "ui/compositor/clip_recorder.h" @@ -89,8 +89,6 @@ #endif using base::UserMetricsAction; -using MD = ui::MaterialDesignController; - namespace { // When a non-pinned tab becomes a pinned tab the width of the tab animates. If @@ -362,7 +360,7 @@ if (showing_close_button_) { right = close_x; if (extra_alert_indicator_padding_) - right -= MD::GetInstance()->touch_ui() ? 8 : 6; + right -= ui::TouchUiController::Get()->touch_ui() ? 8 : 6; } const gfx::Size image_size = alert_indicator_->GetPreferredSize(); gfx::Rect bounds( @@ -721,6 +719,7 @@ } void Tab::OnThemeChanged() { + TabSlotView::OnThemeChanged(); UpdateForegroundColors(); } @@ -948,7 +947,7 @@ int available_width = GetContentsBounds().width(); - const bool touch_ui = MD::GetInstance()->touch_ui(); + const bool touch_ui = ui::TouchUiController::Get()->touch_ui(); const int favicon_width = gfx::kFaviconSize; const int alert_icon_width = alert_indicator_->GetPreferredSize().width(); // In case of touch optimized UI, the close button has an extra padding on the
diff --git a/chrome/browser/ui/views/tabs/tab_close_button.cc b/chrome/browser/ui/views/tabs/tab_close_button.cc index b5accb0..e70b274 100644 --- a/chrome/browser/ui/views/tabs/tab_close_button.cc +++ b/chrome/browser/ui/views/tabs/tab_close_button.cc
@@ -17,7 +17,7 @@ #include "chrome/browser/ui/views/tabs/tab_controller.h" #include "components/strings/grit/components_strings.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/material_design/material_design_controller.h" +#include "ui/base/pointer/touch_ui_controller.h" #include "ui/gfx/canvas.h" #include "ui/gfx/color_utils.h" #include "ui/gfx/image/image_skia_operations.h" @@ -82,9 +82,8 @@ // static int TabCloseButton::GetWidth() { - return ui::MaterialDesignController::GetInstance()->touch_ui() - ? kTouchGlyphWidth - : kGlyphWidth; + return ui::TouchUiController::Get()->touch_ui() ? kTouchGlyphWidth + : kGlyphWidth; } void TabCloseButton::SetIconColors(SkColor foreground_color,
diff --git a/chrome/browser/ui/views/tabs/tab_group_header.cc b/chrome/browser/ui/views/tabs/tab_group_header.cc index 8ca9228..b76dbf7 100644 --- a/chrome/browser/ui/views/tabs/tab_group_header.cc +++ b/chrome/browser/ui/views/tabs/tab_group_header.cc
@@ -168,6 +168,7 @@ } void TabGroupHeader::OnThemeChanged() { + TabSlotView::OnThemeChanged(); VisualsChanged(); }
diff --git a/chrome/browser/ui/views/tabs/tab_icon.cc b/chrome/browser/ui/views/tabs/tab_icon.cc index 217bb466..f3bcff3 100644 --- a/chrome/browser/ui/views/tabs/tab_icon.cc +++ b/chrome/browser/ui/views/tabs/tab_icon.cc
@@ -196,6 +196,7 @@ } void TabIcon::OnThemeChanged() { + views::View::OnThemeChanged(); crashed_icon_ = gfx::ImageSkia(); // Force recomputation if crashed. if (!themed_favicon_.isNull()) themed_favicon_ = ThemeImage(favicon_);
diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc index f472640a..28a0285 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -100,8 +100,6 @@ #include "ui/aura/window.h" #endif -using MD = ui::MaterialDesignController; - namespace { // Distance from the next/previous stacked before before we consider the tab @@ -268,7 +266,7 @@ int GetStackableTabWidth() { return TabStyle::GetTabOverlap() + - (MD::GetInstance()->touch_ui() ? 136 : 102); + (ui::TouchUiController::Get()->touch_ui() ? 136 : 102); } } // namespace @@ -936,7 +934,6 @@ drag_context_(std::make_unique<TabDragContextImpl>(this)) { Init(); SetEventTargeter(std::make_unique<views::ViewTargeter>(this)); - md_observer_.Add(MD::GetInstance()); } TabStrip::~TabStrip() { @@ -2243,6 +2240,7 @@ } void TabStrip::OnThemeChanged() { + views::AccessiblePaneView::OnThemeChanged(); FrameColorsChanged(); }
diff --git a/chrome/browser/ui/views/tabs/tab_strip.h b/chrome/browser/ui/views/tabs/tab_strip.h index 5eb4e6a2..e00ab5e5 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.h +++ b/chrome/browser/ui/views/tabs/tab_strip.h
@@ -29,8 +29,7 @@ #include "chrome/browser/ui/views/tabs/tab_group_header.h" #include "chrome/browser/ui/views/tabs/tab_group_views.h" #include "components/tab_groups/tab_group_visual_data.h" -#include "ui/base/material_design/material_design_controller.h" -#include "ui/base/material_design/material_design_controller_observer.h" +#include "ui/base/pointer/touch_ui_controller.h" #include "ui/gfx/color_palette.h" #include "ui/gfx/geometry/point.h" #include "ui/gfx/geometry/rect.h" @@ -83,8 +82,7 @@ public views::ViewTargeterDelegate, public views::WidgetObserver, public TabController, - public BrowserRootView::DropTarget, - public ui::MaterialDesignControllerObserver { + public BrowserRootView::DropTarget { public: explicit TabStrip(std::unique_ptr<TabStripController> controller); ~TabStrip() override; @@ -649,8 +647,7 @@ // views::WidgetObserver: void OnWidgetActivationChanged(views::Widget* widget, bool active) override; - // ui::MaterialDesignControllerObserver: - void OnTouchUiChanged() override; + void OnTouchUiChanged(); // -- Member Variables ------------------------------------------------------ @@ -762,9 +759,10 @@ SkColor separator_color_ = gfx::kPlaceholderColor; - ScopedObserver<ui::MaterialDesignController, - ui::MaterialDesignControllerObserver> - md_observer_{this}; + std::unique_ptr<ui::TouchUiController::Subscription> subscription_ = + ui::TouchUiController::Get()->RegisterCallback( + base::BindRepeating(&TabStrip::OnTouchUiChanged, + base::Unretained(this))); std::unique_ptr<TabDragContextImpl> drag_context_;
diff --git a/chrome/browser/ui/views/tabs/tab_strip_layout_helper.cc b/chrome/browser/ui/views/tabs/tab_strip_layout_helper.cc index 60ddb33..ea01146 100644 --- a/chrome/browser/ui/views/tabs/tab_strip_layout_helper.cc +++ b/chrome/browser/ui/views/tabs/tab_strip_layout_helper.cc
@@ -21,7 +21,7 @@ #include "chrome/browser/ui/views/tabs/tab_strip_controller.h" #include "chrome/browser/ui/views/tabs/tab_strip_layout_types.h" #include "chrome/browser/ui/views/tabs/tab_style_views.h" -#include "ui/base/material_design/material_design_controller.h" +#include "ui/base/pointer/touch_ui_controller.h" #include "ui/views/view_model.h" namespace {
diff --git a/chrome/browser/ui/views/tabs/tab_strip_unittest.cc b/chrome/browser/ui/views/tabs/tab_strip_unittest.cc index 9e0d962..a4a8244b 100644 --- a/chrome/browser/ui/views/tabs/tab_strip_unittest.cc +++ b/chrome/browser/ui/views/tabs/tab_strip_unittest.cc
@@ -29,7 +29,7 @@ #include "chrome/test/views/chrome_views_test_base.h" #include "components/tab_groups/tab_group_id.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/material_design/material_design_controller.h" +#include "ui/base/pointer/touch_ui_controller.h" #include "ui/events/base_event_utils.h" #include "ui/gfx/animation/animation_test_api.h" #include "ui/gfx/canvas.h" @@ -267,7 +267,7 @@ 0); private: - ui::MaterialDesignController::TouchUiScoperForTesting touch_ui_scoper_; + ui::TouchUiController::TouchUiScoperForTesting touch_ui_scoper_; std::unique_ptr<base::AutoReset<gfx::Animation::RichAnimationRenderMode>> animation_mode_reset_; @@ -524,7 +524,7 @@ // the tabstrip is in stacked tab mode. TEST_P(TabStripTest, TabCloseButtonVisibilityWhenStacked) { // Touch-optimized UI requires a larger width for tabs to show close buttons. - const bool touch_ui = ui::MaterialDesignController::GetInstance()->touch_ui(); + const bool touch_ui = ui::TouchUiController::Get()->touch_ui(); tab_strip_->SetBounds(0, 0, touch_ui ? 442 : 346, 20); controller_->AddTab(0, false); controller_->AddTab(1, true); @@ -596,7 +596,7 @@ // Set the tab strip width to be wide enough for three tabs to show all // three icons, but not enough for five tabs to show all three icons. // Touch-optimized UI requires a larger width for tabs to show close buttons. - const bool touch_ui = ui::MaterialDesignController::GetInstance()->touch_ui(); + const bool touch_ui = ui::TouchUiController::Get()->touch_ui(); tab_strip_->SetBounds(0, 0, touch_ui ? 442 : 346, 20); controller_->AddTab(0, false); controller_->AddTab(1, true); @@ -1291,8 +1291,7 @@ Tab* tab = tab_strip_->tab_at(0); const int initial_height = tab->height(); - ui::MaterialDesignController::TouchUiScoperForTesting other_layout( - !GetParam()); + ui::TouchUiController::TouchUiScoperForTesting other_layout(!GetParam()); CompleteAnimationAndLayout(); if (GetParam()) {
diff --git a/chrome/browser/ui/views/toolbar/app_menu.cc b/chrome/browser/ui/views/toolbar/app_menu.cc index 8a68945..f0acc3a 100644 --- a/chrome/browser/ui/views/toolbar/app_menu.cc +++ b/chrome/browser/ui/views/toolbar/app_menu.cc
@@ -272,6 +272,7 @@ // views::LabelButton void OnThemeChanged() override { + LabelButton::OnThemeChanged(); ui::NativeTheme* theme = GetNativeTheme(); if (theme) { SetTextColor(
diff --git a/chrome/browser/ui/views/toolbar/browser_app_menu_button.cc b/chrome/browser/ui/views/toolbar/browser_app_menu_button.cc index 486e4ca..59e399d 100644 --- a/chrome/browser/ui/views/toolbar/browser_app_menu_button.cc +++ b/chrome/browser/ui/views/toolbar/browser_app_menu_button.cc
@@ -143,8 +143,6 @@ SetHorizontalAlignment(gfx::ALIGN_RIGHT); set_ink_drop_visible_opacity(kToolbarInkDropVisibleOpacity); - - md_observer_.Add(ui::MaterialDesignController::GetInstance()); } BrowserAppMenuButton::~BrowserAppMenuButton() {} @@ -259,7 +257,7 @@ } void BrowserAppMenuButton::UpdateIcon() { - bool touch_ui = ui::MaterialDesignController::GetInstance()->touch_ui(); + bool touch_ui = ui::TouchUiController::Get()->touch_ui(); if (base::FeatureList::IsEnabled(features::kUseTextForUpdateButton)) { const gfx::VectorIcon& icon = touch_ui ? kBrowserToolsTouchIcon : kBrowserToolsIcon; @@ -277,12 +275,6 @@ } } -void BrowserAppMenuButton::OnTouchUiChanged() { - UpdateIcon(); - UpdateColorsAndInsets(); - PreferredSizeChanged(); -} - const char* BrowserAppMenuButton::GetClassName() const { return "BrowserAppMenuButton"; } @@ -374,3 +366,9 @@ return AppMenuButton::GetTooltipText(p); } + +void BrowserAppMenuButton::OnTouchUiChanged() { + UpdateIcon(); + UpdateColorsAndInsets(); + PreferredSizeChanged(); +}
diff --git a/chrome/browser/ui/views/toolbar/browser_app_menu_button.h b/chrome/browser/ui/views/toolbar/browser_app_menu_button.h index 896e3f1..6cccd59 100644 --- a/chrome/browser/ui/views/toolbar/browser_app_menu_button.h +++ b/chrome/browser/ui/views/toolbar/browser_app_menu_button.h
@@ -14,8 +14,7 @@ #include "chrome/browser/ui/toolbar/app_menu_icon_controller.h" #include "chrome/browser/ui/views/frame/app_menu_button.h" #include "components/feature_engagement/buildflags.h" -#include "ui/base/material_design/material_design_controller.h" -#include "ui/base/material_design/material_design_controller_observer.h" +#include "ui/base/pointer/touch_ui_controller.h" #include "ui/views/view.h" class ToolbarView; @@ -23,8 +22,7 @@ // The app menu button in the main browser window (as opposed to web app // windows, which is implemented in WebAppMenuButton). -class BrowserAppMenuButton : public AppMenuButton, - public ui::MaterialDesignControllerObserver { +class BrowserAppMenuButton : public AppMenuButton { public: explicit BrowserAppMenuButton(ToolbarView* toolbar_view); BrowserAppMenuButton(const BrowserAppMenuButton&) = delete; @@ -58,9 +56,6 @@ static bool g_open_app_immediately_for_testing; protected: - // ui::MaterialDesignControllerObserver: - void OnTouchUiChanged() override; - // If the button is being used as an anchor for a promo, returns the best // promo color given the current background color. Otherwise, returns the // standard ToolbarButton foreground color for the given |state|. @@ -83,6 +78,8 @@ SkColor GetInkDropBaseColor() const override; base::string16 GetTooltipText(const gfx::Point& p) const override; + void OnTouchUiChanged(); + AppMenuIconController::TypeAndSeverity type_and_severity_{ AppMenuIconController::IconType::NONE, AppMenuIconController::Severity::NONE}; @@ -93,9 +90,10 @@ // The feature, if any, for which this button is anchoring a promo. base::Optional<InProductHelpFeature> promo_feature_; - ScopedObserver<ui::MaterialDesignController, - ui::MaterialDesignControllerObserver> - md_observer_{this}; + std::unique_ptr<ui::TouchUiController::Subscription> subscription_ = + ui::TouchUiController::Get()->RegisterCallback( + base::BindRepeating(&BrowserAppMenuButton::OnTouchUiChanged, + base::Unretained(this))); // Used to spawn weak pointers for delayed tasks to open the overflow menu. base::WeakPtrFactory<BrowserAppMenuButton> weak_factory_{this};
diff --git a/chrome/browser/ui/views/toolbar/reload_button.cc b/chrome/browser/ui/views/toolbar/reload_button.cc index 093a35f3..39e34d09 100644 --- a/chrome/browser/ui/views/toolbar/reload_button.cc +++ b/chrome/browser/ui/views/toolbar/reload_button.cc
@@ -17,8 +17,8 @@ #include "chrome/grit/generated_resources.h" #include "components/vector_icons/vector_icons.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/material_design/material_design_controller.h" #include "ui/base/models/simple_menu_model.h" +#include "ui/base/pointer/touch_ui_controller.h" #include "ui/base/theme_provider.h" #include "ui/base/window_open_disposition.h" #include "ui/gfx/color_palette.h" @@ -37,7 +37,7 @@ const gfx::VectorIcon& GetIconForMode(ReloadButton::IconStyle icon_style, bool is_reload) { - const bool touch_ui = ui::MaterialDesignController::GetInstance()->touch_ui(); + const bool touch_ui = ui::TouchUiController::Get()->touch_ui(); #if defined(OS_WIN) if (icon_style == ReloadButton::IconStyle::kMinimalUi &&
diff --git a/chrome/browser/ui/views/toolbar/toolbar_account_icon_container_view.cc b/chrome/browser/ui/views/toolbar/toolbar_account_icon_container_view.cc index 458f06d..51b5e26 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_account_icon_container_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_account_icon_container_view.cc
@@ -103,6 +103,7 @@ } void ToolbarAccountIconContainerView::OnThemeChanged() { + ToolbarIconContainerView::OnThemeChanged(); // Update icon color. UpdateAllIcons(); }
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc index 942017c1..f165e90f 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -72,7 +72,7 @@ #include "media/base/media_switches.h" #include "ui/accessibility/ax_node_data.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/material_design/material_design_controller.h" +#include "ui/base/pointer/touch_ui_controller.h" #include "ui/base/theme_provider.h" #include "ui/base/window_open_disposition.h" #include "ui/compositor/layer.h" @@ -152,7 +152,6 @@ chrome::AddCommandObserver(browser_, IDC_SHOW_AVATAR_MENU, this); UpgradeDetector::GetInstance()->AddObserver(this); - md_observer_.Add(ui::MaterialDesignController::GetInstance()); if (display_mode_ == DisplayMode::NORMAL) SetBackground(std::make_unique<TopContainerBackground>(browser_view)); @@ -627,6 +626,7 @@ } void ToolbarView::OnThemeChanged() { + views::AccessiblePaneView::OnThemeChanged(); if (!initialized_) return; @@ -672,28 +672,6 @@ return true; } -// ui::MaterialDesignControllerObserver: -void ToolbarView::OnTouchUiChanged() { - if (display_mode_ == DisplayMode::NORMAL) { - // Update the internal margins for touch layout. - // TODO(dfried): I think we can do better than this by making the touch UI - // code cleaner. - const int default_margin = GetLayoutConstant(TOOLBAR_ELEMENT_PADDING); - const int location_bar_margin = GetLayoutConstant(TOOLBAR_STANDARD_SPACING); - layout_manager_->SetDefault(views::kMarginsKey, - gfx::Insets(0, default_margin)); - location_bar_->SetProperty(views::kMarginsKey, - gfx::Insets(0, location_bar_margin)); - if (browser_actions_) { - browser_actions_->SetProperty(views::kInternalPaddingKey, - gfx::Insets(0, location_bar_margin)); - } - - LoadImages(); - PreferredSizeChanged(); - } -} - //////////////////////////////////////////////////////////////////////////////// // ToolbarView, private: @@ -921,7 +899,7 @@ ThemeProperties::COLOR_TOOLBAR_VERTICAL_SEPARATOR)); } - const bool touch_ui = ui::MaterialDesignController::GetInstance()->touch_ui(); + const bool touch_ui = ui::TouchUiController::Get()->touch_ui(); const gfx::VectorIcon& back_image = touch_ui ? kBackArrowTouchIcon : vector_icons::kBackArrowIcon; @@ -983,3 +961,24 @@ show_home_button_.GetValue() || browser_->deprecated_is_app(); home_->SetVisible(show_home_button); } + +void ToolbarView::OnTouchUiChanged() { + if (display_mode_ == DisplayMode::NORMAL) { + // Update the internal margins for touch layout. + // TODO(dfried): I think we can do better than this by making the touch UI + // code cleaner. + const int default_margin = GetLayoutConstant(TOOLBAR_ELEMENT_PADDING); + const int location_bar_margin = GetLayoutConstant(TOOLBAR_STANDARD_SPACING); + layout_manager_->SetDefault(views::kMarginsKey, + gfx::Insets(0, default_margin)); + location_bar_->SetProperty(views::kMarginsKey, + gfx::Insets(0, location_bar_margin)); + if (browser_actions_) { + browser_actions_->SetProperty(views::kInternalPaddingKey, + gfx::Insets(0, location_bar_margin)); + } + + LoadImages(); + PreferredSizeChanged(); + } +}
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.h b/chrome/browser/ui/views/toolbar/toolbar_view.h index 782a974..76348709 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view.h +++ b/chrome/browser/ui/views/toolbar/toolbar_view.h
@@ -26,7 +26,7 @@ #include "chrome/browser/upgrade_detector/upgrade_observer.h" #include "components/prefs/pref_member.h" #include "ui/base/accelerators/accelerator.h" -#include "ui/base/material_design/material_design_controller_observer.h" +#include "ui/base/pointer/touch_ui_controller.h" #include "ui/views/accessible_pane_view.h" #include "ui/views/animation/animation_delegate_views.h" #include "ui/views/controls/button/button.h" @@ -75,8 +75,7 @@ public AppMenuIconController::Delegate, public UpgradeObserver, public ToolbarButtonProvider, - public BrowserRootView::DropTarget, - public ui::MaterialDesignControllerObserver { + public BrowserRootView::DropTarget { public: // Types of display mode this toolbar can have. enum class DisplayMode { @@ -199,9 +198,6 @@ // AccessiblePaneView: bool SetPaneFocusAndFocusDefault() override; - // ui::MaterialDesignControllerObserver: - void OnTouchUiChanged() override; - // This controls Toolbar, LocationBar and CustomTabBar visibility. // If we don't set all three, tab navigation from the app menu breaks // on Chrome OS. @@ -258,6 +254,8 @@ void OnShowHomeButtonChanged(); void UpdateHomeButtonVisibility(); + void OnTouchUiChanged(); + gfx::SlideAnimation size_animation_{this}; // Controls. Most of these can be null, e.g. in popup windows. Only @@ -290,9 +288,10 @@ // The display mode used when laying out the toolbar. const DisplayMode display_mode_; - ScopedObserver<ui::MaterialDesignController, - ui::MaterialDesignControllerObserver> - md_observer_{this}; + std::unique_ptr<ui::TouchUiController::Subscription> subscription_ = + ui::TouchUiController::Get()->RegisterCallback( + base::BindRepeating(&ToolbarView::OnTouchUiChanged, + base::Unretained(this))); // Whether this toolbar has been initialized. bool initialized_ = false;
diff --git a/chrome/browser/ui/views/toolbar/webui_tab_counter_button.cc b/chrome/browser/ui/views/toolbar/webui_tab_counter_button.cc index 77a8d5cd..07a46175 100644 --- a/chrome/browser/ui/views/toolbar/webui_tab_counter_button.cc +++ b/chrome/browser/ui/views/toolbar/webui_tab_counter_button.cc
@@ -324,6 +324,7 @@ } void WebUITabCounterButton::OnThemeChanged() { + views::Button::OnThemeChanged(); UpdateColors(); ConfigureInkDropForToolbar(this); }
diff --git a/chrome/browser/ui/views/web_apps/web_app_frame_toolbar_view.cc b/chrome/browser/ui/views/web_apps/web_app_frame_toolbar_view.cc index 3533322..1e84577b 100644 --- a/chrome/browser/ui/views/web_apps/web_app_frame_toolbar_view.cc +++ b/chrome/browser/ui/views/web_apps/web_app_frame_toolbar_view.cc
@@ -46,8 +46,7 @@ #include "components/vector_icons/vector_icons.h" #include "third_party/blink/public/common/features.h" #include "ui/base/hit_test.h" -#include "ui/base/material_design/material_design_controller.h" -#include "ui/base/material_design/material_design_controller_observer.h" +#include "ui/base/pointer/touch_ui_controller.h" #include "ui/base/window_open_disposition.h" #include "ui/compositor/layer_animation_element.h" #include "ui/compositor/layer_animation_sequence.h" @@ -253,8 +252,7 @@ class WebAppFrameToolbarView::NavigationButtonContainer : public views::View, public CommandObserver, - public views::ButtonListener, - public ui::MaterialDesignControllerObserver { + public views::ButtonListener { public: explicit NavigationButtonContainer(BrowserView* browser_view); ~NavigationButtonContainer() override; @@ -272,8 +270,7 @@ const SkColor disabled_color = SkColorSetA(icon_color_, gfx::kDisabledControlAlpha); - const bool touch_ui = - ui::MaterialDesignController::GetInstance()->touch_ui(); + const bool touch_ui = ui::TouchUiController::Get()->touch_ui(); const gfx::VectorIcon& back_image = GetBackImage(touch_ui); back_button_->SetImage(views::Button::STATE_NORMAL, gfx::CreateVectorIcon(back_image, icon_color_)); @@ -305,21 +302,16 @@ ui::DispositionFromEventFlags(event.flags())); } - // ui::MaterialDesignControllerObserver: - void OnTouchUiChanged() override { - GenerateMinimalUIButtonImages(); - SchedulePaint(); - } - private: // The containing browser view. BrowserView* const browser_view_; SkColor icon_color_ = gfx::kPlaceholderColor; - ScopedObserver<ui::MaterialDesignController, - ui::MaterialDesignControllerObserver> - md_observer_{this}; + std::unique_ptr<ui::TouchUiController::Subscription> subscription_ = + ui::TouchUiController::Get()->RegisterCallback(base::BindRepeating( + &NavigationButtonContainer::GenerateMinimalUIButtonImages, + base::Unretained(this))); // These members are owned by the views hierarchy. ToolbarButton* back_button_ = nullptr; @@ -352,7 +344,6 @@ chrome::AddCommandObserver(browser_view_->browser(), IDC_BACK, this); chrome::AddCommandObserver(browser_view_->browser(), IDC_RELOAD, this); - md_observer_.Add(ui::MaterialDesignController::GetInstance()); } WebAppFrameToolbarView::NavigationButtonContainer:: @@ -930,6 +921,7 @@ } void WebAppFrameToolbarView::OnThemeChanged() { + views::AccessiblePaneView::OnThemeChanged(); UpdateCaptionColors(); }
diff --git a/chrome/browser/ui/views/webauthn/authenticator_request_sheet_view.cc b/chrome/browser/ui/views/webauthn/authenticator_request_sheet_view.cc index 07cc434..716e89a3 100644 --- a/chrome/browser/ui/views/webauthn/authenticator_request_sheet_view.cc +++ b/chrome/browser/ui/views/webauthn/authenticator_request_sheet_view.cc
@@ -206,6 +206,7 @@ } void AuthenticatorRequestSheetView::OnThemeChanged() { + views::View::OnThemeChanged(); UpdateIconImageFromModel(); }
diff --git a/chrome/browser/ui/webui/chromeos/login/demo_setup_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/demo_setup_screen_handler.h index 5362c7c..9421818 100644 --- a/chrome/browser/ui/webui/chromeos/login/demo_setup_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/demo_setup_screen_handler.h
@@ -36,7 +36,7 @@ const DemoSetupController::DemoSetupError& error) = 0; }; -// WebUI implementation of DemoSetupScreenView. It controlls UI, receives UI +// WebUI implementation of DemoSetupScreenView. It controls UI, receives UI // events and notifies the Delegate. class DemoSetupScreenHandler : public BaseScreenHandler, public DemoSetupScreenView {
diff --git a/chrome/browser/ui/webui/settings/import_data_handler.cc b/chrome/browser/ui/webui/settings/import_data_handler.cc index d58683f..1637dc0 100644 --- a/chrome/browser/ui/webui/settings/import_data_handler.cc +++ b/chrome/browser/ui/webui/settings/import_data_handler.cc
@@ -191,6 +191,7 @@ new base::DictionaryValue()); browser_profile->SetString("name", source_profile.importer_name); browser_profile->SetInteger("index", i); + browser_profile->SetString("profileName", source_profile.profile); browser_profile->SetBoolean("history", (browser_services & importer::HISTORY) != 0); browser_profile->SetBoolean("favorites",
diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc index d9893e2b..4797a92f 100644 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -1094,6 +1094,8 @@ IDS_SETTINGS_SECURE_DNS_CUSTOM_PLACEHOLDER}, {"secureDnsCustomFormatError", IDS_SETTINGS_SECURE_DNS_CUSTOM_FORMAT_ERROR}, + {"secureDnsCustomConnectionError", + IDS_SETTINGS_SECURE_DNS_CUSTOM_CONNECTION_ERROR}, {"contentSettings", IDS_SETTINGS_CONTENT_SETTINGS}, {"siteSettings", IDS_SETTINGS_SITE_SETTINGS}, {"siteSettingsDescription", IDS_SETTINGS_SITE_SETTINGS_DESCRIPTION},
diff --git a/chrome/browser/ui/webui/settings/settings_secure_dns_handler.cc b/chrome/browser/ui/webui/settings/settings_secure_dns_handler.cc index 661261d8..acf049af 100644 --- a/chrome/browser/ui/webui/settings/settings_secure_dns_handler.cc +++ b/chrome/browser/ui/webui/settings/settings_secure_dns_handler.cc
@@ -16,6 +16,9 @@ #include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" #include "components/country_codes/country_codes.h" +#include "content/public/browser/browser_context.h" +#include "content/public/browser/storage_partition.h" +#include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "net/dns/public/doh_provider_list.h" #include "net/dns/public/util.h" @@ -27,6 +30,8 @@ namespace { +const char kProbeHostname[] = "google.com"; + std::unique_ptr<base::DictionaryValue> CreateSecureDnsSettingDict() { // Fetch the current host resolver configuration. It is not sufficient to read // the secure DNS prefs directly since the host resolver configuration takes @@ -91,6 +96,11 @@ "validateCustomDnsEntry", base::BindRepeating(&SecureDnsHandler::HandleValidateCustomDnsEntry, base::Unretained(this))); + + web_ui()->RegisterMessageCallback( + "probeCustomDnsTemplate", + base::BindRepeating(&SecureDnsHandler::HandleProbeCustomDnsTemplate, + base::Unretained(this))); } void SecureDnsHandler::OnJavascriptAllowed() { @@ -156,6 +166,11 @@ return resolvers; } +void SecureDnsHandler::SetNetworkContextForTesting( + network::mojom::NetworkContext* network_context) { + network_context_for_testing_ = network_context; +} + void SecureDnsHandler::HandleGetSecureDnsResolverList( const base::ListValue* args) { AllowJavascript(); @@ -188,14 +203,75 @@ SplitString(server_templates, " ", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY)) { if (net::dns_util::IsValidDohTemplate(server_template, &server_method)) { - ResolveJavascriptCallback(*callback_id, base::Value(true)); + ResolveJavascriptCallback(*callback_id, base::Value(server_template)); return; } } - ResolveJavascriptCallback(*callback_id, base::Value(false)); + ResolveJavascriptCallback(*callback_id, base::Value(std::string())); return; } +void SecureDnsHandler::HandleProbeCustomDnsTemplate( + const base::ListValue* args) { + AllowJavascript(); + receiver_.reset(); + host_resolver_.reset(); + + std::string server_template; + CHECK(args->GetString(0, &probe_callback_id_)); + CHECK(args->GetString(1, &server_template)); + + net::DnsConfigOverrides overrides; + overrides.search = std::vector<std::string>(); + overrides.attempts = 1; + overrides.randomize_ports = false; + overrides.secure_dns_mode = net::DnsConfig::SecureDnsMode::SECURE; + std::string server_method; + // We only send probe queries to templates that have already passed a format + // validation check. + CHECK(net::dns_util::IsValidDohTemplate(server_template, &server_method)); + overrides.dns_over_https_servers.emplace( + {net::DnsConfig::DnsOverHttpsServerConfig(server_template, + server_method == "POST")}); + auto* network_context = + network_context_for_testing_ + ? network_context_for_testing_ + : content::BrowserContext::GetDefaultStoragePartition( + web_ui()->GetWebContents()->GetBrowserContext()) + ->GetNetworkContext(); + network_context->CreateHostResolver( + overrides, host_resolver_.BindNewPipeAndPassReceiver()); + + network::mojom::ResolveHostParametersPtr parameters = + network::mojom::ResolveHostParameters::New(); + parameters->dns_query_type = net::DnsQueryType::A; + parameters->source = net::HostResolverSource::DNS; + parameters->cache_usage = + network::mojom::ResolveHostParameters::CacheUsage::DISALLOWED; + host_resolver_->ResolveHost(net::HostPortPair(kProbeHostname, 80), + net::NetworkIsolationKey::CreateTransient(), + std::move(parameters), + receiver_.BindNewPipeAndPassRemote()); + receiver_.set_disconnect_handler(base::BindOnce( + &SecureDnsHandler::OnMojoConnectionError, base::Unretained(this))); +} + +// network::ResolveHostClientBase impl: +void SecureDnsHandler::OnComplete( + int result, + const net::ResolveErrorInfo& resolve_error_info, + const base::Optional<net::AddressList>& resolved_addresses) { + receiver_.reset(); + host_resolver_.reset(); + ResolveJavascriptCallback(base::Value(probe_callback_id_), + base::Value(result == 0)); +} + +void SecureDnsHandler::OnMojoConnectionError() { + OnComplete(net::ERR_NAME_NOT_RESOLVED, net::ResolveErrorInfo(net::ERR_FAILED), + base::nullopt); +} + void SecureDnsHandler::SendSecureDnsSettingUpdatesToJavascript() { FireWebUIListener("secure-dns-setting-changed", *CreateSecureDnsSettingDict());
diff --git a/chrome/browser/ui/webui/settings/settings_secure_dns_handler.h b/chrome/browser/ui/webui/settings/settings_secure_dns_handler.h index 1e82f6f4..a5ae38b 100644 --- a/chrome/browser/ui/webui/settings/settings_secure_dns_handler.h +++ b/chrome/browser/ui/webui/settings/settings_secure_dns_handler.h
@@ -9,12 +9,18 @@ #include "base/values.h" #include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h" #include "components/prefs/pref_change_registrar.h" +#include "mojo/public/cpp/bindings/receiver.h" +#include "mojo/public/cpp/bindings/remote.h" #include "net/dns/public/doh_provider_list.h" +#include "services/network/public/cpp/resolve_host_client_base.h" +#include "services/network/public/mojom/host_resolver.mojom.h" +#include "services/network/public/mojom/network_context.mojom.h" namespace settings { // Handler for the Secure DNS setting. -class SecureDnsHandler : public SettingsPageUIHandler { +class SecureDnsHandler : public SettingsPageUIHandler, + network::ResolveHostClientBase { public: SecureDnsHandler(); ~SecureDnsHandler() override; @@ -32,6 +38,9 @@ int country_id, const std::vector<net::DohProviderEntry>& providers); + void SetNetworkContextForTesting( + network::mojom::NetworkContext* network_context); + protected: // Retrieves all pre-approved secure resolvers and returns them to WebUI. void HandleGetSecureDnsResolverList(const base::ListValue* args); @@ -42,11 +51,26 @@ // Returns whether or not a custom entry is valid. void HandleValidateCustomDnsEntry(const base::ListValue* args); + // Returns whether or not a test query to the resolver succeeds. + void HandleProbeCustomDnsTemplate(const base::ListValue* args); + // Retrieves the current host resolver configuration, computes the // corresponding UI representation, and sends it to javascript. void SendSecureDnsSettingUpdatesToJavascript(); private: + // network::ResolveHostClientBase impl: + void OnComplete( + int result, + const net::ResolveErrorInfo& resolve_error_info, + const base::Optional<net::AddressList>& resolved_addresses) override; + + void OnMojoConnectionError(); + + network::mojom::NetworkContext* network_context_for_testing_ = nullptr; + mojo::Receiver<network::mojom::ResolveHostClient> receiver_{this}; + mojo::Remote<network::mojom::HostResolver> host_resolver_; + std::string probe_callback_id_; PrefChangeRegistrar pref_registrar_; DISALLOW_COPY_AND_ASSIGN(SecureDnsHandler);
diff --git a/chrome/browser/ui/webui/settings/settings_secure_dns_handler_browsertest.cc b/chrome/browser/ui/webui/settings/settings_secure_dns_handler_browsertest.cc index 4c050ec..66f5e2a1 100644 --- a/chrome/browser/ui/webui/settings/settings_secure_dns_handler_browsertest.cc +++ b/chrome/browser/ui/webui/settings/settings_secure_dns_handler_browsertest.cc
@@ -6,6 +6,7 @@ #include "build/build_config.h" #include "chrome/browser/browser_process.h" +#include "chrome/browser/net/dns_probe_test_util.h" #include "chrome/browser/net/dns_util.h" #include "chrome/common/chrome_features.h" #include "chrome/common/pref_names.h" @@ -16,6 +17,7 @@ #include "components/policy/policy_constants.h" #include "components/prefs/pref_service.h" #include "content/public/test/test_web_ui.h" +#include "net/dns/public/resolve_error_info.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -33,6 +35,7 @@ constexpr char kGetSecureDnsResolverList[] = "getSecureDnsResolverList"; constexpr char kValidateCustomDnsEntry[] = "validateCustomDnsEntry"; +constexpr char kProbeCustomDnsTemplate[] = "probeCustomDnsTemplate"; constexpr char kWebUiFunctionName[] = "webUiCallbackName"; const std::vector<DohProviderEntry>& GetDohProviderListForTesting() { @@ -454,7 +457,8 @@ // The request should be successful. ASSERT_TRUE(call_data.arg2()->GetBool()); // The template should be valid. - ASSERT_TRUE(call_data.arg3()->GetBool()); + ASSERT_EQ("https://example.template/dns-query", + call_data.arg3()->GetString()); } IN_PROC_BROWSER_TEST_F(SecureDnsHandlerTest, TemplateInvalid) { @@ -469,7 +473,7 @@ // The request should be successful. ASSERT_TRUE(call_data.arg2()->GetBool()); // The template should be invalid. - ASSERT_FALSE(call_data.arg3()->GetBool()); + ASSERT_EQ(std::string(), call_data.arg3()->GetString()); } IN_PROC_BROWSER_TEST_F(SecureDnsHandlerTest, MultipleTemplates) { @@ -484,8 +488,9 @@ EXPECT_EQ(kWebUiFunctionName, call_data_valid.arg1()->GetString()); // The request should be successful. ASSERT_TRUE(call_data_valid.arg2()->GetBool()); - // The entry should be valid. - ASSERT_TRUE(call_data_valid.arg3()->GetBool()); + // The second template should be valid. + ASSERT_EQ("https://example.template/dns-query", + call_data_valid.arg3()->GetString()); base::ListValue args_invalid; args_invalid.AppendString(kWebUiFunctionName); @@ -498,7 +503,62 @@ // The request should be successful. ASSERT_TRUE(call_data_invalid.arg2()->GetBool()); // The entry should be invalid. - ASSERT_FALSE(call_data_invalid.arg3()->GetBool()); + ASSERT_EQ(std::string(), call_data_invalid.arg3()->GetString()); +} + +IN_PROC_BROWSER_TEST_F(SecureDnsHandlerTest, TemplateProbeSuccess) { + auto network_context_ = + std::make_unique<chrome_browser_net::FakeHostResolverNetworkContext>( + std::vector<chrome_browser_net::FakeHostResolver::SingleResult>( + {chrome_browser_net::FakeHostResolver::SingleResult( + net::OK, net::ResolveErrorInfo(net::OK), + chrome_browser_net::FakeHostResolver:: + kOneAddressResponse)}) /* current_config_result_list */, + std::vector<chrome_browser_net::FakeHostResolver:: + SingleResult>() /* google_config_result_list */); + handler_->SetNetworkContextForTesting(network_context_.get()); + base::ListValue args_valid; + args_valid.AppendString(kWebUiFunctionName); + args_valid.AppendString("https://example.template/dns-query"); + web_ui_.HandleReceivedMessage(kProbeCustomDnsTemplate, &args_valid); + base::RunLoop().RunUntilIdle(); + + const content::TestWebUI::CallData& call_data_valid = + *web_ui_.call_data().back(); + EXPECT_EQ("cr.webUIResponse", call_data_valid.function_name()); + EXPECT_EQ(kWebUiFunctionName, call_data_valid.arg1()->GetString()); + // The request should be successful. + ASSERT_TRUE(call_data_valid.arg2()->GetBool()); + // The probe query should have succeeded. + ASSERT_TRUE(call_data_valid.arg3()->GetBool()); +} + +IN_PROC_BROWSER_TEST_F(SecureDnsHandlerTest, TemplateProbeFailure) { + auto network_context_ = + std::make_unique<chrome_browser_net::FakeHostResolverNetworkContext>( + std::vector<chrome_browser_net::FakeHostResolver::SingleResult>( + {chrome_browser_net::FakeHostResolver::SingleResult( + net::ERR_NAME_NOT_RESOLVED, + net::ResolveErrorInfo(net::ERR_DNS_MALFORMED_RESPONSE), + chrome_browser_net::FakeHostResolver:: + kNoResponse)}) /* current_config_result_list */, + std::vector<chrome_browser_net::FakeHostResolver:: + SingleResult>() /* google_config_result_list */); + handler_->SetNetworkContextForTesting(network_context_.get()); + base::ListValue args_valid; + args_valid.AppendString(kWebUiFunctionName); + args_valid.AppendString("https://example.template/dns-query"); + web_ui_.HandleReceivedMessage(kProbeCustomDnsTemplate, &args_valid); + base::RunLoop().RunUntilIdle(); + + const content::TestWebUI::CallData& call_data_valid = + *web_ui_.call_data().back(); + EXPECT_EQ("cr.webUIResponse", call_data_valid.function_name()); + EXPECT_EQ(kWebUiFunctionName, call_data_valid.arg1()->GetString()); + // The request should be successful. + ASSERT_TRUE(call_data_valid.arg2()->GetBool()); + // The probe query should have failed. + ASSERT_FALSE(call_data_valid.arg3()->GetBool()); } } // namespace settings
diff --git a/chrome/browser/web_applications/system_web_app_manager_browsertest.cc b/chrome/browser/web_applications/system_web_app_manager_browsertest.cc index aaff031..757f3db 100644 --- a/chrome/browser/web_applications/system_web_app_manager_browsertest.cc +++ b/chrome/browser/web_applications/system_web_app_manager_browsertest.cc
@@ -429,10 +429,10 @@ bool writer_closed; EXPECT_TRUE(content::ExecuteScriptAndExtractBool( web_contents, - "window.firstLaunchParams.files[1].createWriter().then(" + "window.firstLaunchParams.files[1].createWritable().then(" " async writer => {" " console.log(writer);" - " await writer.write(0, 'test');" + " await writer.write('test');" " await writer.close();" " domAutomationController.send(true);" " }"
diff --git a/chrome/common/importer/firefox_importer_utils.cc b/chrome/common/importer/firefox_importer_utils.cc index 5972058c..62b6f7d5 100644 --- a/chrome/common/importer/firefox_importer_utils.cc +++ b/chrome/common/importer/firefox_importer_utils.cc
@@ -50,74 +50,22 @@ return path; } -// Returns a map from Firefox profiles to their corresponding installation ids. -// The keys are file system paths for Firefox profiles that are the default -// profile in their installation. The values are the registry keys for the -// corresponding installation. -std::map<std::string, std::string> GetDefaultProfilesPerInstall( - const base::DictionaryValue& root) { - std::map<std::string, std::string> default_profile_to_install_id; - static constexpr base::StringPiece kInstallPrefix("Install"); - // Find the default profiles for each Firefox installation. - for (const auto& data : root) { - const std::string& dict_key = data.first; - if (base::StartsWith(dict_key, kInstallPrefix, - base::CompareCase::SENSITIVE)) { - std::string path; - if (root.GetStringASCII(dict_key + ".Default", &path)) { - default_profile_to_install_id.emplace( - std::move(path), dict_key.substr(kInstallPrefix.size())); - } - } - } - return default_profile_to_install_id; -} - -base::FilePath GetLegacyDefaultProfilePath( - const base::DictionaryValue& root, - const std::vector<std::string>& profile_names) { - if (profile_names.empty()) - return base::FilePath(); - - // When multiple profiles exist, the path to the default profile is returned. - for (const auto& profile_name : profile_names) { - // Checks if the named profile is the default profile using the legacy - // format of profiles.ini (Firefox version < 67). - std::string is_default; - if (root.GetStringASCII(profile_name + ".Default", &is_default) && - is_default == "1") { - return GetProfilePath(root, profile_name); - } - } - - // If no default profile is found, the path to Profile0 will be returned. - return GetProfilePath(root, profile_names.front()); -} - } // namespace -base::FilePath GetFirefoxProfilePath(const std::string& firefox_install_id) { +std::vector<FirefoxDetail> GetFirefoxDetails( + const std::string& firefox_install_id) { base::FilePath ini_file = GetProfilesINI(); std::string content; base::ReadFileToString(ini_file, &content); DictionaryValueINIParser ini_parser; ini_parser.Parse(content); - return GetFirefoxProfilePathFromDictionary(ini_parser.root(), - firefox_install_id); + return GetFirefoxDetailsFromDictionary(ini_parser.root(), firefox_install_id); } -base::FilePath GetFirefoxProfilePathFromDictionary( +std::vector<FirefoxDetail> GetFirefoxDetailsFromDictionary( const base::DictionaryValue& root, const std::string& firefox_install_id) { - // List of profiles linked to a Firefox installation. This will be empty for - // Firefox versions older than 67. - std::map<std::string, std::string> default_profile_to_install_id = - GetDefaultProfilesPerInstall(root); - // First profile linked to a Firefox installation (version >= 67). - base::Optional<std::string> first_modern_profile; - - // Profiles not linked to a Firefox installation (version < 67). - std::vector<std::string> legacy_profiles; + std::vector<FirefoxDetail> profile_details; for (int i = 0; ; ++i) { std::string current_profile = base::StringPrintf("Profile%d", i); @@ -131,26 +79,24 @@ if (!root.GetStringASCII(current_profile + ".Path", &path)) continue; - auto install_id_it = default_profile_to_install_id.find(path); - if (install_id_it != default_profile_to_install_id.end()) { - // If this installation is the default browser, use the associated - // profile as default profile. - if (install_id_it->second == firefox_install_id) - return GetProfilePath(root, current_profile); - if (!first_modern_profile) - first_modern_profile.emplace(std::move(current_profile)); - } else { - // If no Firefox installation found in profiles.ini, legacy profiles - // (Firefox version < 67) are being used. - legacy_profiles.push_back(std::move(current_profile)); - } + FirefoxDetail details; + details.path = GetProfilePath(root, current_profile); + std::string name; + root.GetStringASCII(current_profile + ".Name", &name); + // Make the profile name more presentable by replacing dashes with spaces. + base::ReplaceChars(name, "-", " ", &name); + details.name = name; + profile_details.push_back(details); } - // Take the first install found as the default install. - if (first_modern_profile) - return GetProfilePath(root, *first_modern_profile); + // If there is only one profile, set the name as a blank string. + // The name is only used to disambiguate profiles in the profile selection UI, + // which is only useful when there are multiple profiles. + if (profile_details.size() == 1) { + profile_details[0].name = ""; + } - return GetLegacyDefaultProfilePath(root, legacy_profiles); + return profile_details; } #if defined(OS_MACOSX)
diff --git a/chrome/common/importer/firefox_importer_utils.h b/chrome/common/importer/firefox_importer_utils.h index e9feec4..44b51f2b 100644 --- a/chrome/common/importer/firefox_importer_utils.h +++ b/chrome/common/importer/firefox_importer_utils.h
@@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/files/file_util.h" #include "base/strings/string16.h" #include "build/build_config.h" @@ -38,15 +39,32 @@ base::FilePath GetFirefoxDylibPath(); #endif // OS_MACOSX -// Returns the path to the default profile of the Firefox installation with id -// |firefox_install_id|. -base::FilePath GetFirefoxProfilePath(const std::string& firefox_install_id); +struct FirefoxDetail { + // |path| represents the Path field in Profiles.ini. + // This path is the directory name where all the profile information + // in stored. + base::FilePath path; + // The user specified name of the profile. + std::string name; +}; + +inline bool operator==(const FirefoxDetail& a1, const FirefoxDetail& a2) { + return a1.name == a2.name && a1.path == a2.path; +} + +inline bool operator!=(const FirefoxDetail& a1, const FirefoxDetail& a2) { + return !(a1 == a2); +} + +// Returns a vector of FirefoxDetail for available profiles. +std::vector<FirefoxDetail> GetFirefoxDetails( + const std::string& firefox_install_id); // Returns the path to the Firefox profile, using a custom dictionary. // If |firefox_install_id| is not empty returns the default profile associated // with that id. // Exposed for testing. -base::FilePath GetFirefoxProfilePathFromDictionary( +std::vector<FirefoxDetail> GetFirefoxDetailsFromDictionary( const base::DictionaryValue& root, const std::string& firefox_install_id);
diff --git a/chrome/common/importer/firefox_importer_utils_unittest.cc b/chrome/common/importer/firefox_importer_utils_unittest.cc index 16d51771..5fa593c 100644 --- a/chrome/common/importer/firefox_importer_utils_unittest.cc +++ b/chrome/common/importer/firefox_importer_utils_unittest.cc
@@ -11,9 +11,12 @@ #include "base/stl_util.h" #include "base/values.h" #include "chrome/grit/generated_resources.h" +#include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/l10n/l10n_util.h" +using testing::UnorderedElementsAre; + namespace { struct GetPrefsJsValueCase { @@ -124,46 +127,71 @@ TEST(FirefoxImporterUtilsTest, GetFirefoxProfilePath) { base::DictionaryValue no_profiles; - EXPECT_EQ(std::string(), - GetFirefoxProfilePathFromDictionary(no_profiles, std::string()) - .MaybeAsASCII()); + EXPECT_EQ(0u, + GetFirefoxDetailsFromDictionary(no_profiles, std::string()).size()); base::DictionaryValue single_profile; single_profile.SetString("Profile0.Path", "first"); + // Ensure that when there is only one profile the profile name shown in the UI + // is empty, since there's no need to disambiguate among multiple profiles + single_profile.SetString("Profile0.Name", "namey"); single_profile.SetString("Profile0.IsRelative", "0"); single_profile.SetString("Profile0.Default", "1"); - EXPECT_EQ("first", - GetFirefoxProfilePathFromDictionary(single_profile, std::string()) - .MaybeAsASCII()); + + std::vector<FirefoxDetail> details = + GetFirefoxDetailsFromDictionary(single_profile, std::string()); + EXPECT_THAT(details, UnorderedElementsAre(FirefoxDetail{ + base::FilePath(FILE_PATH_LITERAL("first")), ""})); base::DictionaryValue no_default; no_default.SetString("Profile0.Path", "first"); + no_default.SetString("Profile0.Name", "namey"); no_default.SetString("Profile0.IsRelative", "0"); no_default.SetString("Profile1.Path", "second"); + no_default.SetString("Profile1.Name", "namey-name"); no_default.SetString("Profile1.IsRelative", "0"); - EXPECT_EQ("first", - GetFirefoxProfilePathFromDictionary(no_default, std::string()) - .MaybeAsASCII()); + std::vector<FirefoxDetail> no_default_details = + GetFirefoxDetailsFromDictionary(no_default, std::string()); + EXPECT_THAT( + no_default_details, + UnorderedElementsAre( + FirefoxDetail{base::FilePath(FILE_PATH_LITERAL("first")), "namey"}, + FirefoxDetail{base::FilePath(FILE_PATH_LITERAL("second")), + "namey name"})); base::DictionaryValue default_first; default_first.SetString("Profile0.Path", "first"); + default_first.SetString("Profile0.Name", "namey"); default_first.SetString("Profile0.IsRelative", "0"); default_first.SetString("Profile0.Default", "1"); default_first.SetString("Profile1.Path", "second"); + default_first.SetString("Profile1.Name", "namey-name"); default_first.SetString("Profile1.IsRelative", "0"); - EXPECT_EQ("first", - GetFirefoxProfilePathFromDictionary(default_first, std::string()) - .MaybeAsASCII()); + std::vector<FirefoxDetail> default_first_details = + GetFirefoxDetailsFromDictionary(default_first, std::string()); + EXPECT_THAT( + default_first_details, + UnorderedElementsAre( + FirefoxDetail{base::FilePath(FILE_PATH_LITERAL("first")), "namey"}, + FirefoxDetail{base::FilePath(FILE_PATH_LITERAL("second")), + "namey name"})); base::DictionaryValue default_second; default_second.SetString("Profile0.Path", "first"); + default_second.SetString("Profile0.Name", "namey"); default_second.SetString("Profile0.IsRelative", "0"); default_second.SetString("Profile1.Path", "second"); + default_second.SetString("Profile1.Name", "namey-name"); default_second.SetString("Profile1.IsRelative", "0"); default_second.SetString("Profile1.Default", "1"); - EXPECT_EQ("second", - GetFirefoxProfilePathFromDictionary(default_second, std::string()) - .MaybeAsASCII()); + std::vector<FirefoxDetail> default_second_details = + GetFirefoxDetailsFromDictionary(default_second, std::string()); + EXPECT_THAT( + default_second_details, + UnorderedElementsAre( + FirefoxDetail{base::FilePath(FILE_PATH_LITERAL("first")), "namey"}, + FirefoxDetail{base::FilePath(FILE_PATH_LITERAL("second")), + "namey name"})); // Firefox format from version 67 base::DictionaryValue default_single_install; @@ -172,9 +200,9 @@ default_single_install.SetString("Profile0.Default", "1"); default_single_install.SetString("Profile1.Path", "second"); default_single_install.SetString("Profile1.IsRelative", "0"); - EXPECT_EQ("second", GetFirefoxProfilePathFromDictionary( - default_single_install, std::string()) - .MaybeAsASCII()); + std::vector<FirefoxDetail> default_single_install_details = + GetFirefoxDetailsFromDictionary(default_single_install, std::string()); + EXPECT_EQ("second", default_single_install_details[0].path.MaybeAsASCII()); base::DictionaryValue default_single_install_unknown_profile; default_single_install_unknown_profile.SetString("Install01.Default", @@ -184,11 +212,15 @@ default_single_install_unknown_profile.SetString("Profile0.Default", "1"); default_single_install_unknown_profile.SetString("Profile1.Path", "second"); default_single_install_unknown_profile.SetString("Profile1.IsRelative", "0"); - EXPECT_EQ("first", GetFirefoxProfilePathFromDictionary( - default_single_install_unknown_profile, std::string()) - .MaybeAsASCII()); + std::vector<FirefoxDetail> default_single_install_unknown_profile_details = + GetFirefoxDetailsFromDictionary(default_single_install_unknown_profile, + std::string()); + EXPECT_THAT( + default_single_install_unknown_profile_details, + UnorderedElementsAre( + FirefoxDetail{base::FilePath(FILE_PATH_LITERAL("first")), ""}, + FirefoxDetail{base::FilePath(FILE_PATH_LITERAL("second")), ""})); - base::DictionaryValue default_multiple_install; default_single_install_unknown_profile.SetString("Install01.Default", "first"); default_single_install_unknown_profile.SetString("Install02.Default", @@ -198,7 +230,12 @@ default_single_install_unknown_profile.SetString("Profile0.Default", "1"); default_single_install_unknown_profile.SetString("Profile1.Path", "second"); default_single_install_unknown_profile.SetString("Profile1.IsRelative", "0"); - EXPECT_EQ("second", GetFirefoxProfilePathFromDictionary( - default_single_install_unknown_profile, "02") - .MaybeAsASCII()); + std::vector<FirefoxDetail> default_multiple_install_details = + GetFirefoxDetailsFromDictionary(default_single_install_unknown_profile, + std::string()); + EXPECT_THAT( + default_multiple_install_details, + UnorderedElementsAre( + FirefoxDetail{base::FilePath(FILE_PATH_LITERAL("first")), ""}, + FirefoxDetail{base::FilePath(FILE_PATH_LITERAL("second")), ""})); }
diff --git a/chrome/common/importer/importer_data_types.h b/chrome/common/importer/importer_data_types.h index 0fc90c6..65cfcd4 100644 --- a/chrome/common/importer/importer_data_types.h +++ b/chrome/common/importer/importer_data_types.h
@@ -48,6 +48,7 @@ // The application locale. Stored because we can only access it from the UI // thread on the browser process. This is only used by the Firefox importer. std::string locale; + std::string profile; }; // Contains information needed for importing search engine urls.
diff --git a/chrome/credential_provider/eventlog/BUILD.gn b/chrome/credential_provider/eventlog/BUILD.gn index 6ddc4355..a0e01ac 100644 --- a/chrome/credential_provider/eventlog/BUILD.gn +++ b/chrome/credential_provider/eventlog/BUILD.gn
@@ -24,7 +24,7 @@ "gcp_eventlog_provider.cc", ] - if (!is_asan && !use_clang_coverage) { + if (!is_asan && !use_clang_profiling) { no_default_deps = true ldflags = [ "/NOENTRY" ] }
diff --git a/chrome/test/data/pdf/metrics_test.js b/chrome/test/data/pdf/metrics_test.js index 5433962..e580d30 100644 --- a/chrome/test/data/pdf/metrics_test.js +++ b/chrome/test/data/pdf/metrics_test.js
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import {FittingType} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/constants.js'; +import {FittingType, TwoUpViewAction} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/constants.js'; import {PDFMetrics} from 'chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/metrics.js'; chrome.test.runTests(function() { @@ -82,6 +82,29 @@ chrome.test.succeed(); }, + function testMetricsTwoUpView() { + PDFMetrics.resetForTesting(); + + chrome.metricsPrivate = new MockMetricsPrivate(); + PDFMetrics.record(PDFMetrics.UserAction.DOCUMENT_OPENED); + PDFMetrics.recordTwoUpView(TwoUpViewAction.TWO_UP_VIEW_ENABLE); + PDFMetrics.recordTwoUpView(TwoUpViewAction.TWO_UP_VIEW_DISABLE); + PDFMetrics.recordTwoUpView(TwoUpViewAction.TWO_UP_VIEW_ENABLE); + PDFMetrics.recordTwoUpView(TwoUpViewAction.TWO_UP_VIEW_DISABLE); + PDFMetrics.recordTwoUpView(TwoUpViewAction.TWO_UP_VIEW_ENABLE); + + chrome.test.assertEq( + { + [PDFMetrics.UserAction.DOCUMENT_OPENED]: 1, + [PDFMetrics.UserAction.TWO_UP_VIEW_ENABLE_FIRST]: 1, + [PDFMetrics.UserAction.TWO_UP_VIEW_ENABLE]: 3, + [PDFMetrics.UserAction.TWO_UP_VIEW_DISABLE_FIRST]: 1, + [PDFMetrics.UserAction.TWO_UP_VIEW_DISABLE]: 2 + }, + chrome.metricsPrivate.actionCounter); + chrome.test.succeed(); + }, + function testMetricsBookmarks() { PDFMetrics.resetForTesting();
diff --git a/chrome/test/data/policy/policy_test_cases.json b/chrome/test/data/policy/policy_test_cases.json index 50f54e9..8944e979 100644 --- a/chrome/test/data/policy/policy_test_cases.json +++ b/chrome/test/data/policy/policy_test_cases.json
@@ -6444,12 +6444,80 @@ "CloudExtensionRequestEnabled": { "os": ["win", "linux", "mac", "chromeos"], + "note": "Policy uses default value if CloudReportingEnabled is false or unset.", "policy_pref_mapping_test": [ { "policies": { + }, + "prefs": { + "enterprise_reporting.extension_request.enabled": { + "expect_default": true + } + } + }, + { + "policies": { + "CloudExtensionRequestEnabled": true + }, + "prefs": { + "enterprise_reporting.extension_request.enabled": { + "expect_default": true + } + } + }, + { + "policies": { "CloudExtensionRequestEnabled": false }, - "prefs": { "enterprise_reporting.extension_request.enabled": {} } + "prefs": { + "enterprise_reporting.extension_request.enabled": { + "expect_default": true + } + } + }, + { + "policies": { + "CloudExtensionRequestEnabled": true, + "CloudReportingEnabled": false + }, + "prefs": { + "enterprise_reporting.extension_request.enabled": { + "expect_default": true + } + } + }, + { + "policies": { + "CloudExtensionRequestEnabled": false, + "CloudReportingEnabled": false + }, + "prefs": { + "enterprise_reporting.extension_request.enabled": { + "expect_default": true + } + } + }, + { + "policies": { + "CloudExtensionRequestEnabled": true, + "CloudReportingEnabled": true + }, + "prefs": { + "enterprise_reporting.extension_request.enabled": { + "value": true + } + } + }, + { + "policies": { + "CloudExtensionRequestEnabled": false, + "CloudReportingEnabled": true + }, + "prefs": { + "enterprise_reporting.extension_request.enabled": { + "value": false + } + } } ] },
diff --git a/chrome/test/data/webui/BUILD.gn b/chrome/test/data/webui/BUILD.gn index 03f83e92..d7ad69e 100644 --- a/chrome/test/data/webui/BUILD.gn +++ b/chrome/test/data/webui/BUILD.gn
@@ -214,6 +214,8 @@ "$root_gen_dir/chrome/test/data/webui/settings/about_page_tests.m.js", "$root_gen_dir/chrome/test/data/webui/settings/appearance_page_test.m.js", "$root_gen_dir/chrome/test/data/webui/settings/appearance_fonts_page_test.m.js", + "$root_gen_dir/chrome/test/data/webui/settings/autofill_page_test.m.js", + "$root_gen_dir/chrome/test/data/webui/settings/autofill_section_test.m.js", "$root_gen_dir/chrome/test/data/webui/settings/basic_page_test.m.js", "$root_gen_dir/chrome/test/data/webui/settings/checkbox_tests.m.js", "$root_gen_dir/chrome/test/data/webui/settings/clear_browsing_data_test.m.js", @@ -231,6 +233,11 @@ "$root_gen_dir/chrome/test/data/webui/settings/languages_tests.m.js", "$root_gen_dir/chrome/test/data/webui/settings/languages_page_tests.m.js", "$root_gen_dir/chrome/test/data/webui/settings/on_startup_page_tests.m.js", + "$root_gen_dir/chrome/test/data/webui/settings/password_check_test.m.js", + "$root_gen_dir/chrome/test/data/webui/settings/passwords_and_autofill_fake_data.m.js", + "$root_gen_dir/chrome/test/data/webui/settings/passwords_export_test.m.js", + "$root_gen_dir/chrome/test/data/webui/settings/passwords_section_test.m.js", + "$root_gen_dir/chrome/test/data/webui/settings/payments_section_test.m.js", "$root_gen_dir/chrome/test/data/webui/settings/pref_util_tests.m.js", "$root_gen_dir/chrome/test/data/webui/settings/prefs_test_cases.m.js", "$root_gen_dir/chrome/test/data/webui/settings/prefs_tests.m.js", @@ -247,10 +254,13 @@ "$root_gen_dir/chrome/test/data/webui/settings/site_favicon_test.m.js", "$root_gen_dir/chrome/test/data/webui/settings/startup_urls_page_test.m.js", "$root_gen_dir/chrome/test/data/webui/settings/test_about_page_browser_proxy.m.js", + "$root_gen_dir/chrome/test/data/webui/settings/sync_test_util.m.js", "$root_gen_dir/chrome/test/data/webui/settings/system_page_tests.m.js", "$root_gen_dir/chrome/test/data/webui/settings/test_extension_control_browser_proxy.m.js", "$root_gen_dir/chrome/test/data/webui/settings/test_languages_browser_proxy.m.js", "$root_gen_dir/chrome/test/data/webui/settings/test_lifetime_browser_proxy.m.js", + "$root_gen_dir/chrome/test/data/webui/settings/test_open_window_proxy.m.js", + "$root_gen_dir/chrome/test/data/webui/settings/test_password_manager_proxy.m.js", "$root_gen_dir/chrome/test/data/webui/settings/test_reset_browser_proxy.m.js", "$root_gen_dir/chrome/test/data/webui/settings/test_search_engines_browser_proxy.m.js", "$root_gen_dir/chrome/test/data/webui/settings/test_sync_browser_proxy.m.js", @@ -266,7 +276,10 @@ ] } if (is_chromeos) { - data += [ "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_searchable_drop_down_tests.m.js" ] + data += [ + "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_searchable_drop_down_tests.m.js", + "$root_gen_dir/chrome/test/data/webui/settings/passwords_section_test_cros.m.js", + ] } defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
diff --git a/chrome/test/data/webui/settings/BUILD.gn b/chrome/test/data/webui/settings/BUILD.gn index 05fcc26..b391bed 100644 --- a/chrome/test/data/webui/settings/BUILD.gn +++ b/chrome/test/data/webui/settings/BUILD.gn
@@ -11,6 +11,8 @@ "about_page_tests.js", "appearance_fonts_page_test.js", "appearance_page_test.js", + "autofill_page_test.js", + "autofill_section_test.js", "basic_page_test.js", "checkbox_tests.js", "clear_browsing_data_test.js", @@ -28,6 +30,11 @@ "languages_page_tests.js", "languages_tests.js", "on_startup_page_tests.js", + "passwords_and_autofill_fake_data.js", + "passwords_export_test.js", + "password_check_test.js", + "passwords_section_test.js", + "payments_section_test.js", "prefs_test_cases.js", "prefs_tests.js", "pref_util_tests.js", @@ -44,11 +51,14 @@ "settings_toggle_button_tests.js", "site_favicon_test.js", "startup_urls_page_test.js", + "sync_test_util.js", "test_about_page_browser_proxy.js", "system_page_tests.js", "test_extension_control_browser_proxy.js", "test_languages_browser_proxy.js", "test_lifetime_browser_proxy.js", + "test_open_window_proxy.js", + "test_password_manager_proxy.js", "test_reset_browser_proxy.js", "test_search_engines_browser_proxy.js", "test_sync_browser_proxy.js", @@ -60,7 +70,20 @@ "incompatible_applications_page_test.js", ] } + if (is_chromeos) { + input_files += [ "passwords_section_test_cros.js" ] + } namespace_rewrites = settings_namespace_rewrites + test_namespace_rewrites + [ + "autofill_test_util.PasswordSectionElementFactory|PasswordSectionElementFactory", + "autofill_test_util.PasswordManagerExpectations|PasswordManagerExpectations", + "autofill_test_util.AutofillManagerExpectations|AutofillManagerExpectations", + "autofill_test_util.PaymentsManagerExpectations|PaymentsManagerExpectations", + "autofill_test_util.TestAutofillManager|TestAutofillManager", + "autofill_test_util.TestPaymentsManager|TestPaymentsManager", + "autofill_test_util.create|create", + "autofill_test_util.makeCompromisedCredentials|makeCompromisedCredentials", + "autofill_test_util.makePasswordCheckStatus|makePasswordCheckStatus", + "export_passwords_tests.run|run", "reset_page.TestResetBrowserProxy|TestResetBrowserProxy", "settings.CHROME_CLEANUP_DEFAULT_ITEMS_TO_SHOW|CHROME_CLEANUP_DEFAULT_ITEMS_TO_SHOW", "settings.ChromeCleanupIdleReason|ChromeCleanupIdleReason", @@ -75,6 +98,8 @@ "settings.TestLifetimeBrowserProxy|TestLifetimeBrowserProxy", "settings_search.createSampleSearchEngine|createSampleSearchEngine", "settings_search.TestSearchEnginesBrowserProxy|TestSearchEnginesBrowserProxy", + "sync_test_util.getSyncAllPrefs|getSyncAllPrefs", + "sync_test_util.simulateSyncStatus|simulateSyncStatus", "test_util.setupPopstateListener|setupPopstateListener", ] }
diff --git a/chrome/test/data/webui/settings/autofill_page_test.js b/chrome/test/data/webui/settings/autofill_page_test.js index 16370dd..cd4f5b2 100644 --- a/chrome/test/data/webui/settings/autofill_page_test.js +++ b/chrome/test/data/webui/settings/autofill_page_test.js
@@ -2,6 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +// clang-format off +// #import {AutofillManagerImpl, CrSettingsPrefs, OpenWindowProxyImpl, PasswordManagerImpl, PaymentsManagerImpl, Router, routes} from 'chrome://settings/settings.js'; +// #import {createAddressEntry, createCreditCardEntry, createExceptionEntry, createPasswordEntry, AutofillManagerExpectations, PasswordManagerExpectations, PaymentsManagerExpectations, TestAutofillManager, TestPaymentsManager} from 'chrome://test/settings/passwords_and_autofill_fake_data.m.js'; +// #import {FakeSettingsPrivate} from 'chrome://test/settings/fake_settings_private.m.js'; +// #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; +// #import {TestPasswordManagerProxy} from 'chrome://test/settings/test_password_manager_proxy.m.js'; +// #import {TestOpenWindowProxy} from 'chrome://test/settings/test_open_window_proxy.m.js'; +// clang-format-on + suite('PasswordsAndForms', function() { /** * Creates a new passwords and forms element. @@ -119,7 +128,7 @@ setup(async function() { PolymerTest.clearBody(); - await settings.forceLazyLoaded(); + /* #ignore */ await settings.forceLazyLoaded(); // Override the PasswordManagerImpl for testing. passwordManager = new TestPasswordManagerProxy();
diff --git a/chrome/test/data/webui/settings/autofill_section_test.js b/chrome/test/data/webui/settings/autofill_section_test.js index dbaa27a..267297ba 100644 --- a/chrome/test/data/webui/settings/autofill_section_test.js +++ b/chrome/test/data/webui/settings/autofill_section_test.js
@@ -2,6 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +// clang-format off +// #import {AutofillManagerImpl, CountryDetailManagerImpl} from 'chrome://settings/settings.js'; +// #import {createAddressEntry, createEmptyAddressEntry, TestAutofillManager} from 'chrome://test/settings/passwords_and_autofill_fake_data.m.js'; +// #import {eventToPromise} from 'chrome://test/test_util.m.js'; +// #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; +// #import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; +// clang-format-on + cr.define('settings_autofill_section', function() { /** * Test implementation. @@ -58,9 +66,9 @@ */ function createAutofillSection(addresses, prefValues) { // Override the AutofillManagerImpl for testing. - this.autofillManager = new autofill_test_util.TestAutofillManager(); - this.autofillManager.data.addresses = addresses; - settings.AutofillManagerImpl.instance_ = this.autofillManager; + const autofillManager = new autofill_test_util.TestAutofillManager(); + autofillManager.data.addresses = addresses; + settings.AutofillManagerImpl.instance_ = autofillManager; const section = document.createElement('settings-autofill-section'); section.prefs = {autofill: prefValues}; @@ -665,12 +673,13 @@ return expectEvent( dialog, 'on-update-address-wrapper', function() { // IL: - rows = dialog.$.dialog.querySelectorAll('.address-row'); + const rows = + dialog.$.dialog.querySelectorAll('.address-row'); assertEquals(company_enabled ? 6 : 5, rows.length); // City, Postal code - row = rows[company_enabled ? 3 : 2]; - cols = row.querySelectorAll('.address-column'); + const row = rows[company_enabled ? 3 : 2]; + const cols = row.querySelectorAll('.address-column'); assertEquals(2, cols.length); assertEquals(city, cols[0].value); assertEquals(zip, cols[1].value); @@ -685,8 +694,8 @@ assertEquals(company_enabled ? 6 : 5, rows.length); // City, State, ZIP code - row = rows[company_enabled ? 3 : 2]; - cols = row.querySelectorAll('.address-column'); + const row = rows[company_enabled ? 3 : 2]; + const cols = row.querySelectorAll('.address-column'); assertEquals(3, cols.length); assertEquals(city, cols[0].value); assertEquals(state, cols[1].value); @@ -695,4 +704,5 @@ }); }); }); + // #cr_define_end });
diff --git a/chrome/test/data/webui/settings/cr_settings_browsertest.js b/chrome/test/data/webui/settings/cr_settings_browsertest.js index e1799047..09a9220 100644 --- a/chrome/test/data/webui/settings/cr_settings_browsertest.js +++ b/chrome/test/data/webui/settings/cr_settings_browsertest.js
@@ -330,6 +330,7 @@ '../mock_timer.js', '../test_browser_proxy.js', 'passwords_and_autofill_fake_data.js', + 'passwords_export_test.js', 'passwords_section_test.js', 'sync_test_util.js', 'test_password_manager_proxy.js', @@ -386,7 +387,10 @@ /** @override */ extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ + '../mock_timer.js', + '../test_util.js', '../test_browser_proxy.js', + 'passwords_export_test.js', 'passwords_and_autofill_fake_data.js', 'passwords_section_test_cros.js', 'test_password_manager_proxy.js', @@ -394,7 +398,7 @@ }; -TEST_F('CrSettingsPasswordsSectionTest_Cros', 'DISABLED_All', function() { +TEST_F('CrSettingsPasswordsSectionTest_Cros', 'All', function() { mocha.run(); }); GEN('#endif // defined(OS_CHROMEOS)');
diff --git a/chrome/test/data/webui/settings/cr_settings_v3_browsertest.js b/chrome/test/data/webui/settings/cr_settings_v3_browsertest.js index 390c4ec..6eabce2 100644 --- a/chrome/test/data/webui/settings/cr_settings_v3_browsertest.js +++ b/chrome/test/data/webui/settings/cr_settings_v3_browsertest.js
@@ -9,6 +9,7 @@ GEN('#include "services/network/public/cpp/features.h"'); GEN('#include "build/branding_buildflags.h"'); +GEN('#include "components/autofill/core/common/autofill_features.h"'); /** Test fixture for shared Polymer 3 elements. */ // eslint-disable-next-line no-var @@ -493,3 +494,110 @@ TEST_F('CrSettingsMainPageV3Test', 'MAYBE_MainPageV3', function() { mocha.run(); }); + +// eslint-disable-next-line no-var +var CrSettingsAutofillPageV3Test = class extends CrSettingsV3BrowserTest { + /** @override */ + get browsePreload() { + return 'chrome://settings/test_loader.html?module=settings/autofill_page_test.m.js'; + } +}; + +TEST_F('CrSettingsAutofillPageV3Test', 'All', function() { + mocha.run(); +}); + +// eslint-disable-next-line no-var +var CrSettingsAutofillSectionCompanyEnabledV3Test = + class extends CrSettingsV3BrowserTest { + /** @override */ + get browsePreload() { + return 'chrome://settings/test_loader.html?module=settings/autofill_section_test.m.js'; + } + + /** @override */ + get featureList() { + return {enabled: ['autofill::features::kAutofillEnableCompanyName']}; + } +}; + +TEST_F('CrSettingsAutofillSectionCompanyEnabledV3Test', 'All', function() { + // Use 'EnableCompanyName' to inform tests that the feature is enabled. + const loadTimeDataOverride = {}; + loadTimeDataOverride['EnableCompanyName'] = true; + loadTimeData.overrideValues(loadTimeDataOverride); + mocha.run(); +}); + +// eslint-disable-next-line no-var +var CrSettingsAutofillSectionCompanyDisabledV3Test = + class extends CrSettingsV3BrowserTest { + /** @override */ + get browsePreload() { + return 'chrome://settings/test_loader.html?module=settings/autofill_section_test.m.js'; + } + + /** @override */ + get featureList() { + return {disabled: ['autofill::features::kAutofillEnableCompanyName']}; + } +}; + +TEST_F('CrSettingsAutofillSectionCompanyDisabledV3Test', 'All', function() { + // Use 'EnableCompanyName' to inform tests that the feature is enabled. + const loadTimeDataOverride = {}; + loadTimeDataOverride['EnableCompanyName'] = false; + loadTimeData.overrideValues(loadTimeDataOverride); + mocha.run(); +}); + +// eslint-disable-next-line no-var +var CrSettingsPasswordsSectionV3Test = class extends CrSettingsV3BrowserTest { + /** @override */ + get browsePreload() { + return 'chrome://settings/test_loader.html?module=settings/passwords_section_test.m.js'; + } +}; + +TEST_F('CrSettingsPasswordsSectionV3Test', 'All', function() { + mocha.run(); +}); + +// eslint-disable-next-line no-var +var CrSettingsPasswordsCheckV3Test = class extends CrSettingsV3BrowserTest { + /** @override */ + get browsePreload() { + return 'chrome://settings/test_loader.html?module=settings/password_check_test.m.js'; + } +}; + +TEST_F('CrSettingsPasswordsCheckV3Test', 'All', function() { + mocha.run(); +}); + +GEN('#if defined(OS_CHROMEOS)'); +// eslint-disable-next-line no-var +var CrSettingsPasswordsSectionV3Test_Cros = + class extends CrSettingsV3BrowserTest { + /** @override */ + get browsePreload() { + return 'chrome://settings/test_loader.html?module=settings/passwords_section_test_cros.m.js'; + } +}; + +TEST_F('CrSettingsPasswordsSectionV3Test_Cros', 'All', function() { + mocha.run(); +}); +GEN('#endif'); + +// eslint-disable-next-line no-var +var CrSettingsPaymentsSectionV3Test = class extends CrSettingsV3BrowserTest { + /** @override */ + get browsePreload() { + return 'chrome://settings/test_loader.html?module=settings/payments_section_test.m.js'; + } +}; + +TEST_F('CrSettingsPaymentsSectionV3Test', 'All', function() { + mocha.run(); +});
diff --git a/chrome/test/data/webui/settings/password_check_test.js b/chrome/test/data/webui/settings/password_check_test.js index 9770320..ec8dab0c 100644 --- a/chrome/test/data/webui/settings/password_check_test.js +++ b/chrome/test/data/webui/settings/password_check_test.js
@@ -4,13 +4,21 @@ /** @fileoverview Runs the Polymer Check Password tests. */ +// clang-format off +// #import {PasswordManagerImpl} from 'chrome://settings/settings.js'; +// #import {makeCompromisedCredentials, makeCompromisedCredentialsInfo, makePasswordCheckStatus} from 'chrome://test/settings/passwords_and_autofill_fake_data.m.js'; +// #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; +// #import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; +// #import {TestPasswordManagerProxy} from 'chrome://test/settings/test_password_manager_proxy.m.js'; +// clang-format-on + cr.define('settings_passwords_check', function() { const PasswordCheckState = chrome.passwordsPrivate.PasswordCheckState; function createCheckPasswordSection() { // Create a passwords-section to use for testing. const passwordsSection = - this.document.createElement('settings-password-check'); + document.createElement('settings-password-check'); document.body.appendChild(passwordsSection); Polymer.dom.flush(); return passwordsSection; @@ -23,7 +31,7 @@ */ function createLeakedPasswordItem(entry) { const leakedPasswordItem = - this.document.createElement('password-check-list-item'); + document.createElement('password-check-list-item'); leakedPasswordItem.item = entry; document.body.appendChild(leakedPasswordItem); Polymer.dom.flush(); @@ -37,17 +45,21 @@ /** * Helper method that validates a that elements in the compromised credentials * list match the expected data. - * @param {!Element} listElements The iron-list element that will be checked. + * @param {!Element} checkPasswordSection The section element that will be + * checked. * @param {!Array<!chrome.passwordsPrivate.CompromisedCredential>} * passwordList The expected data. * @private */ - function validateLeakedPasswordsList(listElements, compromisedCredentials) { + function validateLeakedPasswordsList(checkPasswordSection, + compromisedCredentials) { + const listElements = checkPasswordSection.$.leakedPasswordList; assertEquals(listElements.items.length, compromisedCredentials.length); + const nodes = checkPasswordSection.shadowRoot.querySelectorAll( + 'password-check-list-item'); for (let index = 0; index < compromisedCredentials.length; ++index) { - // The first child is a template, skip and get the real 'first child'. - const node = Polymer.dom(listElements).children[index + 1]; - assert(node); + const node = nodes[index]; + assertTrue(!!node); assertEquals( node.$.elapsedTime.textContent.trim(), compromisedCredentials[index].elapsedTimeSinceCompromise); @@ -83,7 +95,7 @@ const section = createCheckPasswordSection(); return passwordManager.whenCalled('getPasswordCheckStatus') .then(() => { - assert(isElementVisible(section.$.controlPasswordCheckButton)); + assertTrue(isElementVisible(section.$.controlPasswordCheckButton)); expectEquals( section.i18n('checkPasswordsAgain'), section.$.controlPasswordCheckButton.innerText); @@ -103,7 +115,7 @@ const section = createCheckPasswordSection(); return passwordManager.whenCalled('getPasswordCheckStatus') .then(() => { - assert(isElementVisible(section.$.controlPasswordCheckButton)); + assertTrue(isElementVisible(section.$.controlPasswordCheckButton)); expectEquals( section.i18n('checkPasswordsStop'), section.$.controlPasswordCheckButton.innerText); @@ -145,7 +157,7 @@ const section = createCheckPasswordSection(); return passwordManager.whenCalled('getPasswordCheckStatus') .then(() => { - assert(isElementVisible(section.$.controlPasswordCheckButton)); + assertTrue(isElementVisible(section.$.controlPasswordCheckButton)); expectEquals( section.i18n('checkPasswordsAgainAfterError'), section.$.controlPasswordCheckButton.innerText); @@ -163,7 +175,7 @@ const section = createCheckPasswordSection(); return passwordManager.whenCalled('getPasswordCheckStatus') .then(() => { - assert(isElementVisible(section.$.controlPasswordCheckButton)); + assertTrue(isElementVisible(section.$.controlPasswordCheckButton)); expectEquals( section.i18n('checkPasswordsAgainAfterError'), section.$.controlPasswordCheckButton.innerText); @@ -181,7 +193,7 @@ const section = createCheckPasswordSection(); return passwordManager.whenCalled('getPasswordCheckStatus') .then(() => { - assert(isElementVisible(section.$.controlPasswordCheckButton)); + assertTrue(isElementVisible(section.$.controlPasswordCheckButton)); expectEquals( section.i18n('checkPasswordsAgainAfterError'), section.$.controlPasswordCheckButton.innerText); @@ -199,7 +211,7 @@ const section = createCheckPasswordSection(); return passwordManager.whenCalled('getPasswordCheckStatus') .then(() => { - assert(isElementVisible(section.$.controlPasswordCheckButton)); + assertTrue(isElementVisible(section.$.controlPasswordCheckButton)); expectEquals( section.i18n('checkPasswordsAgainAfterError'), section.$.controlPasswordCheckButton.innerText); @@ -215,8 +227,7 @@ const checkPasswordSection = createCheckPasswordSection(); assertTrue(checkPasswordSection.$.passwordCheckBody.hidden); assertFalse(checkPasswordSection.$.noCompromisedCredentials.hidden); - validateLeakedPasswordsList( - checkPasswordSection.$.leakedPasswordList, []); + validateLeakedPasswordsList(checkPasswordSection, []); }); // Test verifies that compromised credentials are displayed in a proper way @@ -237,8 +248,7 @@ Polymer.dom.flush(); assertFalse(checkPasswordSection.$.passwordCheckBody.hidden); assertTrue(checkPasswordSection.$.noCompromisedCredentials.hidden); - validateLeakedPasswordsList( - checkPasswordSection.$.leakedPasswordList, leakedPasswords); + validateLeakedPasswordsList(checkPasswordSection, leakedPasswords); }); }); @@ -250,7 +260,7 @@ const checkPasswordSection = createLeakedPasswordItem(password); assertEquals(checkPasswordSection.$$('changePasswordUrl'), null); - assert(checkPasswordSection.$$('#changePasswordInApp')); + assertTrue(!!checkPasswordSection.$$('#changePasswordInApp')); }); // Verify that the More Actions menu opens when the button is clicked. @@ -269,12 +279,12 @@ .then(() => { Polymer.dom.flush(); assertFalse(checkPasswordSection.$.passwordCheckBody.hidden); - const listElements = checkPasswordSection.$.leakedPasswordList; - const node = Polymer.dom(listElements).children[1]; + const listElement = + checkPasswordSection.$$('password-check-list-item'); const menu = checkPasswordSection.$.moreActionsMenu; assertFalse(menu.open); - node.$.more.click(); + listElement.$.more.click(); assertTrue(menu.open); }); }); @@ -290,13 +300,14 @@ const section = createCheckPasswordSection(); return passwordManager.whenCalled('getPasswordCheckStatus').then(() => { Polymer.dom.flush(); - assert(isElementVisible(section.$.title)); + assertTrue(isElementVisible(section.$.title)); expectEquals( section.i18n('checkPasswordsProgress', 1, 2), section.$.title.innerText); // Change status from running to IDLE. - assert(!!passwordManager.lastCallback.addPasswordCheckStatusListener); + assertTrue( + !!passwordManager.lastCallback.addPasswordCheckStatusListener); passwordManager.lastCallback.addPasswordCheckStatusListener( autofill_test_util.makePasswordCheckStatus( /*state=*/ PasswordCheckState.RUNNING, @@ -304,7 +315,7 @@ /*remaining=*/ 0)); Polymer.dom.flush(); - assert(isElementVisible(section.$.title)); + assertTrue(isElementVisible(section.$.title)); expectEquals( section.i18n('checkPasswordsProgress', 2, 2), section.$.title.innerText); @@ -322,7 +333,7 @@ Polymer.dom.flush(); expectEquals( PasswordCheckState.IDLE, checkPasswordSection.status_.state); - }, () => assert(false)); + }, () => assertTrue(false)); }); // Tests that the spinner is replaced with a checkmark on successful runs. @@ -337,7 +348,7 @@ const icon = checkPasswordSection.$$('iron-icon'); const spinner = checkPasswordSection.$$('paper-spinner-lite'); expectFalse(isElementVisible(spinner)); - assert(isElementVisible(icon)); + assertTrue(isElementVisible(icon)); expectFalse(icon.classList.contains('has-leaks')); expectTrue(icon.classList.contains('no-leaks')); }); @@ -361,7 +372,7 @@ const icon = checkPasswordSection.$$('iron-icon'); const spinner = checkPasswordSection.$$('paper-spinner-lite'); expectFalse(isElementVisible(spinner)); - assert(isElementVisible(icon)); + assertTrue(isElementVisible(icon)); expectTrue(icon.classList.contains('has-leaks')); expectFalse(icon.classList.contains('no-leaks')); }); @@ -381,7 +392,7 @@ const icon = checkPasswordSection.$$('iron-icon'); const spinner = checkPasswordSection.$$('paper-spinner-lite'); expectFalse(isElementVisible(spinner)); - assert(isElementVisible(icon)); + assertTrue(isElementVisible(icon)); expectFalse(icon.classList.contains('has-leaks')); expectFalse(icon.classList.contains('no-leaks')); }); @@ -415,11 +426,11 @@ passwordManager.data.leakedCredentials = autofill_test_util.makeCompromisedCredentialsInfo([], 'just now'); - section = createCheckPasswordSection(); + const section = createCheckPasswordSection(); return passwordManager.whenCalled('getPasswordCheckStatus').then(() => { Polymer.dom.flush(); const title = section.$.title; - assert(isElementVisible(title)); + assertTrue(isElementVisible(title)); expectEquals( section.i18n('checkPasswordsProgress', 1, 4), title.innerText); expectFalse(isElementVisible(section.$.subtitle)); @@ -446,8 +457,8 @@ Polymer.dom.flush(); const title = section.$.title; const subtitle = section.$.subtitle; - assert(isElementVisible(title)); - assert(isElementVisible(subtitle)); + assertTrue(isElementVisible(title)); + assertTrue(isElementVisible(subtitle)); expectEquals( section.i18n('checkPasswordsProgress', 2, 5), title.innerText); }); @@ -474,8 +485,8 @@ Polymer.dom.flush(); const title = section.$.title; const subtitle = section.$.subtitle; - assert(isElementVisible(title)); - assert(isElementVisible(subtitle)); + assertTrue(isElementVisible(title)); + assertTrue(isElementVisible(subtitle)); expectEquals(section.i18n('checkPasswordsCanceled'), title.innerText); }); }); @@ -500,8 +511,8 @@ Polymer.dom.flush(); const title = section.$.title; const subtitle = section.$.subtitle; - assert(isElementVisible(title)); - assert(isElementVisible(subtitle)); + assertTrue(isElementVisible(title)); + assertTrue(isElementVisible(subtitle)); expectEquals( section.i18n('checkPasswords') + ' • just now', title.innerText); }); @@ -517,7 +528,7 @@ return passwordManager.whenCalled('getPasswordCheckStatus').then(() => { Polymer.dom.flush(); const title = section.$.title; - assert(isElementVisible(title)); + assertTrue(isElementVisible(title)); expectEquals( section.i18n('checkPasswordsErrorOffline'), title.innerText); expectFalse(isElementVisible(section.$.subtitle)); @@ -534,7 +545,7 @@ return passwordManager.whenCalled('getPasswordCheckStatus').then(() => { Polymer.dom.flush(); const title = section.$.title; - assert(isElementVisible(title)); + assertTrue(isElementVisible(title)); expectEquals( section.i18n('checkPasswordsErrorSignedOut'), title.innerText); expectFalse(isElementVisible(section.$.subtitle)); @@ -551,7 +562,7 @@ return passwordManager.whenCalled('getPasswordCheckStatus').then(() => { Polymer.dom.flush(); const title = section.$.title; - assert(isElementVisible(title)); + assertTrue(isElementVisible(title)); expectEquals( section.i18n('checkPasswordsErrorNoPasswords'), title.innerText); expectFalse(isElementVisible(section.$.subtitle)); @@ -568,7 +579,7 @@ return passwordManager.whenCalled('getPasswordCheckStatus').then(() => { Polymer.dom.flush(); const title = section.$.title; - assert(isElementVisible(title)); + assertTrue(isElementVisible(title)); // TODO(crbug.com/1047726): Check for account redirection. expectEquals( section.i18n('checkPasswordsErrorTooManyPasswords') + ' ' + @@ -588,7 +599,7 @@ return passwordManager.whenCalled('getPasswordCheckStatus').then(() => { Polymer.dom.flush(); const title = section.$.title; - assert(isElementVisible(title)); + assertTrue(isElementVisible(title)); expectEquals(section.i18n('checkPasswordsErrorQuota'), title.innerText); expectFalse(isElementVisible(section.$.subtitle)); }); @@ -604,7 +615,7 @@ return passwordManager.whenCalled('getPasswordCheckStatus').then(() => { Polymer.dom.flush(); const title = section.$.title; - assert(isElementVisible(title)); + assertTrue(isElementVisible(title)); expectEquals( section.i18n('checkPasswordsErrorGeneric'), title.innerText); expectFalse(isElementVisible(section.$.subtitle)); @@ -618,24 +629,25 @@ const section = createCheckPasswordSection(); return passwordManager.whenCalled('getPasswordCheckStatus').then(() => { - assert(isElementVisible(section.$.controlPasswordCheckButton)); + assertTrue(isElementVisible(section.$.controlPasswordCheckButton)); expectEquals( section.i18n('checkPasswordsAgain'), section.$.controlPasswordCheckButton.innerText); // Change status from running to IDLE. - assert(!!passwordManager.lastCallback.addPasswordCheckStatusListener); + assertTrue( + !!passwordManager.lastCallback.addPasswordCheckStatusListener); passwordManager.lastCallback.addPasswordCheckStatusListener( autofill_test_util.makePasswordCheckStatus( /*state=*/ PasswordCheckState.RUNNING, /*checked=*/ 0, /*remaining=*/ 2)); - - assert(isElementVisible(section.$.controlPasswordCheckButton)); + assertTrue(isElementVisible(section.$.controlPasswordCheckButton)); expectEquals( section.i18n('checkPasswordsStop'), section.$.controlPasswordCheckButton.innerText); }); }); }); + // #cr_define_end });
diff --git a/chrome/test/data/webui/settings/passwords_and_autofill_fake_data.js b/chrome/test/data/webui/settings/passwords_and_autofill_fake_data.js index 99eb95ef..22a450f2 100644 --- a/chrome/test/data/webui/settings/passwords_and_autofill_fake_data.js +++ b/chrome/test/data/webui/settings/passwords_and_autofill_fake_data.js
@@ -2,6 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +// clang-format off +// #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; +// clang-format on + cr.define('autofill_test_util', function() { /** * Creates a single item for the list of passwords. @@ -11,7 +15,8 @@ * @param {number=} id * @return {chrome.passwordsPrivate.PasswordUiEntry} */ - function createPasswordEntry(url, username, passwordLength, id) { + /* #export */ function createPasswordEntry( + url, username, passwordLength, id) { // Generate fake data if param is undefined. url = url || patternMaker_('www.xxxxxx.com', 16); username = username || patternMaker_('user_xxxxx', 16); @@ -36,7 +41,7 @@ * @param {number=} id * @return {chrome.passwordsPrivate.ExceptionEntry} */ - function createExceptionEntry(url, id) { + /* #export */ function createExceptionEntry(url, id) { url = url || patternMaker_('www.xxxxxx.com', 16); id = id || 0; return { @@ -53,7 +58,7 @@ * Creates a new fake address entry for testing. * @return {!chrome.autofillPrivate.AddressEntry} */ - function createEmptyAddressEntry() { + /* #export */ function createEmptyAddressEntry() { return {}; } @@ -61,7 +66,7 @@ * Creates a fake address entry for testing. * @return {!chrome.autofillPrivate.AddressEntry} */ - function createAddressEntry() { + /* #export */ function createAddressEntry() { const ret = {}; ret.guid = makeGuid_(); ret.fullNames = ['John Doe']; @@ -84,7 +89,7 @@ * Creates a new empty credit card entry for testing. * @return {!chrome.autofillPrivate.CreditCardEntry} */ - function createEmptyCreditCardEntry() { + /* #export */ function createEmptyCreditCardEntry() { const now = new Date(); const expirationMonth = now.getMonth() + 1; const ret = {}; @@ -97,7 +102,7 @@ * Creates a new random credit card entry for testing. * @return {!chrome.autofillPrivate.CreditCardEntry} */ - function createCreditCardEntry() { + /* #export */ function createCreditCardEntry() { const ret = {}; ret.guid = makeGuid_(); ret.name = 'Jane Doe'; @@ -120,7 +125,7 @@ * @return {chrome.passwordsPrivate.CompromisedCredential} * @private */ - function makeCompromisedCredentials(url, username, type) { + /* #export */ function makeCompromisedCredentials(url, username, type) { return { formattedOrigin: url, changePasswordUrl: 'http://${url}/', @@ -138,7 +143,7 @@ * @return {chrome.passwordsPrivate.CompromisedCredentialsInfo} * @private */ - function makeCompromisedCredentialsInfo(list, lastCheck) { + /* #export */ function makeCompromisedCredentialsInfo(list, lastCheck) { return { compromisedCredentials: list, elapsedTimeSinceLastCheck: lastCheck, @@ -152,7 +157,7 @@ * @param {!number|undefined} remaining * @return {!chrome.passwordsPrivate.PasswordCheckStatus} */ - function makePasswordCheckStatus(state, checked, remaining) { + /* #export */ function makePasswordCheckStatus(state, checked, remaining) { return { state: state || chrome.passwordsPrivate.PasswordCheckState.IDLE, alreadyProcessed: checked, @@ -186,7 +191,7 @@ * Helper class for creating password-section sub-element from fake data and * appending them to the document. */ - class PasswordSectionElementFactory { + /* #export */ class PasswordSectionElementFactory { /** * @param {HTMLDocument} document The test's |document| object. */ @@ -269,15 +274,11 @@ this.document.body.appendChild(dialog); Polymer.dom.flush(); - if (cr.isChromeOS) { - dialog.tokenRequestManager = new settings.BlockingRequestManager(); - } - return dialog; } } - class PasswordManagerExpectations { + /* #export */ class PasswordManagerExpectations { constructor() { this.requested = { passwords: 0, @@ -300,7 +301,7 @@ } /** Helper class to track AutofillManager expectations. */ - class AutofillManagerExpectations { + /* #export */ class AutofillManagerExpectations { constructor() { this.requestedAddresses = 0; this.listeningAddresses = 0; @@ -311,7 +312,7 @@ * Test implementation * @implements {AutofillManager} */ - class TestAutofillManager { + /* #export */ class TestAutofillManager { constructor() { this.actual_ = new AutofillManagerExpectations(); @@ -355,7 +356,7 @@ } /** Helper class to track PaymentsManager expectations. */ - class PaymentsManagerExpectations { + /* #export */ class PaymentsManagerExpectations { constructor() { this.requestedCreditCards = 0; this.listeningCreditCards = 0; @@ -366,7 +367,7 @@ * Test implementation * @implements {PaymentsManager} */ - class TestPaymentsManager { + /* #export */ class TestPaymentsManager { constructor() { this.actual_ = new PaymentsManagerExpectations();
diff --git a/chrome/test/data/webui/settings/passwords_export_test.js b/chrome/test/data/webui/settings/passwords_export_test.js new file mode 100644 index 0000000..9848c9e --- /dev/null +++ b/chrome/test/data/webui/settings/passwords_export_test.js
@@ -0,0 +1,219 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// clang-format off +// #import {eventToPromise} from 'chrome://test/test_util.m.js'; +// #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; +// #import {MockTimer} from 'chrome://test/mock_timer.m.js'; +// clang-format on + +cr.define('export_passwords_tests', function() { + // Test that tapping "Export passwords..." notifies the browser. + /* #export */ function runStartExportTest( + exportDialog, passwordManager, done) { + passwordManager.exportPasswords = (callback) => { + callback(); + done(); + }; + + exportDialog.$$('#exportPasswordsButton').click(); + } + + // Test the export flow. If exporting is fast, we should skip the + // in-progress view altogether. + /* #export */ function runExportFlowFastTest( + exportDialog, passwordManager, done) { + const progressCallback = passwordManager.progressCallback; + + // Use this to freeze the delayed progress bar and avoid flakiness. + const mockTimer = new MockTimer(); + mockTimer.install(); + + assertTrue(exportDialog.$$('#dialog_start').open); + exportDialog.$$('#exportPasswordsButton').click(); + assertTrue(exportDialog.$$('#dialog_start').open); + progressCallback( + {status: chrome.passwordsPrivate.ExportProgressStatus.IN_PROGRESS}); + progressCallback( + {status: chrome.passwordsPrivate.ExportProgressStatus.SUCCEEDED}); + + Polymer.dom.flush(); + // When we are done, the export dialog closes completely. + assertFalse(!!exportDialog.$$('#dialog_start')); + assertFalse(!!exportDialog.$$('#dialog_error')); + assertFalse(!!exportDialog.$$('#dialog_progress')); + done(); + + mockTimer.uninstall(); + } + + // The error view is shown when an error occurs. + /* #export */ function runExportFlowErrorTest( + exportDialog, passwordManager, done) { + const progressCallback = passwordManager.progressCallback; + + // Use this to freeze the delayed progress bar and avoid flakiness. + const mockTimer = new MockTimer(); + mockTimer.install(); + + assertTrue(exportDialog.$$('#dialog_start').open); + exportDialog.$$('#exportPasswordsButton').click(); + assertTrue(exportDialog.$$('#dialog_start').open); + progressCallback( + {status: chrome.passwordsPrivate.ExportProgressStatus.IN_PROGRESS}); + progressCallback({ + status: chrome.passwordsPrivate.ExportProgressStatus.FAILED_WRITE_FAILED, + folderName: 'tmp', + }); + + Polymer.dom.flush(); + // Test that the error dialog is shown. + assertTrue(exportDialog.$$('#dialog_error').open); + // Test that the error dialog can be dismissed. + exportDialog.$$('#cancelErrorButton').click(); + Polymer.dom.flush(); + assertFalse(!!exportDialog.$$('#dialog_error')); + done(); + + mockTimer.uninstall(); + } + + // The error view allows to retry. + /* #export */ function runExportFlowErrorRetryTest( + exportDialog, passwordManager, done) { + const progressCallback = passwordManager.progressCallback; + // Use this to freeze the delayed progress bar and avoid flakiness. + const mockTimer = new MockTimer(); + + new Promise(resolve => { + mockTimer.install(); + + passwordManager.exportPasswords = resolve; + exportDialog.$$('#exportPasswordsButton').click(); + }).then(() => { + // This wait allows the BlockingRequestManager to process the click if + // the test is running in ChromeOS. + progressCallback( + {status: chrome.passwordsPrivate.ExportProgressStatus.IN_PROGRESS}); + progressCallback({ + status: + chrome.passwordsPrivate.ExportProgressStatus.FAILED_WRITE_FAILED, + folderName: 'tmp', + }); + + Polymer.dom.flush(); + // Test that the error dialog is shown. + assertTrue(exportDialog.$$('#dialog_error').open); + // Test that clicking retry will start a new export. + passwordManager.exportPasswords = (callback) => { + callback(); + done(); + }; + exportDialog.$$('#tryAgainButton').click(); + + mockTimer.uninstall(); + }); + } + + // Test the export flow. If exporting is slow, Chrome should show the + // in-progress dialog for at least 1000ms. + /* #export */ function runExportFlowSlowTest( + exportDialog, passwordManager, done) { + const progressCallback = passwordManager.progressCallback; + + const mockTimer = new MockTimer(); + mockTimer.install(); + + // The initial dialog remains open for 100ms after export enters the + // in-progress state. + assertTrue(exportDialog.$$('#dialog_start').open); + exportDialog.$$('#exportPasswordsButton').click(); + assertTrue(exportDialog.$$('#dialog_start').open); + progressCallback( + {status: chrome.passwordsPrivate.ExportProgressStatus.IN_PROGRESS}); + assertTrue(exportDialog.$$('#dialog_start').open); + + // After 100ms of not having completed, the dialog switches to the + // progress bar. Chrome will continue to show the progress bar for 1000ms, + // despite a completion event. + mockTimer.tick(99); + assertTrue(exportDialog.$$('#dialog_start').open); + mockTimer.tick(1); + Polymer.dom.flush(); + assertTrue(exportDialog.$$('#dialog_progress').open); + progressCallback( + {status: chrome.passwordsPrivate.ExportProgressStatus.SUCCEEDED}); + assertTrue(exportDialog.$$('#dialog_progress').open); + + // After 1000ms, Chrome will display the completion event. + mockTimer.tick(999); + assertTrue(exportDialog.$$('#dialog_progress').open); + mockTimer.tick(1); + Polymer.dom.flush(); + // On SUCCEEDED the dialog closes completely. + assertFalse(!!exportDialog.$$('#dialog_progress')); + assertFalse(!!exportDialog.$$('#dialog_start')); + assertFalse(!!exportDialog.$$('#dialog_error')); + done(); + + mockTimer.uninstall(); + } + + // Test that canceling the dialog while exporting will also cancel the + // export on the browser. + /* #export */ function runCancelExportTest( + exportDialog, passwordManager, done) { + const progressCallback = passwordManager.progressCallback; + + passwordManager.cancelExportPasswords = () => { + done(); + }; + + const mockTimer = new MockTimer(); + mockTimer.install(); + + // The initial dialog remains open for 100ms after export enters the + // in-progress state. + exportDialog.$$('#exportPasswordsButton').click(); + progressCallback( + {status: chrome.passwordsPrivate.ExportProgressStatus.IN_PROGRESS}); + // The progress bar only appears after 100ms. + mockTimer.tick(100); + Polymer.dom.flush(); + assertTrue(exportDialog.$$('#dialog_progress').open); + exportDialog.$$('#cancel_progress_button').click(); + + Polymer.dom.flush(); + // The dialog should be dismissed entirely. + assertFalse(!!exportDialog.$$('#dialog_progress')); + assertFalse(!!exportDialog.$$('#dialog_start')); + assertFalse(!!exportDialog.$$('#dialog_error')); + + mockTimer.uninstall(); + } + + /* #export */ function runFireCloseEventAfterExportCompleteTest( + exportDialog, passwordManager) { + const wait = + test_util.eventToPromise('passwords-export-dialog-close', exportDialog); + exportDialog.$$('#exportPasswordsButton').click(); + passwordManager.progressCallback( + {status: chrome.passwordsPrivate.ExportProgressStatus.IN_PROGRESS}); + passwordManager.progressCallback( + {status: chrome.passwordsPrivate.ExportProgressStatus.SUCCEEDED}); + return wait; + } + + // #cr_define_end + return { + runStartExportTest: runStartExportTest, + runExportFlowFastTest: runExportFlowFastTest, + runExportFlowErrorTest: runExportFlowErrorTest, + runExportFlowErrorRetryTest: runExportFlowErrorRetryTest, + runExportFlowSlowTest: runExportFlowSlowTest, + runCancelExportTest: runCancelExportTest, + runFireCloseEventAfterExportCompleteTest: + runFireCloseEventAfterExportCompleteTest, + }; +});
diff --git a/chrome/test/data/webui/settings/passwords_section_test.js b/chrome/test/data/webui/settings/passwords_section_test.js index 18f5b1e..605d14d 100644 --- a/chrome/test/data/webui/settings/passwords_section_test.js +++ b/chrome/test/data/webui/settings/passwords_section_test.js
@@ -4,22 +4,36 @@ /** @fileoverview Runs the Polymer Password Settings tests. */ +// clang-format off +// #import {getToastManager, PasswordManagerImpl} from 'chrome://settings/settings.js'; +// #import {PasswordSectionElementFactory, createExceptionEntry, createPasswordEntry, makeCompromisedCredentialsInfo} from 'chrome://test/settings/passwords_and_autofill_fake_data.m.js'; +// #import {runStartExportTest, runExportFlowFastTest, runExportFlowErrorTest, runExportFlowErrorRetryTest, runExportFlowSlowTest, runCancelExportTest, runFireCloseEventAfterExportCompleteTest} from 'chrome://test/settings/passwords_export_test.m.js'; +// #import {eventToPromise} from 'chrome://test/test_util.m.js'; +// #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; +// #import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; +// #import {TestPasswordManagerProxy} from 'chrome://test/settings/test_password_manager_proxy.m.js'; +// #import {getSyncAllPrefs, simulateSyncStatus} from 'chrome://test/settings/sync_test_util.m.js'; +// #import {isChromeOS} from 'chrome://resources/js/cr.m.js'; +// clang-format-on cr.define('settings_passwords_section', function() { /** * Helper method that validates a that elements in the password list match * the expected data. - * @param {!Element} listElement The iron-list element that will be checked. + * @param {!Element} passwordsSection The passwords section element that will + * be checked. * @param {!Array<!chrome.passwordsPrivate.PasswordUiEntry>} passwordList The * expected data. * @private */ - function validatePasswordList(listElement, passwordList) { + function validatePasswordList(passwordsSection, passwordList) { + const listElement = passwordsSection.$.passwordList; assertEquals(passwordList.length, listElement.items.length); for (let index = 0; index < passwordList.length; ++index) { - // The first child is a template, skip and get the real 'first child'. - const node = Polymer.dom(listElement).children[index + 1]; - assert(node); + const listItems = passwordsSection.shadowRoot.querySelectorAll( + 'password-list-item'); + const node = listItems[index]; + assertTrue(!!node); const passwordInfo = passwordList[index]; assertEquals( passwordInfo.urls.shown, node.$$('#originUrl').textContent.trim()); @@ -71,7 +85,7 @@ */ function getFirstPasswordListItem(passwordsSection) { // The first child is a template, skip and get the real 'first child'. - return Polymer.dom(passwordsSection.$.passwordList).children[1]; + return passwordsSection.$$('password-list-item'); } /** @@ -141,7 +155,7 @@ const passwordsSection = elementFactory.createPasswordsSection(passwordManager, [], []); - validatePasswordList(passwordsSection.$.passwordList, []); + validatePasswordList(passwordsSection, []); assertFalse(passwordsSection.$.noPasswordsLabel.hidden); assertTrue(passwordsSection.$.savedPasswordsHeaders.hidden); @@ -166,7 +180,7 @@ passwordList, passwordsSection.$.passwordList.items.map(entry => entry.entry)); - validatePasswordList(passwordsSection.$.passwordList, passwordList); + validatePasswordList(passwordsSection, passwordList); assertTrue(passwordsSection.$.noPasswordsLabel.hidden); assertFalse(passwordsSection.$.savedPasswordsHeaders.hidden); @@ -185,7 +199,7 @@ const passwordsSection = elementFactory.createPasswordsSection( passwordManager, passwordList, []); - validatePasswordList(passwordsSection.$.passwordList, passwordList); + validatePasswordList(passwordsSection, passwordList); // Simulate 'longwebsite.com' being removed from the list. passwordList.splice(1, 1); passwordManager.lastCallback.addSavedPasswordListChangedListener( @@ -197,7 +211,7 @@ 'longwebsite.com')); assertFalse(listContainsUrl(passwordList, 'longwebsite.com')); - validatePasswordList(passwordsSection.$.passwordList, passwordList); + validatePasswordList(passwordsSection, passwordList); }); // Test verifies that adding a password will update the elements. @@ -212,7 +226,7 @@ const passwordsSection = elementFactory.createPasswordsSection( passwordManager, passwordList, []); - validatePasswordList(passwordsSection.$.passwordList, passwordList); + validatePasswordList(passwordsSection, passwordList); // Simulate 'website.com' being added to the list. passwordList.unshift(autofill_test_util.createPasswordEntry( 'website.com', 'mario', 70, 2)); @@ -220,7 +234,7 @@ passwordList); Polymer.dom.flush(); - validatePasswordList(passwordsSection.$.passwordList, passwordList); + validatePasswordList(passwordsSection, passwordList); }); // Test verifies that removing one out of two passwords for the same website @@ -238,21 +252,21 @@ passwordManager.lastCallback.addSavedPasswordListChangedListener( passwordList); Polymer.dom.flush(); - validatePasswordList(passwordsSection.$.passwordList, passwordList); + validatePasswordList(passwordsSection, passwordList); // Simulate '(website.com, mario)' being removed from the list. passwordList.shift(); passwordManager.lastCallback.addSavedPasswordListChangedListener( passwordList); Polymer.dom.flush(); - validatePasswordList(passwordsSection.$.passwordList, passwordList); + validatePasswordList(passwordsSection, passwordList); // Simulate '(website.com, luigi)' being removed from the list as well. passwordList = []; passwordManager.lastCallback.addSavedPasswordListChangedListener( passwordList); Polymer.dom.flush(); - validatePasswordList(passwordsSection.$.passwordList, passwordList); + validatePasswordList(passwordsSection, passwordList); }); // Test verifies that pressing the 'remove' button will trigger a remove @@ -271,7 +285,7 @@ passwordManager, passwordList, []); const firstNode = getFirstPasswordListItem(passwordsSection); - assert(firstNode); + assertTrue(!!firstNode); const firstPassword = passwordList[0]; passwordManager.onRemoveSavedPassword = function(id) { @@ -341,7 +355,7 @@ autofill_test_util.createPasswordEntry('six-show.com', 'one', 6), ]; - validatePasswordList(passwordsSection.$.passwordList, expectedList); + validatePasswordList(passwordsSection, expectedList); }); test('verifyFilterPasswordsWithRemoval', function() { @@ -366,7 +380,7 @@ autofill_test_util.createPasswordEntry('six-show.com', 'one', 6, 5), ]; - validatePasswordList(passwordsSection.$.passwordList, expectedList); + validatePasswordList(passwordsSection, expectedList); // Simulate removal of three.com/show passwordList.splice(2, 1); @@ -380,7 +394,7 @@ passwordManager.lastCallback.addSavedPasswordListChangedListener( passwordList); Polymer.dom.flush(); - validatePasswordList(passwordsSection.$.passwordList, expectedList); + validatePasswordList(passwordsSection, expectedList); }); test('verifyFilterPasswordExceptions', function() { @@ -647,7 +661,7 @@ const passwordsSection = elementFactory.createPasswordsSection( passwordManager, passwordList, []); - validatePasswordList(passwordsSection.$.passwordList, passwordList); + validatePasswordList(passwordsSection, passwordList); assertFalse(passwordsSection.$.menuExportPassword.hidden); done(); }); @@ -659,7 +673,7 @@ const passwordsSection = elementFactory.createPasswordsSection( passwordManager, passwordList, []); - validatePasswordList(passwordsSection.$.passwordList, passwordList); + validatePasswordList(passwordsSection, passwordList); assertTrue(passwordsSection.$.menuExportPassword.hidden); done(); }); @@ -682,197 +696,65 @@ passwordsSection.$.menuExportPassword.click(); }); - // Test that tapping "Export passwords..." notifies the browser. - test('startExport', function(done) { - const exportDialog = - elementFactory.createExportPasswordsDialog(passwordManager); - - passwordManager.exportPasswords = (callback) => { - callback(); - done(); - }; - - exportDialog.$$('#exportPasswordsButton').click(); - }); - - // Test the export flow. If exporting is fast, we should skip the - // in-progress view altogether. - test('exportFlowFast', function(done) { - const exportDialog = - elementFactory.createExportPasswordsDialog(passwordManager); - const progressCallback = passwordManager.progressCallback; - - // Use this to freeze the delayed progress bar and avoid flakiness. - const mockTimer = new MockTimer(); - mockTimer.install(); - - assertTrue(exportDialog.$$('#dialog_start').open); - exportDialog.$$('#exportPasswordsButton').click(); - assertTrue(exportDialog.$$('#dialog_start').open); - progressCallback( - {status: chrome.passwordsPrivate.ExportProgressStatus.IN_PROGRESS}); - progressCallback( - {status: chrome.passwordsPrivate.ExportProgressStatus.SUCCEEDED}); - - Polymer.dom.flush(); - // When we are done, the export dialog closes completely. - assertFalse(!!exportDialog.$$('#dialog_start')); - assertFalse(!!exportDialog.$$('#dialog_error')); - assertFalse(!!exportDialog.$$('#dialog_progress')); - done(); - - mockTimer.uninstall(); - }); - - // The error view is shown when an error occurs. - test('exportFlowError', function(done) { - const exportDialog = - elementFactory.createExportPasswordsDialog(passwordManager); - const progressCallback = passwordManager.progressCallback; - - // Use this to freeze the delayed progress bar and avoid flakiness. - const mockTimer = new MockTimer(); - mockTimer.install(); - - assertTrue(exportDialog.$$('#dialog_start').open); - exportDialog.$$('#exportPasswordsButton').click(); - assertTrue(exportDialog.$$('#dialog_start').open); - progressCallback( - {status: chrome.passwordsPrivate.ExportProgressStatus.IN_PROGRESS}); - progressCallback({ - status: - chrome.passwordsPrivate.ExportProgressStatus.FAILED_WRITE_FAILED, - folderName: 'tmp', + if (!cr.isChromeOS) { + // Test that tapping "Export passwords..." notifies the browser. + test('startExport', function(done) { + const exportDialog = + elementFactory.createExportPasswordsDialog(passwordManager); + export_passwords_tests.runStartExportTest( + exportDialog, passwordManager, done); }); - Polymer.dom.flush(); - // Test that the error dialog is shown. - assertTrue(exportDialog.$$('#dialog_error').open); - // Test that the error dialog can be dismissed. - exportDialog.$$('#cancelErrorButton').click(); - Polymer.dom.flush(); - assertFalse(!!exportDialog.$$('#dialog_error')); - done(); - - mockTimer.uninstall(); - }); - - // The error view allows to retry. - test('exportFlowErrorRetry', function(done) { - const exportDialog = - elementFactory.createExportPasswordsDialog(passwordManager); - const progressCallback = passwordManager.progressCallback; - // Use this to freeze the delayed progress bar and avoid flakiness. - const mockTimer = new MockTimer(); - - new Promise(resolve => { - mockTimer.install(); - - passwordManager.exportPasswords = resolve; - exportDialog.$$('#exportPasswordsButton').click(); - }).then(() => { - // This wait allows the BlockingRequestManager to process the click if - // the test is running in ChromeOS. - progressCallback( - {status: chrome.passwordsPrivate.ExportProgressStatus.IN_PROGRESS}); - progressCallback({ - status: - chrome.passwordsPrivate.ExportProgressStatus.FAILED_WRITE_FAILED, - folderName: 'tmp', - }); - - Polymer.dom.flush(); - // Test that the error dialog is shown. - assertTrue(exportDialog.$$('#dialog_error').open); - // Test that clicking retry will start a new export. - passwordManager.exportPasswords = (callback) => { - callback(); - done(); - }; - exportDialog.$$('#tryAgainButton').click(); - - mockTimer.uninstall(); + // Test the export flow. If exporting is fast, we should skip the + // in-progress view altogether. + test('exportFlowFast', function(done) { + const exportDialog = + elementFactory.createExportPasswordsDialog(passwordManager); + export_passwords_tests.runExportFlowFastTest( + exportDialog, passwordManager, done); }); - }); - // Test the export flow. If exporting is slow, Chrome should show the - // in-progress dialog for at least 1000ms. - test('exportFlowSlow', function(done) { - const exportDialog = - elementFactory.createExportPasswordsDialog(passwordManager); - const progressCallback = passwordManager.progressCallback; + // The error view is shown when an error occurs. + test('exportFlowError', function(done) { + const exportDialog = + elementFactory.createExportPasswordsDialog(passwordManager); + export_passwords_tests.runExportFlowErrorTest( + exportDialog, passwordManager, done); + }); - const mockTimer = new MockTimer(); - mockTimer.install(); + // The error view allows to retry. + test('exportFlowErrorRetry', function(done) { + const exportDialog = + elementFactory.createExportPasswordsDialog(passwordManager); + export_passwords_tests.runExportFlowErrorRetryTest( + exportDialog, passwordManager, done); + }); - // The initial dialog remains open for 100ms after export enters the - // in-progress state. - assertTrue(exportDialog.$$('#dialog_start').open); - exportDialog.$$('#exportPasswordsButton').click(); - assertTrue(exportDialog.$$('#dialog_start').open); - progressCallback( - {status: chrome.passwordsPrivate.ExportProgressStatus.IN_PROGRESS}); - assertTrue(exportDialog.$$('#dialog_start').open); + // Test the export flow. If exporting is slow, Chrome should show the + // in-progress dialog for at least 1000ms. + test('exportFlowSlow', function(done) { + const exportDialog = + elementFactory.createExportPasswordsDialog(passwordManager); + export_passwords_tests.runExportFlowSlowTest( + exportDialog, passwordManager, done); + }); - // After 100ms of not having completed, the dialog switches to the - // progress bar. Chrome will continue to show the progress bar for 1000ms, - // despite a completion event. - mockTimer.tick(99); - assertTrue(exportDialog.$$('#dialog_start').open); - mockTimer.tick(1); - Polymer.dom.flush(); - assertTrue(exportDialog.$$('#dialog_progress').open); - progressCallback( - {status: chrome.passwordsPrivate.ExportProgressStatus.SUCCEEDED}); - assertTrue(exportDialog.$$('#dialog_progress').open); + // Test that canceling the dialog while exporting will also cancel the + // export on the browser. + test('cancelExport', function(done) { + const exportDialog = + elementFactory.createExportPasswordsDialog(passwordManager); + export_passwords_tests.runCancelExportTest( + exportDialog, passwordManager, done); + }); - // After 1000ms, Chrome will display the completion event. - mockTimer.tick(999); - assertTrue(exportDialog.$$('#dialog_progress').open); - mockTimer.tick(1); - Polymer.dom.flush(); - // On SUCCEEDED the dialog closes completely. - assertFalse(!!exportDialog.$$('#dialog_progress')); - assertFalse(!!exportDialog.$$('#dialog_start')); - assertFalse(!!exportDialog.$$('#dialog_error')); - done(); - - mockTimer.uninstall(); - }); - - // Test that canceling the dialog while exporting will also cancel the - // export on the browser. - test('cancelExport', function(done) { - const exportDialog = - elementFactory.createExportPasswordsDialog(passwordManager); - const progressCallback = passwordManager.progressCallback; - - passwordManager.cancelExportPasswords = () => { - done(); - }; - - const mockTimer = new MockTimer(); - mockTimer.install(); - - // The initial dialog remains open for 100ms after export enters the - // in-progress state. - exportDialog.$$('#exportPasswordsButton').click(); - progressCallback( - {status: chrome.passwordsPrivate.ExportProgressStatus.IN_PROGRESS}); - // The progress bar only appears after 100ms. - mockTimer.tick(100); - Polymer.dom.flush(); - assertTrue(exportDialog.$$('#dialog_progress').open); - exportDialog.$$('#cancel_progress_button').click(); - - Polymer.dom.flush(); - // The dialog should be dismissed entirely. - assertFalse(!!exportDialog.$$('#dialog_progress')); - assertFalse(!!exportDialog.$$('#dialog_start')); - assertFalse(!!exportDialog.$$('#dialog_error')); - - mockTimer.uninstall(); - }); + test('fires close event after export complete', () => { + const exportDialog = + elementFactory.createExportPasswordsDialog(passwordManager); + return export_passwords_tests.runFireCloseEventAfterExportCompleteTest( + exportDialog, passwordManager); + }); + } // The export dialog is dismissable. test('exportDismissable', function(done) { @@ -896,19 +778,6 @@ return wait; }); - test('fires close event after export complete', () => { - const exportDialog = - elementFactory.createExportPasswordsDialog(passwordManager); - const wait = test_util.eventToPromise( - 'passwords-export-dialog-close', exportDialog); - exportDialog.$$('#exportPasswordsButton').click(); - passwordManager.progressCallback( - {status: chrome.passwordsPrivate.ExportProgressStatus.IN_PROGRESS}); - passwordManager.progressCallback( - {status: chrome.passwordsPrivate.ExportProgressStatus.SUCCEEDED}); - return wait; - }); - test('hideLinkToPasswordManagerWhenEncrypted', function() { const passwordsSection = elementFactory.createPasswordsSection(passwordManager, [], []); @@ -971,4 +840,5 @@ }); }); }); + // #cr_define_end });
diff --git a/chrome/test/data/webui/settings/passwords_section_test_cros.js b/chrome/test/data/webui/settings/passwords_section_test_cros.js index 5c1bdbd..5ba25cb1 100644 --- a/chrome/test/data/webui/settings/passwords_section_test_cros.js +++ b/chrome/test/data/webui/settings/passwords_section_test_cros.js
@@ -9,6 +9,16 @@ * native CrOS feature. See http://crbug.com/917178 for more detail. */ +// clang-format off +// #import {BlockingRequestManager, PasswordManagerImpl} from 'chrome://settings/settings.js'; +// #import {PasswordSectionElementFactory, createPasswordEntry} from 'chrome://test/settings/passwords_and_autofill_fake_data.m.js'; +// #import {runStartExportTest, runExportFlowFastTest, runExportFlowErrorTest, runExportFlowErrorRetryTest, runExportFlowSlowTest, runCancelExportTest, runFireCloseEventAfterExportCompleteTest} from 'chrome://test/settings/passwords_export_test.m.js'; +// #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; +// #import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; +// #import {MockTimer} from 'chrome://test/mock_timer.m.js'; +// #import {TestPasswordManagerProxy} from 'chrome://test/settings/test_password_manager_proxy.m.js'; +// clang-format-on + cr.define('settings_passwords_section_cros', function() { suite('PasswordsSection_Cros', function() { /** @@ -63,10 +73,13 @@ } /** @override */ - createExportPasswordsDialog(passwordManager) { - return Object.assign( - super.createExportPasswordsDialog(passwordManager), - {tokenRequestManager: this.tokenRequestManager}); + createExportPasswordsDialog(passwordManager, overrideRequestManager) { + const dialog = super.createExportPasswordsDialog(passwordManager); + dialog.tokenRequestManager = new settings.BlockingRequestManager(); + return overrideRequestManager ? + Object.assign(dialog, + {tokenRequestManager: this.tokenRequestManager}) : + dialog; } /** @@ -136,15 +149,19 @@ document, requestManager, passwordItem); }); - test('export passwords button requests auth token', function() { + // Note (rbpotter): this passes locally, but may still be flaky (see + // https://www.crbug.com/1021474) + test.skip('export passwords button requests auth token', function() { passwordPromise.then(fail); const exportDialog = - elementFactory.createExportPasswordsDialog(passwordManager); + elementFactory.createExportPasswordsDialog(passwordManager, true); exportDialog.$$('#exportPasswordsButton').click(); return requestPromise; }); - test( + // Note (rbpotter): this passes locally, but may still be flaky (see + // https://www.crbug.com/1021474) + test.skip( 'list-item does not request token if it gets password to show', function() { requestPromise.then(fail); @@ -154,7 +171,8 @@ return passwordPromise; }); - test( + // Note (rbpotter): this fails locally, possibly out of date + test.skip( 'list-item requests token if it does not get password to show', function() { passwordPromise.then(fail); @@ -164,7 +182,9 @@ return requestPromise; }); - test( + // Note (rbpotter): this passes locally, but may still be flaky (see + // https://www.crbug.com/1021474) + test.skip( 'edit-dialog does not request token if it gets password to show', function() { requestPromise.then(fail); @@ -174,7 +194,8 @@ return passwordPromise; }); - test( + // Note (rbpotter): this fails locally, possibly out of date + test.skip( 'edit-dialog requests token if it does not get password to show', function() { passwordPromise.then(fail); @@ -184,7 +205,10 @@ return requestPromise; }); - test('password-prompt-dialog appears on auth token request', function() { + // Note (rbpotter): this passes locally, but may still be flaky (see + // https://www.crbug.com/1021474) + test.skip('password-prompt-dialog appears on auth token request', + function() { const passwordsSection = elementFactory.createPasswordsSection(passwordManager); assertTrue(!passwordsSection.$$('settings-password-prompt-dialog')); @@ -193,7 +217,8 @@ assertTrue(!!passwordsSection.$$('settings-password-prompt-dialog')); }); - test( + // Note (rbpotter): this fails locally, possibly out of date + test.skip( 'password-section resolves request on auth token receipt', function(done) { const passwordsSection = @@ -202,7 +227,8 @@ passwordsSection.authToken_ = 'auth token'; }); - test( + // Note (rbpotter): this fails locally, possibly out of date + test.skip( 'password-section only triggers callback on most recent request', function(done) { const passwordsSection = @@ -214,7 +240,8 @@ passwordsSection.authToken_ = 'auth token'; }); - test( + // Note (rbpotter): this fails locally, possibly out of date + test.skip( 'user is not prompted for password if they cannot enter it', function(done) { loadTimeData.overrideValues({userCannotManuallyEnterPassword: true}); @@ -228,5 +255,64 @@ done(); }); }); + + // Test that tapping "Export passwords..." notifies the browser. + test('startExport', function(done) { + const exportDialog = + elementFactory.createExportPasswordsDialog(passwordManager, false); + export_passwords_tests.runStartExportTest( + exportDialog, passwordManager, done); + }); + + // Test the export flow. If exporting is fast, we should skip the + // in-progress view altogether. + test('exportFlowFast', function(done) { + const exportDialog = + elementFactory.createExportPasswordsDialog(passwordManager, false); + export_passwords_tests.runExportFlowFastTest( + exportDialog, passwordManager, done); + }); + + // The error view is shown when an error occurs. + test('exportFlowError', function(done) { + const exportDialog = + elementFactory.createExportPasswordsDialog(passwordManager, false); + export_passwords_tests.runExportFlowErrorTest( + exportDialog, passwordManager, done); + }); + + // The error view allows to retry. + test('exportFlowErrorRetry', function(done) { + const exportDialog = + elementFactory.createExportPasswordsDialog(passwordManager, false); + export_passwords_tests.runExportFlowErrorRetryTest( + exportDialog, passwordManager, done); + }); + + // Test the export flow. If exporting is slow, Chrome should show the + // in-progress dialog for at least 1000ms. + test('exportFlowSlow', function(done) { + const exportDialog = + elementFactory.createExportPasswordsDialog(passwordManager, false); + export_passwords_tests.runExportFlowSlowTest( + exportDialog, passwordManager, done); + }); + + // Test that canceling the dialog while exporting will also cancel the + // export on the browser. + test('cancelExport', function(done) { + const exportDialog = + elementFactory.createExportPasswordsDialog(passwordManager, false); + export_passwords_tests.runCancelExportTest( + exportDialog, passwordManager, done); + }); + + test('fires close event after export complete', () => { + const exportDialog = + elementFactory.createExportPasswordsDialog(passwordManager, false); + return export_passwords_tests.runFireCloseEventAfterExportCompleteTest( + exportDialog, passwordManager); + }); }); + // #cr_define_end });
diff --git a/chrome/test/data/webui/settings/payments_section_test.js b/chrome/test/data/webui/settings/payments_section_test.js index ded8972..70dd8766 100644 --- a/chrome/test/data/webui/settings/payments_section_test.js +++ b/chrome/test/data/webui/settings/payments_section_test.js
@@ -2,6 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +// clang-format off +// #import {PaymentsManagerImpl} from 'chrome://settings/settings.js'; +// #import {TestPaymentsManager, createCreditCardEntry, createEmptyCreditCardEntry} from 'chrome://test/settings/passwords_and_autofill_fake_data.m.js'; +// #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; +// #import {eventToPromise, whenAttributeIs} from 'chrome://test/test_util.m.js'; +// #import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; +// clang-format-on + cr.define('settings_payments_section', function() { suite('PaymentSectionUiTest', function() { test('testAutofillExtensionIndicator', function() { @@ -552,8 +560,8 @@ /*creditCards=*/[], /*upiIds=*/[], /*prefValues=*/ {}); const paymentsList = section.$$('#paymentsList'); - const upiRows = Polymer.dom(paymentsList.shadowRoot) - .querySelectorAll('settings-upi-id-list-entry'); + const upiRows = paymentsList.shadowRoot.querySelectorAll( + 'settings-upi-id-list-entry'); assertEquals(0, upiRows.length); }); @@ -566,8 +574,8 @@ /*creditCards=*/[], upiIds, /*prefValues=*/ {}); const paymentsList = section.$$('#paymentsList'); - const upiRows = Polymer.dom(paymentsList.shadowRoot) - .querySelectorAll('settings-upi-id-list-entry'); + const upiRows = paymentsList.shadowRoot.querySelectorAll( + 'settings-upi-id-list-entry'); assertEquals(upiIds.length, upiRows.length); }); @@ -581,10 +589,11 @@ /*creditCards=*/[], upiIds, /*prefValues=*/ {}); const paymentsList = section.$$('#paymentsList'); - const upiRows = Polymer.dom(paymentsList.shadowRoot) - .querySelectorAll('settings-upi-id-list-entry'); + const upiRows = paymentsList.shadowRoot.querySelectorAll( + 'settings-upi-id-list-entry'); assertEquals(0, upiRows.length); }); }); + // #cr_define_end });
diff --git a/chrome/test/data/webui/settings/secure_dns_interactive_test.js b/chrome/test/data/webui/settings/secure_dns_interactive_test.js index 43bcd85..a6dc867 100644 --- a/chrome/test/data/webui/settings/secure_dns_interactive_test.js +++ b/chrome/test/data/webui/settings/secure_dns_interactive_test.js
@@ -65,6 +65,9 @@ }, ]; + const invalidEntry = 'invalid_template'; + const validEntry = 'https://example.doh.server/dns-query'; + suiteSetup(function() { loadTimeData.overrideValues({showSecureDnsSetting: true}); }); @@ -127,10 +130,13 @@ // click outside the text field. The mode pref should be updated to // 'secure'. secureDnsInput.focus(); - secureDnsInput.value = 'https://example.doh.server/dns-query'; - testBrowserProxy.setIsEntryValid(true); + secureDnsInput.value = validEntry; + testBrowserProxy.setValidEntry(validEntry); secureDnsInput.blur(); - await testBrowserProxy.whenCalled('validateCustomDnsEntry'); + await Promise.all([ + testBrowserProxy.whenCalled('validateCustomDnsEntry'), + testBrowserProxy.whenCalled('probeCustomDnsTemplate') + ]); assertEquals( settings.SecureDnsMode.SECURE, testElement.prefs.dns_over_https.mode.value); @@ -146,12 +152,15 @@ secureDnsToggle.click(); assertEquals(settings.SecureDnsMode.SECURE, secureDnsRadioGroup.selected); assertTrue(secureDnsInput.matches(':focus-within')); - assertEquals('https://example.doh.server/dns-query', secureDnsInput.value); + assertEquals(validEntry, secureDnsInput.value); assertEquals( settings.SecureDnsMode.OFF, testElement.prefs.dns_over_https.mode.value); secureDnsInput.blur(); - await testBrowserProxy.whenCalled('validateCustomDnsEntry'); + await Promise.all([ + testBrowserProxy.whenCalled('validateCustomDnsEntry'), + testBrowserProxy.whenCalled('probeCustomDnsTemplate') + ]); assertEquals( settings.SecureDnsMode.SECURE, testElement.prefs.dns_over_https.mode.value); @@ -323,8 +332,8 @@ // Make the template invalid and check that the mode pref changes to // 'automatic'. secureDnsInput.focus(); - secureDnsInput.value = 'invalid_template'; - testBrowserProxy.setIsEntryValid(false); + secureDnsInput.value = invalidEntry; + testBrowserProxy.setValidEntry(''); secureDnsInput.blur(); await testBrowserProxy.whenCalled('validateCustomDnsEntry'); assertFalse(secureDnsInput.matches(':focus-within')); @@ -347,17 +356,21 @@ assertFalse(secureDnsInput.hasAttribute('hidden')); assertFalse(secureDnsInput.matches(':focus-within')); assertTrue(secureDnsInput.isInvalid()); - assertEquals('invalid_template', secureDnsInput.value); + assertEquals(invalidEntry, secureDnsInput.value); assertEquals( settings.SecureDnsMode.AUTOMATIC, secureDnsRadioGroup.selected); - // Make the template valid but don't change the radio button yet. + // Make the template valid, but don't change the radio button yet. secureDnsInput.focus(); secureDnsInput.value = - 'https://dns.ex/dns-query invalid https://dns.ex.another/dns-query'; - testBrowserProxy.setIsEntryValid(true); + `${validEntry} ${invalidEntry} https://dns.ex.another/dns-query`; + testBrowserProxy.setValidEntry(validEntry); + testBrowserProxy.setProbeSuccess(true); secureDnsInput.blur(); - await testBrowserProxy.whenCalled('validateCustomDnsEntry'); + await Promise.all([ + testBrowserProxy.whenCalled('validateCustomDnsEntry'), + testBrowserProxy.whenCalled('probeCustomDnsTemplate') + ]); assertFalse(secureDnsInput.matches(':focus-within')); assertFalse(secureDnsInput.isInvalid()); assertEquals( @@ -373,7 +386,10 @@ testElement.prefs.dns_over_https.mode.value); assertEquals('', testElement.prefs.dns_over_https.templates.value); secureDnsInput.blur(); - await testBrowserProxy.whenCalled('validateCustomDnsEntry'); + await Promise.all([ + testBrowserProxy.whenCalled('validateCustomDnsEntry'), + testBrowserProxy.whenCalled('probeCustomDnsTemplate') + ]); assertFalse(secureDnsInput.matches(':focus-within')); assertFalse(secureDnsInput.isInvalid()); assertEquals(settings.SecureDnsMode.SECURE, secureDnsRadioGroup.selected); @@ -381,7 +397,7 @@ settings.SecureDnsMode.SECURE, testElement.prefs.dns_over_https.mode.value); assertEquals( - 'https://dns.ex/dns-query invalid https://dns.ex.another/dns-query', + `${validEntry} ${invalidEntry} https://dns.ex.another/dns-query`, testElement.prefs.dns_over_https.templates.value); // Make sure the input field updates with a change in the underlying
diff --git a/chrome/test/data/webui/settings/secure_dns_test.js b/chrome/test/data/webui/settings/secure_dns_test.js index b54ae6a..de85940 100644 --- a/chrome/test/data/webui/settings/secure_dns_test.js +++ b/chrome/test/data/webui/settings/secure_dns_test.js
@@ -14,12 +14,21 @@ /** @type {SecureDnsInputElement} */ let testElement; + /** @type {CrInputElement} */ + let crInput; + // Possible error messages const invalidFormat = 'invalid format description'; + const probeFail = 'probe fail description'; + + const invalidEntry = 'invalid_entry'; + const validFailEntry = 'https://example.server/dns-query'; + const validSuccessEntry = 'https://example.server.another/dns-query'; suiteSetup(function() { loadTimeData.overrideValues({ secureDnsCustomFormatError: invalidFormat, + secureDnsCustomConnectionError: probeFail, }); }); @@ -30,37 +39,66 @@ testElement = document.createElement('secure-dns-input'); document.body.appendChild(testElement); Polymer.dom.flush(); + crInput = testElement.$$('#input'); + assertFalse(crInput.invalid); + assertEquals('', testElement.value); }); teardown(function() { testElement.remove(); }); - test('SecureDnsInputError', async function() { - const crInput = testElement.$$('#input'); - assertFalse(crInput.invalid); - assertEquals('', testElement.value); - + test('SecureDnsInputEmpty', async function() { // Trigger validation on an empty input. - testBrowserProxy.setIsEntryValid(false); + testBrowserProxy.setValidEntry(''); testElement.validate(); - await testBrowserProxy.whenCalled('validateCustomDnsEntry'); + assertEquals( + '', await testBrowserProxy.whenCalled('validateCustomDnsEntry')); assertFalse(crInput.invalid); assertFalse(testElement.isInvalid()); + }); - // Enter a valid input and trigger validation. - testElement.value = 'https://example.server/dns-query'; - testBrowserProxy.setIsEntryValid(true); + test('SecureDnsInputValidFormatAndProbeFail', async function() { + // Enter two valid servers but make the first one fail the test query. + testElement.value = `${validFailEntry} ${validSuccessEntry}`; + testBrowserProxy.setValidEntry(validFailEntry); + testBrowserProxy.setProbeSuccess(false); testElement.validate(); - await testBrowserProxy.whenCalled('validateCustomDnsEntry'); + assertEquals( + `${validFailEntry} ${validSuccessEntry}`, + await testBrowserProxy.whenCalled('validateCustomDnsEntry')); + assertEquals( + validFailEntry, + await testBrowserProxy.whenCalled('probeCustomDnsTemplate')); + assertTrue(crInput.invalid); + assertTrue(testElement.isInvalid()); + assertEquals(probeFail, crInput.errorMessage); + }); + + test('SecureDnsInputValidFormatAndProbeSuccess', async function() { + // Enter a valid input and make the test query succeed. + testElement.value = validSuccessEntry; + testBrowserProxy.setValidEntry(validSuccessEntry); + testBrowserProxy.setProbeSuccess(true); + testElement.validate(); + assertEquals( + validSuccessEntry, + await testBrowserProxy.whenCalled('validateCustomDnsEntry')); + assertEquals( + validSuccessEntry, + await testBrowserProxy.whenCalled('probeCustomDnsTemplate')); assertFalse(crInput.invalid); assertFalse(testElement.isInvalid()); + }); + test('SecureDnsInputInvalid', async function() { // Enter an invalid input and trigger validation. - testElement.value = 'invalid_template'; - testBrowserProxy.setIsEntryValid(false); + testElement.value = invalidEntry; + testBrowserProxy.setValidEntry(''); testElement.validate(); - await testBrowserProxy.whenCalled('validateCustomDnsEntry'); + assertEquals( + invalidEntry, + await testBrowserProxy.whenCalled('validateCustomDnsEntry')); assertTrue(crInput.invalid); assertTrue(testElement.isInvalid()); assertEquals(invalidFormat, crInput.errorMessage); @@ -69,7 +107,7 @@ crInput.fire('input'); assertFalse(crInput.invalid); assertFalse(testElement.isInvalid()); - assertEquals('invalid_template', testElement.value); + assertEquals(invalidEntry, testElement.value); }); });
diff --git a/chrome/test/data/webui/settings/sync_test_util.js b/chrome/test/data/webui/settings/sync_test_util.js index 48045ee..9bd4ec8d 100644 --- a/chrome/test/data/webui/settings/sync_test_util.js +++ b/chrome/test/data/webui/settings/sync_test_util.js
@@ -2,12 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +// clang-format off +// #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; +// #import {webUIListenerCallback} from 'chrome://resources/js/cr.m.js'; +// clang-format on + cr.define('sync_test_util', function() { /** * Returns sync prefs with everything synced and no passphrase required. * @return {!settings.SyncPrefs} */ - function getSyncAllPrefs() { + /* #export */ function getSyncAllPrefs() { return { appsRegistered: true, appsSynced: true, @@ -55,7 +60,7 @@ } /** @param {!settings.SyncStatus} */ - function simulateSyncStatus(status) { + /* #export */ function simulateSyncStatus(status) { cr.webUIListenerCallback('sync-status-changed', status); Polymer.dom.flush(); } @@ -66,6 +71,7 @@ Polymer.dom.flush(); } + // #cr_define_end return { getSyncAllPrefs: getSyncAllPrefs, setupRouterWithSyncRoutes: setupRouterWithSyncRoutes,
diff --git a/chrome/test/data/webui/settings/test_open_window_proxy.js b/chrome/test/data/webui/settings/test_open_window_proxy.js index 2468c1b..9a62a560 100644 --- a/chrome/test/data/webui/settings/test_open_window_proxy.js +++ b/chrome/test/data/webui/settings/test_open_window_proxy.js
@@ -2,8 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +// #import {TestBrowserProxy} from 'chrome://test/test_browser_proxy.m.js'; + /** @implements {settings.OpenWindowProxy} */ -class TestOpenWindowProxy extends TestBrowserProxy { +/* #export */ class TestOpenWindowProxy extends TestBrowserProxy { constructor() { super([ 'openURL',
diff --git a/chrome/test/data/webui/settings/test_password_manager_proxy.js b/chrome/test/data/webui/settings/test_password_manager_proxy.js index 95fb3bb0..0e0d127b 100644 --- a/chrome/test/data/webui/settings/test_password_manager_proxy.js +++ b/chrome/test/data/webui/settings/test_password_manager_proxy.js
@@ -4,12 +4,17 @@ /** @fileoverview Test implementation of PasswordManagerProxy. */ +// clang-format off +// #import {TestBrowserProxy} from 'chrome://test/test_browser_proxy.m.js'; +// #import {makeCompromisedCredentialsInfo, makePasswordCheckStatus, PasswordManagerExpectations} from 'chrome://test/settings/passwords_and_autofill_fake_data.m.js'; +// clang-format on + /** * Test implementation * @implements {PasswordManagerProxy} * @constructor */ -class TestPasswordManagerProxy extends TestBrowserProxy { +/* #export */ class TestPasswordManagerProxy extends TestBrowserProxy { constructor() { super([ 'requestPlaintextPassword',
diff --git a/chrome/test/data/webui/settings/test_privacy_page_browser_proxy.js b/chrome/test/data/webui/settings/test_privacy_page_browser_proxy.js index bee8354..d20cd13 100644 --- a/chrome/test/data/webui/settings/test_privacy_page_browser_proxy.js +++ b/chrome/test/data/webui/settings/test_privacy_page_browser_proxy.js
@@ -14,6 +14,7 @@ 'getSecureDnsResolverList', 'getSecureDnsSetting', 'validateCustomDnsEntry', + 'probeCustomDnsTemplate', ]); /** @type {!MetricsReporting} */ @@ -94,15 +95,29 @@ /** * Sets the return value for the next validateCustomDnsEntry call. - * @param {boolean} isEntryValid + * @param {string} validEntry */ - setIsEntryValid(isEntryValid) { - this.isEntryValid_ = isEntryValid; + setValidEntry(validEntry) { + this.validEntry_ = validEntry; } /** @override */ - validateCustomDnsEntry() { - this.methodCalled('validateCustomDnsEntry'); - return Promise.resolve(this.isEntryValid_); + validateCustomDnsEntry(entry) { + this.methodCalled('validateCustomDnsEntry', entry); + return Promise.resolve(this.validEntry_); + } + + /** + * Sets the return value for the next probeCustomDnsTemplate call. + * @param {boolean} success + */ + setProbeSuccess(success) { + this.probeSuccess_ = success; + } + + /** @override */ + probeCustomDnsTemplate(template) { + this.methodCalled('probeCustomDnsTemplate', template); + return Promise.resolve(this.probeSuccess_); } }
diff --git a/chrome/updater/BUILD.gn b/chrome/updater/BUILD.gn index 853c2b0..1b31c65 100644 --- a/chrome/updater/BUILD.gn +++ b/chrome/updater/BUILD.gn
@@ -91,10 +91,14 @@ if (is_mac) { sources += [ "installer_mac.cc", + "mac/update_service_out_of_process.h", + "mac/update_service_out_of_process.mm", "server/mac/server.h", "server/mac/server.mm", "server/mac/service_delegate.h", "server/mac/service_delegate.mm", + "server/mac/update_service_wrappers.h", + "server/mac/update_service_wrappers.mm", "update_apps_mac.mm", ] } @@ -134,12 +138,15 @@ deps += [ "//chrome/updater/mac:installer_sources", "//chrome/updater/mac:network_fetcher_sources", - "//chrome/updater/mac:update_service_client_sources", "//chrome/updater/mac:updater_setup_sources", "//chrome/updater/server/mac:protocol", ] } + if (is_mac) { + libs = [ "Foundation.framework" ] + } + if (is_win) { configs -= [ "//build/config/win:winver" ] configs += [ "//chrome/updater/server/win:winver" ]
diff --git a/chrome/updater/mac/BUILD.gn b/chrome/updater/mac/BUILD.gn index e9b747f..0869880d 100644 --- a/chrome/updater/mac/BUILD.gn +++ b/chrome/updater/mac/BUILD.gn
@@ -28,23 +28,6 @@ ] } -source_set("update_service_client_sources") { - sources = [ - "update_service_out_of_process.h", - "update_service_out_of_process.mm", - ] - - deps = [ - "//base", - "//chrome/updater:base", - "//chrome/updater:version_header", - "//chrome/updater/server/mac:protocol", - "//components/update_client", - ] - - libs = [ "Foundation.framework" ] -} - source_set("updater_tests") { testonly = true @@ -67,7 +50,6 @@ sources = [ "main.cc" ] deps = [ ":network_fetcher_sources", - ":update_service_client_sources", ":updater_setup_sources", "//chrome/updater:lib", ]
diff --git a/chrome/updater/mac/net/network_fetcher.mm b/chrome/updater/mac/net/network_fetcher.mm index 9621969..0a84ab8 100644 --- a/chrome/updater/mac/net/network_fetcher.mm +++ b/chrome/updater/mac/net/network_fetcher.mm
@@ -52,7 +52,7 @@ (ResponseStartedCallback)responseStartedCallback progressCallback: (ProgressCallback)progressCallback { - if (self == [super init]) { + if (self = [super init]) { _responseStartedCallback = std::move(responseStartedCallback); _progressCallback = progressCallback; _callbackRunner = base::ThreadTaskRunnerHandle::Get(); @@ -94,9 +94,9 @@ progressCallback:(ProgressCallback)progressCallback postRequestCompleteCallback: (PostRequestCompleteCallback)postRequestCompleteCallback { - if (self == - [super initWithResponseStartedCallback:std::move(responseStartedCallback) - progressCallback:progressCallback]) { + if (self = [super + initWithResponseStartedCallback:std::move(responseStartedCallback) + progressCallback:progressCallback]) { _postRequestCompleteCallback = std::move(postRequestCompleteCallback); } return self; @@ -195,9 +195,9 @@ filePath:(const base::FilePath&)filePath downloadToFileCompleteCallback: (DownloadToFileCompleteCallback)downloadToFileCompleteCallback { - if (self == - [super initWithResponseStartedCallback:std::move(responseStartedCallback) - progressCallback:progressCallback]) { + if (self = [super + initWithResponseStartedCallback:std::move(responseStartedCallback) + progressCallback:progressCallback]) { _filePath = filePath; _downloadToFileCompleteCallback = std::move(downloadToFileCompleteCallback); }
diff --git a/chrome/updater/mac/update_service_out_of_process.h b/chrome/updater/mac/update_service_out_of_process.h index 29f8e93..79c18de3c 100644 --- a/chrome/updater/mac/update_service_out_of_process.h +++ b/chrome/updater/mac/update_service_out_of_process.h
@@ -20,6 +20,9 @@ namespace updater { +using StateChangeCallback = + base::RepeatingCallback<void(updater::UpdateService::UpdateState)>; + // All functions and callbacks must be called on the same sequence. class UpdateServiceOutOfProcess : public UpdateService { public: @@ -40,7 +43,7 @@ void UpdateAll(base::OnceCallback<void(Result)> callback) override; void Update(const std::string& app_id, Priority priority, - base::RepeatingCallback<void(UpdateState)> state_update, + StateChangeCallback state_update, base::OnceCallback<void(Result)> done) override; private:
diff --git a/chrome/updater/mac/update_service_out_of_process.mm b/chrome/updater/mac/update_service_out_of_process.mm index 2aa99b80..58b8bf2 100644 --- a/chrome/updater/mac/update_service_out_of_process.mm +++ b/chrome/updater/mac/update_service_out_of_process.mm
@@ -15,6 +15,7 @@ #include "base/strings/sys_string_conversions.h" #include "base/threading/sequenced_task_runner_handle.h" #import "chrome/updater/server/mac/service_protocol.h" +#import "chrome/updater/server/mac/update_service_wrappers.h" #include "chrome/updater/updater_version.h" #include "components/update_client/update_client_errors.h" @@ -74,6 +75,22 @@ checkForUpdatesWithReply:reply]; } +- (void)checkForUpdateWithAppID:(NSString* _Nonnull)appID + priority:(CRUPriorityWrapper* _Nonnull)priority + updateState:(CRUUpdateStateObserver* _Nonnull)updateState + reply:(void (^_Nullable)(int rc))reply { + auto errorHandler = ^(NSError* xpcError) { + LOG(ERROR) << "XPC connection failed: " << [xpcError description]; + reply(-1); + }; + + [[_xpcConnection.get() remoteObjectProxyWithErrorHandler:errorHandler] + checkForUpdateWithAppID:appID + priority:priority + updateState:updateState + reply:reply]; +} + @end namespace updater { @@ -122,13 +139,29 @@ [_client.get() checkForUpdatesWithReply:reply]; } -void UpdateServiceOutOfProcess::Update( - const std::string& app_id, - UpdateService::Priority priority, - base::RepeatingCallback<void(UpdateState)> state_update, - base::OnceCallback<void(Result)> done) { - // TODO(crbug.com/1059024): Implement. - NOTREACHED(); +void UpdateServiceOutOfProcess::Update(const std::string& app_id, + UpdateService::Priority priority, + StateChangeCallback state_update, + base::OnceCallback<void(Result)> done) { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + + __block base::OnceCallback<void(update_client::Error)> block_callback = + std::move(done); + auto reply = ^(int error) { + base::SequencedTaskRunnerHandle::Get()->PostTask( + FROM_HERE, base::BindOnce(std::move(block_callback), + static_cast<update_client::Error>(error))); + }; + + base::scoped_nsobject<CRUPriorityWrapper> priorityWrapper( + [[CRUPriorityWrapper alloc] initWithPriority:priority]); + base::scoped_nsobject<CRUUpdateStateObserver> stateObserver( + [[CRUUpdateStateObserver alloc] initWithRepeatingCallback:state_update]); + + [_client.get() checkForUpdateWithAppID:SysUTF8ToNSString(app_id) + priority:priorityWrapper.get() + updateState:stateObserver.get() + reply:reply]; } UpdateServiceOutOfProcess::~UpdateServiceOutOfProcess() {
diff --git a/chrome/updater/server/mac/service_delegate.mm b/chrome/updater/server/mac/service_delegate.mm index 4af594d1..70df3d54 100644 --- a/chrome/updater/server/mac/service_delegate.mm +++ b/chrome/updater/server/mac/service_delegate.mm
@@ -12,11 +12,10 @@ #include "base/mac/scoped_nsobject.h" #include "base/strings/sys_string_conversions.h" #import "chrome/updater/server/mac/service_protocol.h" +#import "chrome/updater/server/mac/update_service_wrappers.h" #include "chrome/updater/update_service.h" -@interface CRUUpdateCheckXPCServiceImpl : NSObject <CRUUpdateChecking> { - updater::UpdateService* _service; -} +@interface CRUUpdateCheckXPCServiceImpl : NSObject <CRUUpdateChecking> // Designated initializer. - (instancetype)initWithUpdateService:(updater::UpdateService*)service @@ -24,7 +23,9 @@ @end -@implementation CRUUpdateCheckXPCServiceImpl +@implementation CRUUpdateCheckXPCServiceImpl { + updater::UpdateService* _service; +} - (instancetype)initWithUpdateService:(updater::UpdateService*)service { if (self = [super init]) { @@ -50,6 +51,22 @@ base::mac::ScopedBlock<void (^)(int)>(reply))); } +- (void)checkForUpdateWithAppID:(NSString* _Nonnull)appID + priority:(CRUPriorityWrapper* _Nonnull)priority + updateState:(CRUUpdateStateObserver* _Nonnull)updateState + reply:(void (^_Nullable)(int rc))reply { + _service->Update(base::SysNSStringToUTF8(appID), [priority priority], + [updateState callback], + base::BindOnce( + [](base::mac::ScopedBlock<void (^)(int)> xpcReplyBlock, + update_client::Error error) { + VLOG(1) << "Update complete: error = " + << static_cast<int>(error); + xpcReplyBlock.get()(static_cast<int>(error)); + }, + base::mac::ScopedBlock<void (^)(int)>(reply))); +} + - (void)registerForUpdatesWithAppId:(NSString* _Nullable)appId brandCode:(NSString* _Nullable)brandCode tag:(NSString* _Nullable)tag @@ -98,8 +115,19 @@ shouldAcceptNewConnection:(NSXPCConnection*)newConnection { // Check to see if the other side of the connection is "okay"; // if not, invalidate newConnection and return NO. - newConnection.exportedInterface = + NSXPCInterface* updateCheckingInterface = [NSXPCInterface interfaceWithProtocol:@protocol(CRUUpdateChecking)]; + NSXPCInterface* updateStateObservingInterface = + [NSXPCInterface interfaceWithProtocol:@protocol(CRUUpdateStateObserving)]; + [updateCheckingInterface + setInterface:updateStateObservingInterface + forSelector:@selector(checkForUpdateWithAppID: + priority:updateState:reply:) + argumentIndex:2 + ofReply:NO]; + + newConnection.exportedInterface = updateCheckingInterface; + base::scoped_nsobject<CRUUpdateCheckXPCServiceImpl> object( [[CRUUpdateCheckXPCServiceImpl alloc] initWithUpdateService:_service.get()]);
diff --git a/chrome/updater/server/mac/service_protocol.h b/chrome/updater/server/mac/service_protocol.h index ead3913..b24e9752 100644 --- a/chrome/updater/server/mac/service_protocol.h +++ b/chrome/updater/server/mac/service_protocol.h
@@ -8,11 +8,33 @@ #import <Foundation/Foundation.h> #include "chrome/updater/registration_data.h" +#include "chrome/updater/update_service.h" + +@class CRUUpdateStateObserver; +@class CRUUpdateStateWrapper; +@class CRUPriorityWrapper; + +// Protocol which observes the state of the XPC update checking service. +@protocol CRUUpdateStateObserving <NSObject> + +// Checks for updates and returns the result in the reply block. +- (void)observeUpdateState:(CRUUpdateStateWrapper* _Nonnull)updateState; + +@end // Protocol for the XPC update checking service. @protocol CRUUpdateChecking <NSObject> + // Checks for updates and returns the result in the reply block. - (void)checkForUpdatesWithReply:(void (^_Nullable)(int rc))reply; + +// Checks for update of a given app, with specified priority. Sends repeated +// updates of progress and returns the result in the reply block. +- (void)checkForUpdateWithAppID:(NSString* _Nonnull)appID + priority:(CRUPriorityWrapper* _Nonnull)priority + updateState:(CRUUpdateStateObserver* _Nonnull)updateState + reply:(void (^_Nullable)(int rc))reply; + // Registers app and returns the result in the reply block. - (void)registerForUpdatesWithAppId:(NSString* _Nullable)appId brandCode:(NSString* _Nullable)brandCode @@ -20,6 +42,7 @@ version:(NSString* _Nullable)version existenceCheckerPath:(NSString* _Nullable)existenceCheckerPath reply:(void (^_Nullable)(int rc))reply; + @end #endif // CHROME_UPDATER_SERVER_MAC_SERVICE_PROTOCOL_H_
diff --git a/chrome/updater/server/mac/update_service_wrappers.h b/chrome/updater/server/mac/update_service_wrappers.h new file mode 100644 index 0000000..272861a --- /dev/null +++ b/chrome/updater/server/mac/update_service_wrappers.h
@@ -0,0 +1,41 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CHROME_UPDATER_SERVER_MAC_UPDATE_SERVICE_WRAPPERS_H_ +#define CHROME_UPDATER_SERVER_MAC_UPDATE_SERVICE_WRAPPERS_H_ + +#import <Foundation/Foundation.h> + +#import "chrome/updater/server/mac/service_protocol.h" +#include "chrome/updater/update_service.h" + +using StateChangeCallback = + base::RepeatingCallback<void(updater::UpdateService::UpdateState)>; + +@interface CRUUpdateStateObserver : NSObject <CRUUpdateStateObserving> + +@property(readonly, nonatomic) StateChangeCallback callback; + +- (instancetype)initWithRepeatingCallback:(StateChangeCallback)callback; + +@end + +@interface CRUUpdateStateWrapper : NSObject <NSSecureCoding> + +@property(readonly, nonatomic) updater::UpdateService::UpdateState updateState; + +- (instancetype)initWithUpdateState: + (updater::UpdateService::UpdateState)updateState; + +@end + +@interface CRUPriorityWrapper : NSObject <NSSecureCoding> + +@property(readonly, nonatomic) updater::UpdateService::Priority priority; + +- (instancetype)initWithPriority:(updater::UpdateService::Priority)priority; + +@end + +#endif // CHROME_UPDATER_SERVER_MAC_UPDATE_SERVICE_WRAPPERS_H_
diff --git a/chrome/updater/server/mac/update_service_wrappers.mm b/chrome/updater/server/mac/update_service_wrappers.mm new file mode 100644 index 0000000..d61a338 --- /dev/null +++ b/chrome/updater/server/mac/update_service_wrappers.mm
@@ -0,0 +1,168 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#import "chrome/updater/server/mac/update_service_wrappers.h" + +#import <Foundation/Foundation.h> + +#include "base/bind.h" +#include "base/callback.h" +#include "base/logging.h" +#include "base/threading/sequenced_task_runner_handle.h" +#import "chrome/updater/server/mac/service_protocol.h" + +static NSString* const kCRUUpdateState = @"updateState"; +static NSString* const kCRUPriority = @"priority"; + +using StateChangeCallback = + base::RepeatingCallback<void(updater::UpdateService::UpdateState)>; + +@implementation CRUUpdateStateObserver + +@synthesize callback = _callback; + +- (instancetype)initWithRepeatingCallback:(StateChangeCallback)callback { + if (self = [super init]) { + _callback = callback; + } + return self; +} + +- (void)observeUpdateState:(CRUUpdateStateWrapper* _Nonnull)updateState { + base::SequencedTaskRunnerHandle::Get()->PostTask( + FROM_HERE, base::BindRepeating(_callback, [updateState updateState])); +} + +@end + +@implementation CRUUpdateStateWrapper + +@synthesize updateState = _updateState; + +// Wrapper for updater::UpdateService::UpdateState +typedef NS_ENUM(NSInteger, CRUUpdateStateEnum) { + kCRUUpdateStateUnknown = + static_cast<NSInteger>(updater::UpdateService::UpdateState::kUnknown), + kCRUUpdateStateNotStarted = + static_cast<NSInteger>(updater::UpdateService::UpdateState::kNotStarted), + kCRUUpdateStateCheckingForUpdates = static_cast<NSInteger>( + updater::UpdateService::UpdateState::kCheckingForUpdates), + kCRUUpdateStateDownloading = + static_cast<NSInteger>(updater::UpdateService::UpdateState::kDownloading), + kCRUUpdateStateInstalling = + static_cast<NSInteger>(updater::UpdateService::UpdateState::kInstalling), + kCRUUpdateStateUpdated = + static_cast<NSInteger>(updater::UpdateService::UpdateState::kUpdated), + kCRUUpdateStateNoUpdate = + static_cast<NSInteger>(updater::UpdateService::UpdateState::kNoUpdate), + kCRUUpdateStateUpdateError = + static_cast<NSInteger>(updater::UpdateService::UpdateState::kUpdateError), +}; + +// Designated initializer. +- (instancetype)initWithUpdateState: + (updater::UpdateService::UpdateState)updateState { + if (self = [super init]) { + _updateState = updateState; + } + return self; +} + ++ (BOOL)supportsSecureCoding { + return YES; +} + +- (instancetype)initWithCoder:(NSCoder*)aDecoder { + DCHECK([aDecoder allowsKeyedCoding]); + NSInteger enumValue = [aDecoder decodeIntegerForKey:kCRUUpdateState]; + + switch (enumValue) { + case kCRUUpdateStateUnknown: + return [self + initWithUpdateState:updater::UpdateService::UpdateState::kUnknown]; + case kCRUUpdateStateNotStarted: + return [self + initWithUpdateState:updater::UpdateService::UpdateState::kNotStarted]; + case kCRUUpdateStateCheckingForUpdates: + return [self initWithUpdateState:updater::UpdateService::UpdateState:: + kCheckingForUpdates]; + case kCRUUpdateStateDownloading: + return [self initWithUpdateState:updater::UpdateService::UpdateState:: + kDownloading]; + case kCRUUpdateStateInstalling: + return [self + initWithUpdateState:updater::UpdateService::UpdateState::kInstalling]; + case kCRUUpdateStateUpdated: + return [self + initWithUpdateState:updater::UpdateService::UpdateState::kUpdated]; + case kCRUUpdateStateNoUpdate: + return [self + initWithUpdateState:updater::UpdateService::UpdateState::kNoUpdate]; + case kCRUUpdateStateUpdateError: + return [self initWithUpdateState:updater::UpdateService::UpdateState:: + kUpdateError]; + default: + DLOG(ERROR) << "Unexpected value for CRUUpdateStateEnum: " << enumValue; + return nil; + } +} + +- (void)encodeWithCoder:(NSCoder*)coder { + DCHECK([coder respondsToSelector:@selector(encodeInt:forKey:)]); + [coder encodeInt:static_cast<NSInteger>(_updateState) forKey:kCRUUpdateState]; +} + +@end + +@implementation CRUPriorityWrapper + +@synthesize priority = _priority; + +// Wrapper for updater::UpdateService::Priority +typedef NS_ENUM(NSInteger, CRUUpdatePriorityEnum) { + kCRUUpdatePriorityUnknown = + static_cast<NSInteger>(updater::UpdateService::Priority::kUnknown), + kCRUUpdatePriorityBackground = + static_cast<NSInteger>(updater::UpdateService::Priority::kBackground), + kCRUUpdatePriorityForeground = + static_cast<NSInteger>(updater::UpdateService::Priority::kForeground), +}; + +// Designated initializer. +- (instancetype)initWithPriority:(updater::UpdateService::Priority)priority { + if (self = [super init]) { + _priority = priority; + } + return self; +} + ++ (BOOL)supportsSecureCoding { + return YES; +} + +- (instancetype)initWithCoder:(NSCoder*)aDecoder { + DCHECK([aDecoder allowsKeyedCoding]); + NSInteger enumValue = [aDecoder decodeIntegerForKey:kCRUPriority]; + + switch (enumValue) { + case kCRUUpdatePriorityUnknown: + return [self initWithPriority:updater::UpdateService::Priority::kUnknown]; + case kCRUUpdatePriorityBackground: + return + [self initWithPriority:updater::UpdateService::Priority::kBackground]; + case kCRUUpdatePriorityForeground: + return + [self initWithPriority:updater::UpdateService::Priority::kForeground]; + default: + DLOG(ERROR) << "Unexpected value for CRUUpdatePriorityEnum: " + << enumValue; + return nil; + } +} +- (void)encodeWithCoder:(NSCoder*)coder { + DCHECK([coder respondsToSelector:@selector(encodeInt:forKey:)]); + [coder encodeInt:static_cast<NSInteger>(_priority) forKey:kCRUPriority]; +} + +@end
diff --git a/chrome/updater/update_service.h b/chrome/updater/update_service.h index 3384274..4074227 100644 --- a/chrome/updater/update_service.h +++ b/chrome/updater/update_service.h
@@ -97,10 +97,12 @@ // // |done| arg: // Result: the final result from the update engine. - virtual void Update(const std::string& app_id, - Priority priority, - base::RepeatingCallback<void(UpdateState)> state_update, - base::OnceCallback<void(Result)> done) = 0; + virtual void Update( + const std::string& app_id, + Priority priority, + base::RepeatingCallback<void(updater::UpdateService::UpdateState)> + state_update, + base::OnceCallback<void(Result)> done) = 0; protected: UpdateService() = default;
diff --git a/chromecast/media/audio/cma_audio_output_stream.cc b/chromecast/media/audio/cma_audio_output_stream.cc index 89ccc2f..bfeb754 100644 --- a/chromecast/media/audio/cma_audio_output_stream.cc +++ b/chromecast/media/audio/cma_audio_output_stream.cc
@@ -193,9 +193,9 @@ source_callback_ = nullptr; cma_backend_state_ = CmaBackendState::kPendingClose; - cma_backend_task_runner_.reset(); - cma_backend_.reset(); audio_bus_.reset(); + cma_backend_.reset(); + cma_backend_task_runner_.reset(); std::move(closure).Run(); }
diff --git a/chromeos/audio/cras_audio_handler.cc b/chromeos/audio/cras_audio_handler.cc index 6e667c1..d4a8e58 100644 --- a/chromeos/audio/cras_audio_handler.cc +++ b/chromeos/audio/cras_audio_handler.cc
@@ -264,10 +264,10 @@ return; const std::map<std::string, std::string> metadata_map = { - {"title", base::UTF16ToASCII(metadata->title)}, - {"artist", base::UTF16ToASCII(metadata->artist)}, - {"album", base::UTF16ToASCII(metadata->album)}}; - const std::string source_title = base::UTF16ToASCII(metadata->source_title); + {"title", base::UTF16ToUTF8(metadata->title)}, + {"artist", base::UTF16ToUTF8(metadata->artist)}, + {"album", base::UTF16ToUTF8(metadata->album)}}; + const std::string source_title = base::UTF16ToUTF8(metadata->source_title); // Assume media duration/length should always change with new metadata. fetch_media_session_duration_ = true;
diff --git a/chromeos/profiles/airmont.afdo.newest.txt b/chromeos/profiles/airmont.afdo.newest.txt index e66e01ac..1ca1e9c 100644 --- a/chromeos/profiles/airmont.afdo.newest.txt +++ b/chromeos/profiles/airmont.afdo.newest.txt
@@ -1 +1 @@ -chromeos-chrome-amd64-airmont-82-4072.0-1583751487-benchmark-82.0.4079.0-r1-redacted.afdo.xz \ No newline at end of file +chromeos-chrome-amd64-airmont-82-4072.0-1583751487-benchmark-82.0.4081.0-r1-redacted.afdo.xz \ No newline at end of file
diff --git a/chromeos/profiles/broadwell.afdo.newest.txt b/chromeos/profiles/broadwell.afdo.newest.txt index 39f4b10..521b994 100644 --- a/chromeos/profiles/broadwell.afdo.newest.txt +++ b/chromeos/profiles/broadwell.afdo.newest.txt
@@ -1 +1 @@ -chromeos-chrome-amd64-broadwell-82-4044.31-1583749230-benchmark-82.0.4079.0-r1-redacted.afdo.xz \ No newline at end of file +chromeos-chrome-amd64-broadwell-82-4044.31-1583749230-benchmark-82.0.4081.0-r1-redacted.afdo.xz \ No newline at end of file
diff --git a/chromeos/profiles/silvermont.afdo.newest.txt b/chromeos/profiles/silvermont.afdo.newest.txt index fd37da4..cca222a6 100644 --- a/chromeos/profiles/silvermont.afdo.newest.txt +++ b/chromeos/profiles/silvermont.afdo.newest.txt
@@ -1 +1 @@ -chromeos-chrome-amd64-silvermont-82-4072.0-1583746630-benchmark-82.0.4079.0-r1-redacted.afdo.xz \ No newline at end of file +chromeos-chrome-amd64-silvermont-82-4072.0-1583746630-benchmark-82.0.4081.0-r1-redacted.afdo.xz \ No newline at end of file
diff --git a/chromeos/services/device_sync/remote_device_provider_impl.cc b/chromeos/services/device_sync/remote_device_provider_impl.cc index 5759262..3fd7ecf 100644 --- a/chromeos/services/device_sync/remote_device_provider_impl.cc +++ b/chromeos/services/device_sync/remote_device_provider_impl.cc
@@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/feature_list.h" #include "base/memory/ptr_util.h" +#include "base/metrics/histogram_functions.h" #include "chromeos/components/multidevice/logging/logging.h" #include "chromeos/components/multidevice/secure_message_delegate_impl.h" #include "chromeos/constants/chromeos_features.h" @@ -19,6 +20,50 @@ namespace device_sync { +namespace { + +const int kMaxNumberOfDevicesToLog = 50; + +// Only used while v1 and v2 DeviceSync are running in parallel. +void LogRemoteDeviceCountMetrics( + const multidevice::RemoteDeviceList& v1_devices, + const multidevice::RemoteDeviceList& v2_devices, + size_t num_v2_devices_with_decrypted_public_key, + size_t num_v1_devices_replaced_by_v2_devices) { + // At a minimum, the local device should always be returned from a successful + // v1 or v2 DeviceSync. Only log metrics if v1 and v2 devices are available, + // in other words, if a v1 *and* v2 DeviceSync has previously occurred. + if (v1_devices.empty() || v2_devices.empty()) + return; + + base::UmaHistogramExactLinear( + "CryptAuth.DeviceSyncV2.RemoteDeviceProvider.NumV1Devices", + v1_devices.size(), kMaxNumberOfDevicesToLog); + base::UmaHistogramExactLinear( + "CryptAuth.DeviceSyncV2.RemoteDeviceProvider.NumV2Devices", + v2_devices.size(), kMaxNumberOfDevicesToLog); + + // Note: By CryptAuth server design, v2 devices should always be a subset of + // v1 devices. Race conditions might occur when a user adds a new device + // because v1 and v2 devices are retrieved in different RPC calls; however, + // this is only meant to be a rough estimate. + base::UmaHistogramPercentage( + "CryptAuth.DeviceSyncV2.RemoteDeviceProvider.RatioOfV2ToV1Devices", + (v2_devices.size() * 100) / v1_devices.size()); + + base::UmaHistogramPercentage( + "CryptAuth.DeviceSyncV2.RemoteDeviceProvider." + "PercentageOfV2DevicesWithDecryptedPublicKey", + (num_v2_devices_with_decrypted_public_key * 100) / v2_devices.size()); + + base::UmaHistogramPercentage( + "CryptAuth.DeviceSyncV2.RemoteDeviceProvider." + "PercentageOfV1DevicesReplacedByV2Devices", + (num_v1_devices_replaced_by_v2_devices * 100) / v1_devices.size()); +} + +} // namespace + // static RemoteDeviceProviderImpl::Factory* RemoteDeviceProviderImpl::Factory::factory_instance_ = nullptr; @@ -163,11 +208,15 @@ synced_remote_devices_; synced_remote_devices_ = synced_v1_remote_devices_to_be_merged_; + size_t num_v2_devices_with_decrypted_public_key = 0; + size_t num_v1_devices_replaced_by_v2_devices = 0; for (const auto& v2_device : synced_v2_remote_devices_to_be_merged_) { // Ignore v2 devices without a decrypted public key. if (v2_device.public_key.empty()) continue; + ++num_v2_devices_with_decrypted_public_key; + std::string v2_public_key = v2_device.public_key; auto it = std::find_if( synced_remote_devices_.begin(), synced_remote_devices_.end(), @@ -178,12 +227,19 @@ // If a v1 device has the same public key as the v2 device, replace the // v1 device with the v2 device; otherwise, append the v2 device to the // synced-device list. - if (it != synced_remote_devices_.end()) + if (it != synced_remote_devices_.end()) { *it = v2_device; - else + ++num_v1_devices_replaced_by_v2_devices; + } else { synced_remote_devices_.push_back(v2_device); + } } + LogRemoteDeviceCountMetrics(synced_v1_remote_devices_to_be_merged_, + synced_v2_remote_devices_to_be_merged_, + num_v2_devices_with_decrypted_public_key, + num_v1_devices_replaced_by_v2_devices); + // We need to explicitly check for changes to the synced-device list. It // is possible that the v1 and/or v2 device lists changed but the merged // list didn't change, for example, if a new v2 device appears in the
diff --git a/chromeos/services/multidevice_setup/host_verifier_impl.cc b/chromeos/services/multidevice_setup/host_verifier_impl.cc index ab32488a..155aecd0 100644 --- a/chromeos/services/multidevice_setup/host_verifier_impl.cc +++ b/chromeos/services/multidevice_setup/host_verifier_impl.cc
@@ -10,6 +10,7 @@ #include "base/bind_helpers.h" #include "base/logging.h" #include "base/memory/ptr_util.h" +#include "base/metrics/histogram_functions.h" #include "chromeos/components/multidevice/logging/logging.h" #include "chromeos/components/multidevice/software_feature.h" #include "chromeos/constants/chromeos_features.h" @@ -134,9 +135,12 @@ // The host is not considered verified if it does not have the data needed for // secure communication via Bluetooth. These values could be missing if v2 // DeviceSync data was not decrypted, for instance. - if (current_host->public_key().empty() || - current_host->persistent_symmetric_key().empty() || - current_host->beacon_seeds().empty()) { + bool has_crypto_data = !current_host->public_key().empty() && + !current_host->persistent_symmetric_key().empty() && + !current_host->beacon_seeds().empty(); + base::UmaHistogramBoolean( + "MultiDevice.Setup.HostVerifier.DoesHostHaveCryptoData", has_crypto_data); + if (!has_crypto_data) { return false; }
diff --git a/components/feed/core/common/refresh_throttler.cc b/components/feed/core/common/refresh_throttler.cc index 513a92b..b121d1a 100644 --- a/components/feed/core/common/refresh_throttler.cc +++ b/components/feed/core/common/refresh_throttler.cc
@@ -49,7 +49,7 @@ RefreshThrottler::RefreshThrottler(UserClass user_class, PrefService* pref_service, - base::Clock* clock) + const base::Clock* clock) : pref_service_(pref_service), clock_(clock) { DCHECK(pref_service); DCHECK(clock);
diff --git a/components/feed/core/common/refresh_throttler.h b/components/feed/core/common/refresh_throttler.h index ebe7d13..d854799 100644 --- a/components/feed/core/common/refresh_throttler.h +++ b/components/feed/core/common/refresh_throttler.h
@@ -30,7 +30,7 @@ public: RefreshThrottler(UserClass user_class, PrefService* pref_service, - base::Clock* clock); + const base::Clock* clock); // Returns whether quota is available for another request, persists the usage // of said quota, and reports this information to UMA. @@ -51,7 +51,7 @@ PrefService* pref_service_; // Used to access current time, injected for testing. - base::Clock* clock_; + const base::Clock* clock_; // The name used by this throttler, based off UserClass, which will be used as // a suffix when constructing histogram or finch param names.
diff --git a/components/feed/core/common/user_classifier.cc b/components/feed/core/common/user_classifier.cc index 3738f4b..e286833 100644 --- a/components/feed/core/common/user_classifier.cc +++ b/components/feed/core/common/user_classifier.cc
@@ -141,7 +141,8 @@ } // namespace -UserClassifier::UserClassifier(PrefService* pref_service, base::Clock* clock) +UserClassifier::UserClassifier(PrefService* pref_service, + const base::Clock* clock) : pref_service_(pref_service), clock_(clock) { // The pref_service_ can be null in tests. if (!pref_service_) {
diff --git a/components/feed/core/common/user_classifier.h b/components/feed/core/common/user_classifier.h index 1f868b0..92eb40c5 100644 --- a/components/feed/core/common/user_classifier.h +++ b/components/feed/core/common/user_classifier.h
@@ -46,7 +46,7 @@ }; // The provided |pref_service| may be nullptr in unit-tests. - UserClassifier(PrefService* pref_service, base::Clock* clock); + UserClassifier(PrefService* pref_service, const base::Clock* clock); ~UserClassifier(); // Registers profile prefs for all rates. Called from pref_names.cc. @@ -86,7 +86,7 @@ void ClearRate(Event event); PrefService* pref_service_; - base::Clock* clock_; + const base::Clock* clock_; DISALLOW_COPY_AND_ASSIGN(UserClassifier); };
diff --git a/components/feed/core/v2/BUILD.gn b/components/feed/core/v2/BUILD.gn index 26f0b4ae..fa3e992 100644 --- a/components/feed/core/v2/BUILD.gn +++ b/components/feed/core/v2/BUILD.gn
@@ -46,6 +46,7 @@ "//components/signin/public/identity_manager", "//components/variations", "//components/variations/net", + "//components/web_resource:web_resource", "//net", "//services/network/public/cpp", "//services/network/public/mojom",
diff --git a/components/feed/core/v2/feed_network_impl.h b/components/feed/core/v2/feed_network_impl.h index fee77e8..0719983 100644 --- a/components/feed/core/v2/feed_network_impl.h +++ b/components/feed/core/v2/feed_network_impl.h
@@ -32,6 +32,7 @@ struct RawResponse; class Delegate { public: + virtual ~Delegate() = default; // Returns a string which represents the top locale and region of the // device. // TODO(harringtond): Implement this. See
diff --git a/components/feed/core/v2/feed_stream.cc b/components/feed/core/v2/feed_stream.cc index 310419be..4f38152 100644 --- a/components/feed/core/v2/feed_stream.cc +++ b/components/feed/core/v2/feed_stream.cc
@@ -24,8 +24,8 @@ Delegate* delegate, PrefService* profile_prefs, FeedNetwork* feed_network, - base::Clock* clock, - base::TickClock* tick_clock, + const base::Clock* clock, + const base::TickClock* tick_clock, scoped_refptr<base::SequencedTaskRunner> background_task_runner) : refresh_task_scheduler_(refresh_task_scheduler), stream_event_observer_(stream_event_observer),
diff --git a/components/feed/core/v2/feed_stream.h b/components/feed/core/v2/feed_stream.h index 5f636ac..11b8673 100644 --- a/components/feed/core/v2/feed_stream.h +++ b/components/feed/core/v2/feed_stream.h
@@ -35,6 +35,7 @@ public: class Delegate { public: + virtual ~Delegate() = default; // Returns true if Chrome's EULA has been accepted. virtual bool IsEulaAccepted() = 0; // Returns true if the device is offline. @@ -55,8 +56,8 @@ Delegate* delegate, PrefService* profile_prefs, FeedNetwork* feed_network, - base::Clock* clock, - base::TickClock* tick_clock, + const base::Clock* clock, + const base::TickClock* tick_clock, scoped_refptr<base::SequencedTaskRunner> background_task_runner); ~FeedStream() override; @@ -131,8 +132,8 @@ Delegate* delegate_; PrefService* profile_prefs_; FeedNetwork* feed_network_; - base::Clock* clock_; - base::TickClock* tick_clock_; + const base::Clock* clock_; + const base::TickClock* tick_clock_; scoped_refptr<base::SequencedTaskRunner> background_task_runner_; // Owned, but should only be accessed with |background_task_runner_|.
diff --git a/components/feed/core/v2/master_refresh_throttler.cc b/components/feed/core/v2/master_refresh_throttler.cc index bf2ae92..f247555 100644 --- a/components/feed/core/v2/master_refresh_throttler.cc +++ b/components/feed/core/v2/master_refresh_throttler.cc
@@ -9,7 +9,7 @@ namespace feed { MasterRefreshThrottler::MasterRefreshThrottler(PrefService* profile_prefs, - base::Clock* clock) + const base::Clock* clock) : rare_throttler_(UserClass::kRareSuggestionsViewer, profile_prefs, clock), active_viewer_throttler_(UserClass::kActiveSuggestionsViewer, profile_prefs,
diff --git a/components/feed/core/v2/master_refresh_throttler.h b/components/feed/core/v2/master_refresh_throttler.h index 9c5c45f..7af3dcb 100644 --- a/components/feed/core/v2/master_refresh_throttler.h +++ b/components/feed/core/v2/master_refresh_throttler.h
@@ -18,8 +18,7 @@ // |RefreshThrottler| a private implementation detail of this class. class MasterRefreshThrottler { public: - MasterRefreshThrottler(PrefService* profile_prefs, base::Clock* clock); - + MasterRefreshThrottler(PrefService* profile_prefs, const base::Clock* clock); MasterRefreshThrottler(const MasterRefreshThrottler&) = delete; MasterRefreshThrottler& operator=(const MasterRefreshThrottler&) = delete;
diff --git a/components/feed/core/v2/public/feed_service.cc b/components/feed/core/v2/public/feed_service.cc index 602c809..fabc526 100644 --- a/components/feed/core/v2/public/feed_service.cc +++ b/components/feed/core/v2/public/feed_service.cc
@@ -4,10 +4,105 @@ #include "components/feed/core/v2/public/feed_service.h" +#include "base/time/default_clock.h" +#include "base/time/default_tick_clock.h" +#include "components/feed/core/v2/feed_network_impl.h" +#include "components/feed/core/v2/feed_stream.h" +#include "components/feed/core/v2/refresh_task_scheduler.h" +#include "net/base/network_change_notifier.h" +#include "services/network/public/cpp/shared_url_loader_factory.h" + namespace feed { +namespace { + +class EulaObserver : public web_resource::EulaAcceptedNotifier::Observer { + public: + explicit EulaObserver(FeedStream* feed_stream) : feed_stream_(feed_stream) {} + EulaObserver(EulaObserver&) = delete; + EulaObserver& operator=(const EulaObserver&) = delete; + + // web_resource::EulaAcceptedNotifier::Observer. + void OnEulaAccepted() override { feed_stream_->OnEulaAccepted(); } + + private: + FeedStream* feed_stream_; +}; + +} // namespace + +class FeedService::NetworkDelegateImpl : public FeedNetworkImpl::Delegate { + public: + explicit NetworkDelegateImpl(FeedService::Delegate* service_delegate) + : service_delegate_(service_delegate) {} + NetworkDelegateImpl(const NetworkDelegateImpl&) = delete; + NetworkDelegateImpl& operator=(const NetworkDelegateImpl&) = delete; + + // FeedNetworkImpl::Delegate. + std::string GetLanguageTag() override { + return service_delegate_->GetLanguageTag(); + } + + private: + FeedService::Delegate* service_delegate_; +}; + +class FeedService::StreamDelegateImpl : public FeedStream::Delegate { + public: + explicit StreamDelegateImpl(PrefService* local_state) + : eula_notifier_(local_state) {} + StreamDelegateImpl(const StreamDelegateImpl&) = delete; + StreamDelegateImpl& operator=(const StreamDelegateImpl&) = delete; + + void Initialize(FeedStream* feed_stream) { + eula_observer_ = std::make_unique<EulaObserver>(feed_stream); + eula_notifier_.Init(eula_observer_.get()); + } + + // FeedStream::Delegate. + bool IsEulaAccepted() override { return eula_notifier_.IsEulaAccepted(); } + bool IsOffline() override { return net::NetworkChangeNotifier::IsOffline(); } + + private: + web_resource::EulaAcceptedNotifier eula_notifier_; + std::unique_ptr<EulaObserver> eula_observer_; +}; FeedService::FeedService(std::unique_ptr<FeedStreamApi> stream) : stream_(std::move(stream)) {} + +FeedService::FeedService( + std::unique_ptr<Delegate> delegate, + std::unique_ptr<RefreshTaskScheduler> refresh_task_scheduler, + PrefService* profile_prefs, + PrefService* local_state, + signin::IdentityManager* identity_manager, + scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory, + scoped_refptr<base::SequencedTaskRunner> background_task_runner, + const std::string& api_key) + : delegate_(std::move(delegate)), + refresh_task_scheduler_(std::move(refresh_task_scheduler)) { + stream_delegate_ = std::make_unique<StreamDelegateImpl>(local_state); + network_delegate_ = std::make_unique<NetworkDelegateImpl>(delegate_.get()); + feed_network_ = std::make_unique<FeedNetworkImpl>( + network_delegate_.get(), identity_manager, api_key, url_loader_factory, + base::DefaultTickClock::GetInstance(), profile_prefs); + + stream_ = std::make_unique<FeedStream>( + refresh_task_scheduler_.get(), + nullptr, // TODO(harringtond): Implement EventObserver. + stream_delegate_.get(), profile_prefs, feed_network_.get(), + base::DefaultClock::GetInstance(), base::DefaultTickClock::GetInstance(), + background_task_runner); + + stream_delegate_->Initialize(static_cast<FeedStream*>(stream_.get())); + + // TODO(harringtond): Call FeedStream::OnSignedIn() + // TODO(harringtond): Call FeedStream::OnSignedOut() + // TODO(harringtond): Call FeedStream::OnHistoryDeleted() + // TODO(harringtond): Call FeedStream::OnCacheDataCleared() + // TODO(harringtond): Call FeedStream::OnEnterForeground() +} + FeedService::~FeedService() = default; } // namespace feed
diff --git a/components/feed/core/v2/public/feed_service.h b/components/feed/core/v2/public/feed_service.h index 7baf8749..cdb793c 100644 --- a/components/feed/core/v2/public/feed_service.h +++ b/components/feed/core/v2/public/feed_service.h
@@ -6,19 +6,68 @@ #define COMPONENTS_FEED_CORE_V2_PUBLIC_FEED_SERVICE_H_ #include <memory> +#include <string> + +#include "base/memory/scoped_refptr.h" #include "components/feed/core/v2/public/feed_stream_api.h" #include "components/keyed_service/core/keyed_service.h" +#include "components/web_resource/eula_accepted_notifier.h" + +namespace base { +class SequencedTaskRunner; +} +namespace network { +class SharedURLLoaderFactory; +} +namespace signin { +class IdentityManager; +} namespace feed { +class RefreshTaskScheduler; +class FeedNetwork; class FeedService : public KeyedService { public: + class Delegate { + public: + virtual ~Delegate() = default; + // Returns a string which represents the top locale and region of the + // device. + virtual std::string GetLanguageTag() = 0; + }; + + // Construct a FeedService given an already constructed FeedStreamApi. + // Used for testing only. explicit FeedService(std::unique_ptr<FeedStreamApi> stream); + + // Construct a new FeedStreamApi along with FeedService. + FeedService(std::unique_ptr<Delegate> delegate, + std::unique_ptr<RefreshTaskScheduler> refresh_task_scheduler, + PrefService* profile_prefs, + PrefService* local_state, + signin::IdentityManager* identity_manager, + scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory, + scoped_refptr<base::SequencedTaskRunner> background_task_runner, + const std::string& api_key); ~FeedService() override; + FeedService(const FeedService&) = delete; + FeedService& operator=(const FeedService&) = delete; FeedStreamApi* GetStream() { return stream_.get(); } private: + class StreamDelegateImpl; + class NetworkDelegateImpl; + + // These components are owned for construction of |FeedStreamApi|. These will + // be null if |FeedStreamApi| is created externally. + std::unique_ptr<Delegate> delegate_; + std::unique_ptr<StreamDelegateImpl> stream_delegate_; + std::unique_ptr<NetworkDelegateImpl> network_delegate_; + std::unique_ptr<FeedNetwork> feed_network_; + std::unique_ptr<RefreshTaskScheduler> refresh_task_scheduler_; + std::unique_ptr<FeedStreamApi> stream_; };
diff --git a/components/feed/core/v2/refresh_task_scheduler.h b/components/feed/core/v2/refresh_task_scheduler.h index 2128614..6f27dd571 100644 --- a/components/feed/core/v2/refresh_task_scheduler.h +++ b/components/feed/core/v2/refresh_task_scheduler.h
@@ -15,6 +15,7 @@ class RefreshTaskScheduler { public: RefreshTaskScheduler() = default; + virtual ~RefreshTaskScheduler() = default; // Schedules the task if it is not yet scheduled, or if the scheduling // period changes.
diff --git a/components/omnibox/browser/omnibox_field_trial.cc b/components/omnibox/browser/omnibox_field_trial.cc index 7a60bc52..3db6a7f 100644 --- a/components/omnibox/browser/omnibox_field_trial.cc +++ b/components/omnibox/browser/omnibox_field_trial.cc
@@ -27,7 +27,7 @@ #include "components/variations/hashing.h" #include "components/variations/variations_associated_data.h" #include "third_party/metrics_proto/omnibox_event.pb.h" -#include "ui/base/material_design/material_design_controller.h" +#include "ui/base/pointer/touch_ui_controller.h" using metrics::OmniboxEventProto; @@ -608,7 +608,7 @@ } // Touch-optimized UI always swaps title and URL. - if (ui::MaterialDesignController::GetInstance()->touch_ui()) + if (ui::TouchUiController::Get()->touch_ui()) return EMPHASIZE_WHEN_NONEMPTY; // Look up the parameter named kEmphasizeTitlesRule + "_" + input.type(),
diff --git a/components/page_load_metrics/browser/observers/use_counter/ukm_features.cc b/components/page_load_metrics/browser/observers/use_counter/ukm_features.cc index 457bb0a7..d09ac97f 100644 --- a/components/page_load_metrics/browser/observers/use_counter/ukm_features.cc +++ b/components/page_load_metrics/browser/observers/use_counter/ukm_features.cc
@@ -147,8 +147,6 @@ WebFeature::kWebBluetoothRequestScan, WebFeature:: kV8VideoPlaybackQuality_CorruptedVideoFrames_AttributeGetter, - WebFeature::kInputTypeCheckboxRenderedNonSquare, - WebFeature::kInputTypeRadioRenderedNonSquare, WebFeature::kV8MediaSession_Metadata_AttributeSetter, WebFeature::kV8MediaSession_SetActionHandler_Method, WebFeature::kLargeStickyAd,
diff --git a/components/policy/resources/policy_templates.json b/components/policy/resources/policy_templates.json index d33346d..79d0ac8 100644 --- a/components/policy/resources/policy_templates.json +++ b/components/policy/resources/policy_templates.json
@@ -16941,12 +16941,13 @@ 'dynamic_refresh': True, 'per_profile': True, }, - 'supported_on': ['chrome.*:79-', 'chrome_os:79-'], + 'supported_on': ['chrome.*:82-', 'chrome_os:82-'], 'future': True, 'caption': '''Enables <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> extension installation requests''', 'example_value': True, 'desc': '''This policy controls <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> extension installation requests which allows users to send the requests to the Google Admin console for approval. + When policy CloudReportingEnabled is left unset or set to disabled, this policy will be ignored, extension installation requests are not created or uploaded. When this policy is left unset or set to disabled, extension installation requests are not created or uploaded. When this policy is set to enabled, extension installation requests are created and uploaded to Google Admin console.
diff --git a/components/safe_browsing/content/web_ui/safe_browsing_ui.cc b/components/safe_browsing/content/web_ui/safe_browsing_ui.cc index 1043ca8b..5bdee5f 100644 --- a/components/safe_browsing/content/web_ui/safe_browsing_ui.cc +++ b/components/safe_browsing/content/web_ui/safe_browsing_ui.cc
@@ -32,7 +32,9 @@ #include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/safe_browsing/core/features.h" #include "components/safe_browsing/core/proto/csd.pb.h" +#if BUILDFLAG(FULL_SAFE_BROWSING) #include "components/safe_browsing/core/proto/webprotect.pb.h" +#endif #include "components/safe_browsing/core/realtime/policy_engine.h" #include "components/safe_browsing/core/web_ui/constants.h" #include "components/strings/grit/components_strings.h" @@ -247,6 +249,7 @@ std::vector<base::Value>().swap(reporting_events_); } +#if BUILDFLAG(FULL_SAFE_BROWSING) int WebUIInfoSingleton::AddToDeepScanRequests( const DeepScanningClientRequest& request) { if (!HasListener()) @@ -278,7 +281,7 @@ std::map<std::string, std::pair<std::string, DeepScanningClientResponse>>() .swap(deep_scan_responses_); } - +#endif void WebUIInfoSingleton::RegisterWebUIInstance(SafeBrowsingUIHandler* webui) { webui_instances_.push_back(webui); } @@ -326,8 +329,11 @@ ClearPGPings(); ClearRTLookupPings(); ClearLogMessages(); - ClearDeepScans(); ClearReportingEvents(); + +#if BUILDFLAG(FULL_SAFE_BROWSING) + ClearDeepScans(); +#endif } } @@ -1283,6 +1289,7 @@ return std::move(result); } +#if BUILDFLAG(FULL_SAFE_BROWSING) std::string SerializeDeepScanningRequest( const DeepScanningClientRequest& request) { base::DictionaryValue request_dict; @@ -1436,7 +1443,7 @@ serializer.Serialize(response_dict); return response_serialized; } - +#endif } // namespace SafeBrowsingUI::SafeBrowsingUI(content::WebUI* web_ui) @@ -1814,6 +1821,7 @@ ResolveJavascriptCallback(base::Value(callback_id), messages_received); } +#if BUILDFLAG(FULL_SAFE_BROWSING) void SafeBrowsingUIHandler::GetDeepScanRequests(const base::ListValue* args) { const std::vector<DeepScanningClientRequest>& requests = WebUIInfoSingleton::GetInstance()->deep_scan_requests(); @@ -1858,7 +1866,7 @@ args->GetString(0, &callback_id); ResolveJavascriptCallback(base::Value(callback_id), responses_sent); } - +#endif void SafeBrowsingUIHandler::NotifyClientDownloadRequestJsListener( ClientDownloadRequest* client_download_request) { AllowJavascript(); @@ -1951,6 +1959,7 @@ FireWebUIListener("reporting-events-update", SerializeReportingEvent(event)); } +#if BUILDFLAG(FULL_SAFE_BROWSING) void SafeBrowsingUIHandler::NotifyDeepScanRequestJsListener( const DeepScanningClientRequest& request) { base::ListValue request_list; @@ -1973,6 +1982,7 @@ AllowJavascript(); FireWebUIListener("deep-scan-response-update", response_list); } +#endif void SafeBrowsingUIHandler::RegisterMessages() { web_ui()->RegisterMessageCallback( @@ -2044,6 +2054,7 @@ "getReportingEvents", base::BindRepeating(&SafeBrowsingUIHandler::GetReportingEvents, base::Unretained(this))); +#if BUILDFLAG(FULL_SAFE_BROWSING) web_ui()->RegisterMessageCallback( "getDeepScanRequests", base::BindRepeating(&SafeBrowsingUIHandler::GetDeepScanRequests, @@ -2052,6 +2063,7 @@ "getDeepScanResponses", base::BindRepeating(&SafeBrowsingUIHandler::GetDeepScanResponses, base::Unretained(this))); +#endif } void SafeBrowsingUIHandler::SetWebUIForTesting(content::WebUI* web_ui) {
diff --git a/components/safe_browsing/content/web_ui/safe_browsing_ui.h b/components/safe_browsing/content/web_ui/safe_browsing_ui.h index 5dfaba1..7107b11 100644 --- a/components/safe_browsing/content/web_ui/safe_browsing_ui.h +++ b/components/safe_browsing/content/web_ui/safe_browsing_ui.h
@@ -7,10 +7,10 @@ #include "base/bind.h" #include "base/macros.h" +#include "components/safe_browsing/buildflags.h" #include "components/safe_browsing/core/browser/safe_browsing_network_context.h" #include "components/safe_browsing/core/proto/csd.pb.h" #include "components/safe_browsing/core/proto/realtimeapi.pb.h" -#include "components/safe_browsing/core/proto/webprotect.pb.h" #include "components/safe_browsing/core/proto/webui.pb.h" #include "components/sync/protocol/user_event_specifics.pb.h" #include "content/public/browser/web_ui_controller.h" @@ -20,6 +20,10 @@ #include "services/network/public/mojom/cookie_manager.mojom.h" #include "services/network/public/mojom/network_context.mojom.h" +#if BUILDFLAG(FULL_SAFE_BROWSING) +#include "components/safe_browsing/core/proto/webprotect.pb.h" +#endif + namespace base { class ListValue; template <typename T> @@ -108,6 +112,7 @@ // currently open chrome://safe-browsing tab was opened. void GetReportingEvents(const base::ListValue* args); +#if BUILDFLAG(FULL_SAFE_BROWSING) // Get the deep scanning requests that have been collected since the oldest // currently open chrome://safe-browsing tab was opened. void GetDeepScanRequests(const base::ListValue* args); @@ -115,7 +120,7 @@ // Get the deep scanning responses that have been collected since the oldest // currently open chrome://safe-browsing tab was opened. void GetDeepScanResponses(const base::ListValue* args); - +#endif // Register callbacks for WebUI messages. void RegisterMessages() override; @@ -176,6 +181,7 @@ // are open. void NotifyReportingEventJsListener(const base::Value& event); +#if BUILDFLAG(FULL_SAFE_BROWSING) // Called when any new deep scan requests are sent while one or more WebUI // tabs are open. void NotifyDeepScanRequestJsListener( @@ -187,7 +193,7 @@ const std::string& token, const std::string& status, const DeepScanningClientResponse& response); - +#endif // Callback when the CookieManager has returned the cookie. void OnGetCookie(const std::string& callback_id, const std::vector<net::CanonicalCookie>& cookies); @@ -298,6 +304,7 @@ // Clear |reporting_events_|. void ClearReportingEvents(); +#if BUILDFLAG(FULL_SAFE_BROWSING) // Add the new request to |deep_scan_requests_| and send it to all the open // chrome://safe-browsing tabs. Returns a token that can be used in // |AddToDeepScanResponses| to correlate a ping and response. @@ -311,7 +318,7 @@ // Clear the list of deep scan requests and responses. void ClearDeepScans(); - +#endif // Register the new WebUI listener object. void RegisterWebUIInstance(SafeBrowsingUIHandler* webui); @@ -381,6 +388,7 @@ return rt_lookup_responses_; } +#if BUILDFLAG(FULL_SAFE_BROWSING) // Get the list of deep scanning requests since the oldest currently open // chrome://safe-browsing tab was opened. const std::vector<DeepScanningClientRequest>& deep_scan_requests() const { @@ -394,6 +402,7 @@ deep_scan_responses() const { return deep_scan_responses_; } +#endif ReferrerChainProvider* referrer_chain_provider() { return referrer_chain_provider_; @@ -488,6 +497,7 @@ // chrome://safe-browsing tab was opened. std::vector<base::Value> reporting_events_; +#if BUILDFLAG(FULL_SAFE_BROWSING) // List of deep scan requests sent since the oldest currently open // chrome://safe-browsing tab was opened. std::vector<DeepScanningClientRequest> deep_scan_requests_; @@ -496,6 +506,7 @@ // chrome://safe-browsing tab was opened. std::map<std::string, std::pair<std::string, DeepScanningClientResponse>> deep_scan_responses_; +#endif // The current referrer chain provider, if any. Can be nullptr. ReferrerChainProvider* referrer_chain_provider_ = nullptr;
diff --git a/components/safe_browsing/core/realtime/policy_engine.cc b/components/safe_browsing/core/realtime/policy_engine.cc index 5f3eaf9..d5a1b8bb 100644 --- a/components/safe_browsing/core/realtime/policy_engine.cc +++ b/components/safe_browsing/core/realtime/policy_engine.cc
@@ -56,7 +56,9 @@ // static bool RealTimePolicyEngine::IsUserOptedIn(PrefService* pref_service) { return pref_service->GetBoolean( - unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled); + unified_consent::prefs:: + kUrlKeyedAnonymizedDataCollectionEnabled) || + IsEnhancedProtectionEnabled(*pref_service); } // static @@ -90,6 +92,9 @@ return false; } + if (IsEnhancedProtectionEnabled(*pref_service)) { + return true; + } // |sync_service| can be null in Incognito, and also be set to null by a // cmdline param. if (!sync_service) {
diff --git a/components/safe_browsing/core/realtime/policy_engine.h b/components/safe_browsing/core/realtime/policy_engine.h index 0d67144..21980625 100644 --- a/components/safe_browsing/core/realtime/policy_engine.h +++ b/components/safe_browsing/core/realtime/policy_engine.h
@@ -62,7 +62,7 @@ // Is the feature to perform real-time URL lookup enabled? static bool IsUrlLookupEnabled(); - // Is user opted-in to the feature? + // Whether the user has opted-in to MBB or Enhanced Protection. static bool IsUserOptedIn(PrefService* pref_service); // Is the feature enabled due to enterprise policy?
diff --git a/components/safe_browsing/core/realtime/policy_engine_unittest.cc b/components/safe_browsing/core/realtime/policy_engine_unittest.cc index 6a8b1cbc..ccd051d 100644 --- a/components/safe_browsing/core/realtime/policy_engine_unittest.cc +++ b/components/safe_browsing/core/realtime/policy_engine_unittest.cc
@@ -152,6 +152,15 @@ } TEST_F(RealTimePolicyEngineTest, + TestCanPerformFullURLLookup_EnhancedProtection) { + base::test::ScopedFeatureList feature_list; + pref_service_.SetBoolean(prefs::kSafeBrowsingEnhanced, true); + ASSERT_FALSE(IsUserOptedIn()); + feature_list.InitAndEnableFeature(kEnhancedProtection); + ASSERT_TRUE(IsUserOptedIn()); +} + +TEST_F(RealTimePolicyEngineTest, TestCanPerformFullURLLookupWithToken_SyncControlled) { base::test::ScopedFeatureList feature_list; #if defined(OS_ANDROID) @@ -182,11 +191,6 @@ EXPECT_FALSE(CanPerformFullURLLookupWithToken(/* is_off_the_record */ false, &sync_service)); - // Sync is enabled. - sync_service.SetDisableReasons({}); - sync_service.SetTransportState(syncer::SyncService::TransportState::ACTIVE); - EXPECT_TRUE(CanPerformFullURLLookupWithToken(/* is_off_the_record */ false, - &sync_service)); // History sync is disabled. sync_service.GetUserSettings()->SetSelectedTypes( @@ -203,6 +207,43 @@ } TEST_F(RealTimePolicyEngineTest, + TestCanPerformFullURLLookupWithToken_EnhancedProtection) { + base::test::ScopedFeatureList feature_list; +#if defined(OS_ANDROID) + int system_memory_size = base::SysInfo::AmountOfPhysicalMemoryMB(); + int memory_size_lower_threshold = system_memory_size - 1; + feature_list.InitWithFeaturesAndParameters( + /* enabled_features */ {{kRealTimeUrlLookupEnabled, + {{kRealTimeUrlLookupMemoryLowerThresholdMb, + base::NumberToString( + memory_size_lower_threshold)}}}, + {kRealTimeUrlLookupEnabledWithToken, {}}, + {kEnhancedProtection, {}}}, + /* disabled_features */ {}); +#else + feature_list.InitWithFeatures( + /* enabled_features */ {kRealTimeUrlLookupEnabled, + kRealTimeUrlLookupEnabledWithToken, + kEnhancedProtection}, + /* disabled_features */ {}); +#endif + syncer::TestSyncService sync_service; + // Only enhanced protection is on. + pref_service_.SetBoolean(prefs::kSafeBrowsingEnhanced, true); + EXPECT_TRUE(CanPerformFullURLLookupWithToken(/* is_off_the_record */ false, + &sync_service)); + + // Sync and history sync is disabled but enhanced protection is enabled. + sync_service.SetDisableReasons( + {syncer::SyncService::DISABLE_REASON_USER_CHOICE}); + sync_service.SetTransportState(syncer::SyncService::TransportState::DISABLED); + sync_service.GetUserSettings()->SetSelectedTypes( + /* sync_everything */ false, {}); + EXPECT_TRUE(CanPerformFullURLLookupWithToken(/*is_off_the_record=*/false, + &sync_service)); +} + +TEST_F(RealTimePolicyEngineTest, TestCanPerformFullURLLookup_EnabledMainFrameOnly) { for (int i = 0; i <= static_cast<int>(ResourceType::kMaxValue); i++) { ResourceType resource_type = static_cast<ResourceType>(i);
diff --git a/components/sessions/core/command_storage_manager_test_helper.cc b/components/sessions/core/command_storage_manager_test_helper.cc index 1c94214..3b225fe8 100644 --- a/components/sessions/core/command_storage_manager_test_helper.cc +++ b/components/sessions/core/command_storage_manager_test_helper.cc
@@ -25,9 +25,9 @@ void CommandStorageManagerTestHelper::RunTaskOnBackendThread( const base::Location& from_here, - const base::Closure& task) { - command_storage_manager_->backend_task_runner_->PostNonNestableTask(from_here, - task); + base::OnceClosure task) { + command_storage_manager_->backend_task_runner_->PostNonNestableTask( + from_here, std::move(task)); } bool CommandStorageManagerTestHelper::ProcessedAnyCommands() {
diff --git a/components/sessions/core/command_storage_manager_test_helper.h b/components/sessions/core/command_storage_manager_test_helper.h index c9914fd9..577ceb3 100644 --- a/components/sessions/core/command_storage_manager_test_helper.h +++ b/components/sessions/core/command_storage_manager_test_helper.h
@@ -25,7 +25,7 @@ // This posts the task to the SequencedWorkerPool, or run immediately // if the SequencedWorkerPool has been shutdown. void RunTaskOnBackendThread(const base::Location& from_here, - const base::Closure& task); + base::OnceClosure task); // Returns true if any commands got processed yet - saved or queued. bool ProcessedAnyCommands();
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn index e10cad9..962d24e 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn
@@ -43,7 +43,7 @@ deps = [ "//base", "//base:base_static", - "//base:clang_coverage_buildflags", + "//base:clang_profiling_buildflags", "//base/third_party/dynamic_annotations", "//build:branding_buildflags", "//cc",
diff --git a/content/browser/browser_process_sub_thread.cc b/content/browser/browser_process_sub_thread.cc index 70dd877..f7c731e 100644 --- a/content/browser/browser_process_sub_thread.cc +++ b/content/browser/browser_process_sub_thread.cc
@@ -5,7 +5,7 @@ #include "content/browser/browser_process_sub_thread.h" #include "base/bind.h" -#include "base/clang_coverage_buildflags.h" +#include "base/clang_profiling_buildflags.h" #include "base/compiler_specific.h" #include "base/debug/alias.h" #include "base/metrics/histogram_macros.h" @@ -162,8 +162,8 @@ service_manager::SandboxType::kNetwork) { // This ensures that cookies and cache are flushed to disk on shutdown. // https://crbug.com/841001 -#if BUILDFLAG(CLANG_COVERAGE) - // On coverage build, browser_tests runs 10x slower. +#if BUILDFLAG(CLANG_PROFILING) + // On profiling build, browser_tests runs 10x slower. const int kMaxSecondsToWaitForNetworkProcess = 100; #elif defined(OS_CHROMEOS) // ChromeOS will kill the browser process if it doesn't shut down within
diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc index 757a82d..57d627b 100644 --- a/content/browser/child_process_launcher.cc +++ b/content/browser/child_process_launcher.cc
@@ -7,7 +7,7 @@ #include <utility> #include "base/bind.h" -#include "base/clang_coverage_buildflags.h" +#include "base/clang_profiling_buildflags.h" #include "base/command_line.h" #include "base/files/file_util.h" #include "base/i18n/icu_util.h" @@ -43,7 +43,7 @@ start_time_(base::TimeTicks::Now()), #if defined(ADDRESS_SANITIZER) || defined(LEAK_SANITIZER) || \ defined(MEMORY_SANITIZER) || defined(THREAD_SANITIZER) || \ - defined(UNDEFINED_SANITIZER) || BUILDFLAG(CLANG_COVERAGE) + defined(UNDEFINED_SANITIZER) || BUILDFLAG(CLANG_PROFILING) terminate_child_on_shutdown_(false) #else terminate_child_on_shutdown_(terminate_on_shutdown)
diff --git a/content/browser/child_process_task_port_provider_mac_unittest.cc b/content/browser/child_process_task_port_provider_mac_unittest.cc index 3f0c02d2..ed599f76 100644 --- a/content/browser/child_process_task_port_provider_mac_unittest.cc +++ b/content/browser/child_process_task_port_provider_mac_unittest.cc
@@ -8,7 +8,7 @@ #include <vector> -#include "base/clang_coverage_buildflags.h" +#include "base/clang_profiling_buildflags.h" #include "base/mac/scoped_mach_port.h" #include "base/synchronization/waitable_event.h" #include "base/task/post_task.h" @@ -35,8 +35,8 @@ #if BUILDFLAG(IPC_MESSAGE_LOG_ENABLED) MOCK_METHOD1(SetIPCLoggingEnabled, void(bool)); #endif -#if BUILDFLAG(CLANG_COVERAGE_INSIDE_SANDBOX) - MOCK_METHOD1(SetCoverageFile, void(base::File)); +#if BUILDFLAG(CLANG_PROFILING_INSIDE_SANDBOX) + MOCK_METHOD1(SetProfilingFile, void(base::File)); #endif MOCK_METHOD1(GetBackgroundTracingAgentProvider, void(mojo::PendingReceiver<
diff --git a/content/browser/frame_host/render_frame_host_feature_policy_unittest.cc b/content/browser/frame_host/render_frame_host_feature_policy_unittest.cc index 70d94c11..2fdfc52 100644 --- a/content/browser/frame_host/render_frame_host_feature_policy_unittest.cc +++ b/content/browser/frame_host/render_frame_host_feature_policy_unittest.cc
@@ -33,8 +33,6 @@ blink::mojom::FeaturePolicyFeature::kDocumentWrite; static const blink::mojom::FeaturePolicyFeature kDefaultSelfFeature = blink::mojom::FeaturePolicyFeature::kGeolocation; - static const blink::mojom::FeaturePolicyFeature kParameterizedFeature = - blink::mojom::FeaturePolicyFeature::kOversizedImages; const blink::PolicyValue sample_double_value = blink::PolicyValue(2.5, blink::mojom::PolicyValueType::kDecDouble); @@ -95,10 +93,6 @@ const std::map<std::string, blink::PolicyValue>& values) { blink::ParsedFeaturePolicy result(1); result[0].feature = feature; - if (feature == kParameterizedFeature) { - result[0].fallback_value = min_double_value; - result[0].opaque_value = min_double_value; - } for (auto const& value : values) result[0].values.insert(std::pair<url::Origin, blink::PolicyValue>( url::Origin::Create(GURL(value.first)), value.second)); @@ -112,10 +106,8 @@ EXPECT_TRUE(parent->IsFeatureEnabled(kDefaultEnabledFeature)); EXPECT_TRUE(parent->IsFeatureEnabled(kDefaultSelfFeature)); - EXPECT_TRUE(parent->IsFeatureEnabled(kParameterizedFeature)); EXPECT_TRUE(child->IsFeatureEnabled(kDefaultEnabledFeature)); EXPECT_FALSE(child->IsFeatureEnabled(kDefaultSelfFeature)); - EXPECT_TRUE(child->IsFeatureEnabled(kParameterizedFeature)); } TEST_F(RenderFrameHostFeaturePolicyTest, HeaderPolicy) { @@ -203,114 +195,4 @@ EXPECT_FALSE(child->IsFeatureEnabled(kDefaultSelfFeature)); } -TEST_F(RenderFrameHostFeaturePolicyTest, ParameterizedHeaderPolicy) { - RenderFrameHost* parent = GetMainRFH(kOrigin1); - - blink::PolicyValue large_double_value( - 3.5, blink::mojom::PolicyValueType::kDecDouble); - // Enable the feature for the child in the parent frame. - RefreshPageAndSetHeaderPolicy(&parent, kParameterizedFeature, - {{std::string(kOrigin1), sample_double_value}, - {std::string(kOrigin2), sample_double_value}}); - - // Create the child. - RenderFrameHost* child = AddChildRFH(parent, kOrigin2); - - EXPECT_TRUE( - parent->IsFeatureEnabled(kParameterizedFeature, sample_double_value)); - EXPECT_FALSE( - parent->IsFeatureEnabled(kParameterizedFeature, large_double_value)); - EXPECT_TRUE( - child->IsFeatureEnabled(kParameterizedFeature, sample_double_value)); - EXPECT_FALSE( - child->IsFeatureEnabled(kParameterizedFeature, large_double_value)); - - // Set an empty allowlist and in the child to test that the policies combine - // correctly. Child frame should be enabled since the feature default is - // enabled for all. - RefreshPageAndSetHeaderPolicy(&child, kDefaultSelfFeature, - std::map<std::string, blink::PolicyValue>()); - EXPECT_TRUE( - child->IsFeatureEnabled(kParameterizedFeature, sample_double_value)); - - // disable the feature in the child. - RefreshPageAndSetHeaderPolicy(&child, kParameterizedFeature, - {{std::string(kOrigin2), min_double_value}}); - EXPECT_TRUE(child->IsFeatureEnabled(kParameterizedFeature, min_double_value)); - EXPECT_FALSE( - child->IsFeatureEnabled(kParameterizedFeature, sample_double_value)); - - // Navigate the child. Check that the feature is disabled. - SimulateNavigation(&child, GURL(kOrigin3)); - EXPECT_FALSE( - child->IsFeatureEnabled(kParameterizedFeature, sample_double_value)); -} - -TEST_F(RenderFrameHostFeaturePolicyTest, ParameterizedContainerPolicy) { - RenderFrameHost* parent = GetMainRFH(kOrigin1); - RenderFrameHost* child = AddChildRFH(parent, kOrigin2); - - // Set a container policy on origin 3 to give it the feature. It should not - // be enabled because container policy will only take effect after navigation. - SetContainerPolicy(parent, child, kParameterizedFeature, - {{std::string(kOrigin2), sample_double_value}, - {std::string(kOrigin3), sample_double_value}}); - blink::PolicyValue large_double_value( - 3.0, blink::mojom::PolicyValueType::kDecDouble); - EXPECT_TRUE( - child->IsFeatureEnabled(kParameterizedFeature, large_double_value)); - - // Navigate the child so that the container policy takes effect. - SimulateNavigation(&child, GURL(kOrigin3)); - EXPECT_FALSE( - child->IsFeatureEnabled(kParameterizedFeature, large_double_value)); - EXPECT_TRUE( - child->IsFeatureEnabled(kParameterizedFeature, sample_double_value)); - - // Navigate the child again, the feature should be disabled by container - // policy. - SimulateNavigation(&child, GURL(kOrigin4)); - EXPECT_FALSE( - child->IsFeatureEnabled(kParameterizedFeature, sample_double_value)); -} - -TEST_F(RenderFrameHostFeaturePolicyTest, - ParameterizedHeaderAndContainerPolicy) { - RenderFrameHost* parent = GetMainRFH(kOrigin1); - - // Set a header policy and container policy. Check that they both take effect. - RefreshPageAndSetHeaderPolicy(&parent, kParameterizedFeature, - {{std::string(kOrigin1), sample_double_value}, - {std::string(kOrigin2), sample_double_value}}); - - RenderFrameHost* child = AddChildRFH(parent, kOrigin2); - SetContainerPolicy(parent, child, kParameterizedFeature, - {{std::string(kOrigin3), sample_double_value}}); - - // The feature should be enabled in kOrigin2, kOrigin3 but not kOrigin4. - EXPECT_TRUE( - child->IsFeatureEnabled(kParameterizedFeature, sample_double_value)); - SimulateNavigation(&child, GURL(kOrigin3)); - EXPECT_TRUE( - child->IsFeatureEnabled(kParameterizedFeature, sample_double_value)); - SimulateNavigation(&child, GURL(kOrigin4)); - EXPECT_FALSE( - child->IsFeatureEnabled(kParameterizedFeature, sample_double_value)); - - // Change the header policy to turn off the feature. It should be disabled in - // all children. - RefreshPageAndSetHeaderPolicy(&parent, kParameterizedFeature, - std::map<std::string, blink::PolicyValue>()); - child = AddChildRFH(parent, kOrigin2); - SetContainerPolicy(parent, child, kParameterizedFeature, - {{std::string(kOrigin3), sample_double_value}}); - - SimulateNavigation(&child, GURL(kOrigin2)); - EXPECT_FALSE( - child->IsFeatureEnabled(kParameterizedFeature, sample_double_value)); - SimulateNavigation(&child, GURL(kOrigin3)); - EXPECT_FALSE( - child->IsFeatureEnabled(kParameterizedFeature, sample_double_value)); -} - } // namespace content
diff --git a/content/browser/native_file_system/file_system_chooser_browsertest.cc b/content/browser/native_file_system/file_system_chooser_browsertest.cc index 04a85ff..b92c29d 100644 --- a/content/browser/native_file_system/file_system_chooser_browsertest.cc +++ b/content/browser/native_file_system/file_system_chooser_browsertest.cc
@@ -172,8 +172,8 @@ EXPECT_EQ(int{file_contents.size()}, EvalJs(shell(), JsReplace("(async () => {" - " const w = await self.entry.createWriter();" - " await w.write(0, new Blob([$1]));" + " const w = await self.entry.createWritable();" + " await w.write(new Blob([$1]));" " await w.close();" " return (await self.entry.getFile()).size; })()", file_contents)));
diff --git a/content/browser/native_file_system/native_file_system_file_writer_impl_browsertest.cc b/content/browser/native_file_system/native_file_system_file_writer_impl_browsertest.cc index ea6ba71..a337f59 100644 --- a/content/browser/native_file_system/native_file_system_file_writer_impl_browsertest.cc +++ b/content/browser/native_file_system/native_file_system_file_writer_impl_browsertest.cc
@@ -125,8 +125,8 @@ EXPECT_EQ(0, EvalJs(shell(), JsReplace("(async () => {" - " const w = await self.entry.createWriter();" - " await w.write(0, new Blob([$1]));" + " const w = await self.entry.createWritable();" + " await w.write(new Blob([$1]));" " self.writer = w;" " return (await self.entry.getFile()).size; })()", file_contents))); @@ -166,7 +166,7 @@ EXPECT_EQ(nullptr, EvalJs(shell(), "(async () => {" - " const w = await self.entry.createWriter({" + " const w = await self.entry.createWritable({" " keepExistingData: true });" " self.writer = w;" "})()")); @@ -181,7 +181,7 @@ EXPECT_EQ(int{expected_contents.size()}, EvalJs(shell(), "(async () => {" - " await self.writer.write(0, new Blob(['bar']));" + " await self.writer.write(new Blob(['bar']));" " await self.writer.close();" " return (await self.entry.getFile()).size; })()")); { @@ -201,7 +201,7 @@ EXPECT_EQ(nullptr, EvalJs(shell(), "(async () => {" - " const w = await self.entry.createWriter({" + " const w = await self.entry.createWritable({" " keepExistingData: false });" " self.writer = w;" "})()")); @@ -216,7 +216,7 @@ EXPECT_EQ(int{expected_contents.size()}, EvalJs(shell(), "(async () => {" - " await self.writer.write(0, new Blob(['bar']));" + " await self.writer.write(new Blob(['bar']));" " await self.writer.close();" " return (await self.entry.getFile()).size; })()")); { @@ -236,7 +236,7 @@ for (int index = 0; index < num_writers; index++) { EXPECT_EQ(nullptr, EvalJs(shell(), "(async () => {" - " const w = await self.entry.createWriter();" + " const w = await self.entry.createWritable();" " self.writers.push(w);" "})()")); } @@ -266,7 +266,7 @@ EvalJs(shell(), JsReplace("(async () => {" " for(let i = 0; i < $1; i++ ) {" - " self.writers.push(self.entry.createWriter());" + " self.writers.push(self.entry.createWritable());" " }" " await Promise.all(self.writers);" "})()", @@ -301,7 +301,7 @@ EXPECT_EQ(nullptr, EvalJs(shell(), "(async () => {" - " const w = await self.entry.createWriter(" + " const w = await self.entry.createWritable(" " {keepExistingData: true}," " );" " self.writer = w;"
diff --git a/content/browser/renderer_host/cursor_manager.cc b/content/browser/renderer_host/cursor_manager.cc index 6d5ec95..e339bc85 100644 --- a/content/browser/renderer_host/cursor_manager.cc +++ b/content/browser/renderer_host/cursor_manager.cc
@@ -44,9 +44,8 @@ // ignored. SetTooltipTextForView(view_under_cursor_, base::string16()); view_under_cursor_ = view; - WebCursor cursor; + WebCursor cursor(ui::mojom::CursorType::kPointer); - // If no UpdateCursor has been received for this view, use an empty cursor. auto it = cursor_map_.find(view); if (it != cursor_map_.end()) cursor = it->second;
diff --git a/content/browser/renderer_host/cursor_manager_unittest.cc b/content/browser/renderer_host/cursor_manager_unittest.cc index 11d20fd9..527915d 100644 --- a/content/browser/renderer_host/cursor_manager_unittest.cc +++ b/content/browser/renderer_host/cursor_manager_unittest.cc
@@ -10,7 +10,6 @@ #include "content/browser/renderer_host/render_widget_host_impl.h" #include "content/browser/renderer_host/render_widget_host_view_base.h" #include "content/common/cursors/webcursor.h" -#include "content/public/common/cursor_info.h" #include "content/public/test/browser_task_environment.h" #include "content/public/test/mock_render_process_host.h" #include "content/public/test/test_browser_context.h" @@ -19,6 +18,7 @@ #include "content/test/test_render_view_host.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/cursor/cursor.h" #include "ui/base/mojom/cursor_type.mojom-shared.h" // CursorManager is only instantiated on Aura and Mac. @@ -135,8 +135,7 @@ // The view should be using the default cursor. EXPECT_EQ(top_view_->cursor(), WebCursor()); - CursorInfo cursor_info(ui::mojom::CursorType::kHand); - WebCursor cursor_hand(cursor_info); + WebCursor cursor_hand(ui::mojom::CursorType::kHand); // Update the view with a non-default cursor. top_view_->GetCursorManager()->UpdateCursor(top_view_, cursor_hand); @@ -152,8 +151,7 @@ std::unique_ptr<MockRenderWidgetHostViewForCursors> child_view( new MockRenderWidgetHostViewForCursors(widget_host.get(), false)); - CursorInfo cursor_info(ui::mojom::CursorType::kHand); - WebCursor cursor_hand(cursor_info); + WebCursor cursor_hand(ui::mojom::CursorType::kHand); // Set the child frame's cursor to a hand. This should not propagate to the // top-level view without the mouse moving over the child frame. @@ -180,14 +178,11 @@ std::unique_ptr<MockRenderWidgetHostViewForCursors> child_view2( new MockRenderWidgetHostViewForCursors(widget_host2.get(), false)); - CursorInfo cursor_info_hand(ui::mojom::CursorType::kHand); - WebCursor cursor_hand(cursor_info_hand); + WebCursor cursor_hand(ui::mojom::CursorType::kHand); - CursorInfo cursor_info_cross(ui::mojom::CursorType::kCross); - WebCursor cursor_cross(cursor_info_cross); + WebCursor cursor_cross(ui::mojom::CursorType::kCross); - CursorInfo cursor_info_pointer(ui::mojom::CursorType::kPointer); - WebCursor cursor_pointer(cursor_info_pointer); + WebCursor cursor_pointer(ui::mojom::CursorType::kPointer); // Initialize each View to a different cursor. top_view_->GetCursorManager()->UpdateCursor(top_view_, cursor_hand);
diff --git a/content/browser/renderer_host/input/touch_emulator.cc b/content/browser/renderer_host/input/touch_emulator.cc index 5b3efd44..a3d242d 100644 --- a/content/browser/renderer_host/input/touch_emulator.cc +++ b/content/browser/renderer_host/input/touch_emulator.cc
@@ -16,6 +16,7 @@ #include "content/public/common/content_switches.h" #include "third_party/blink/public/common/input/web_keyboard_event.h" #include "third_party/blink/public/common/input/web_mouse_event.h" +#include "ui/base/cursor/cursor.h" #include "ui/base/mojom/cursor_type.mojom-shared.h" #include "ui/base/ui_base_types.h" #include "ui/events/base_event_utils.h" @@ -158,7 +159,7 @@ use_2x ? IDR_DEVTOOLS_PINCH_CURSOR_ICON_2X : IDR_DEVTOOLS_PINCH_CURSOR_ICON); - pointer_cursor_ = WebCursor(CursorInfo(ui::mojom::CursorType::kPointer)); + pointer_cursor_ = WebCursor(ui::mojom::CursorType::kPointer); return true; } @@ -166,12 +167,11 @@ WebCursor* cursor, float scale, int resource_id) { gfx::Image& cursor_image = content::GetContentClient()->GetNativeImageNamed(resource_id); - CursorInfo cursor_info; - cursor_info.type = ui::mojom::CursorType::kCustom; - cursor_info.image_scale_factor = scale; - cursor_info.custom_image = cursor_image.AsBitmap(); - cursor_info.hotspot = - gfx::Point(cursor_image.Width() / 2, cursor_image.Height() / 2); + ui::Cursor cursor_info(ui::mojom::CursorType::kCustom); + cursor_info.set_image_scale_factor(scale); + cursor_info.set_custom_bitmap(cursor_image.AsBitmap()); + cursor_info.set_custom_hotspot( + gfx::Point(cursor_image.Width() / 2, cursor_image.Height() / 2)); *cursor = WebCursor(cursor_info); return gfx::ScaleSize(gfx::SizeF(cursor_image.Size()), 1.f / scale);
diff --git a/content/browser/renderer_host/input/touch_emulator_unittest.cc b/content/browser/renderer_host/input/touch_emulator_unittest.cc index 308a78a..ddd5441 100644 --- a/content/browser/renderer_host/input/touch_emulator_unittest.cc +++ b/content/browser/renderer_host/input/touch_emulator_unittest.cc
@@ -15,6 +15,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/public/common/input/web_keyboard_event.h" #include "third_party/blink/public/common/input/web_mouse_wheel_event.h" +#include "ui/base/cursor/cursor.h" #include "ui/base/ui_base_types.h" #include "ui/events/blink/web_input_event_traits.h" @@ -251,7 +252,7 @@ void DisableSynchronousTouchAck() { ack_touches_synchronously_ = false; } - float GetCursorScaleFactor() { return cursor_.info().image_scale_factor; } + float GetCursorScaleFactor() { return cursor_.cursor().image_scale_factor(); } private: base::test::SingleThreadTaskEnvironment task_environment_;
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index c725561..ceb94cf 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -19,7 +19,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback.h" -#include "base/clang_coverage_buildflags.h" +#include "base/clang_profiling_buildflags.h" #include "base/command_line.h" #include "base/containers/adapters.h" #include "base/debug/alias.h" @@ -293,8 +293,8 @@ #include "services/service_manager/zygote/common/zygote_handle.h" // nogncheck #endif -#if BUILDFLAG(CLANG_COVERAGE_INSIDE_SANDBOX) -#include "content/common/coverage_utils.h" +#if BUILDFLAG(CLANG_PROFILING_INSIDE_SANDBOX) +#include "content/common/profiling_utils.h" #endif namespace content { @@ -3580,8 +3580,8 @@ child_process_->SetIPCLoggingEnabled(IPC::Logging::GetInstance()->Enabled()); #endif -#if BUILDFLAG(CLANG_COVERAGE_INSIDE_SANDBOX) - child_process_->SetCoverageFile(OpenCoverageFile()); +#if BUILDFLAG(CLANG_PROFILING_INSIDE_SANDBOX) + child_process_->SetProfilingFile(OpenProfilingFile()); #endif }
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc index 8696fa50..51d09ae 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -1637,8 +1637,8 @@ } } -void RenderWidgetHostImpl::SetCursor(const CursorInfo& cursor_info) { - SetCursor(WebCursor(cursor_info)); +void RenderWidgetHostImpl::SetCursor(const ui::Cursor& cursor) { + SetCursor(WebCursor(cursor)); } RenderProcessHost::Priority RenderWidgetHostImpl::GetPriority() {
diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h index def0dde..5c9ddfc 100644 --- a/content/browser/renderer_host/render_widget_host_impl.h +++ b/content/browser/renderer_host/render_widget_host_impl.h
@@ -259,7 +259,7 @@ blink::WebDragOperation operation) override; void DragSourceSystemDragEnded() override; void FilterDropData(DropData* drop_data) override; - void SetCursor(const CursorInfo& cursor_info) override; + void SetCursor(const ui::Cursor& cursor) override; // RenderProcessHostImpl::PriorityClient implementation. RenderProcessHost::Priority GetPriority() override;
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc index 462db07..f95785f 100644 --- a/content/browser/renderer_host/render_widget_host_view_android.cc +++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -84,6 +84,8 @@ #include "ui/android/view_android_observer.h" #include "ui/android/window_android.h" #include "ui/android/window_android_compositor.h" +#include "ui/base/cursor/cursor.h" +#include "ui/base/cursor/cursor_lookup.h" #include "ui/base/layout.h" #include "ui/base/ui_base_types.h" #include "ui/events/android/gesture_event_android.h" @@ -681,10 +683,10 @@ return window->mouse_wheel_scroll_factor() / view_.GetDipScale(); } -void RenderWidgetHostViewAndroid::UpdateCursor(const WebCursor& cursor) { - const CursorInfo& info = cursor.info(); - view_.OnCursorChanged(static_cast<int>(info.type), info.custom_image, - info.hotspot); +void RenderWidgetHostViewAndroid::UpdateCursor(const WebCursor& webcursor) { + const ui::Cursor& cursor = webcursor.cursor(); + view_.OnCursorChanged(static_cast<int>(cursor.type()), + GetCursorBitmap(cursor), GetCursorHotspot(cursor)); } void RenderWidgetHostViewAndroid::SetIsLoading(bool is_loading) {
diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc index 40e7591..83348e3 100644 --- a/content/browser/site_per_process_browsertest.cc +++ b/content/browser/site_per_process_browsertest.cc
@@ -504,12 +504,6 @@ : blink::PolicyValue::CreateMinPolicyValue(feature_type); declaration.opaque_value = declaration.fallback_value; - if (feature == blink::mojom::FeaturePolicyFeature::kOversizedImages && - !matches_all) { - declaration.fallback_value.SetDoubleValue(2.0); - declaration.opaque_value.SetDoubleValue(2.0); - } - for (const auto& origin : origins) declaration.values.insert(std::pair<url::Origin, blink::PolicyValue>( url::Origin::Create(origin), @@ -8783,7 +8777,7 @@ FrameTreeNode* root = web_contents()->GetFrameTree()->root(); EXPECT_EQ(CreateParsedFeaturePolicy( {blink::mojom::FeaturePolicyFeature::kGeolocation, - blink::mojom::FeaturePolicyFeature::kOversizedImages}, + blink::mojom::FeaturePolicyFeature::kPayment}, {start_url.GetOrigin()}), root->current_replication_state().feature_policy_header); @@ -8792,7 +8786,7 @@ EXPECT_TRUE(NavigateToURL(shell(), first_nav_url)); EXPECT_EQ(CreateParsedFeaturePolicyMatchesAll( {blink::mojom::FeaturePolicyFeature::kGeolocation, - blink::mojom::FeaturePolicyFeature::kOversizedImages}), + blink::mojom::FeaturePolicyFeature::kPayment}), root->current_replication_state().feature_policy_header); // When the main frame navigates to a page without a policy, the replicated @@ -8814,7 +8808,7 @@ FrameTreeNode* root = web_contents()->GetFrameTree()->root(); EXPECT_EQ(CreateParsedFeaturePolicy( {blink::mojom::FeaturePolicyFeature::kGeolocation, - blink::mojom::FeaturePolicyFeature::kOversizedImages}, + blink::mojom::FeaturePolicyFeature::kPayment}, {start_url.GetOrigin()}), root->current_replication_state().feature_policy_header); @@ -8823,7 +8817,7 @@ EXPECT_TRUE(NavigateToURL(shell(), first_nav_url)); EXPECT_EQ(CreateParsedFeaturePolicyMatchesAll( {blink::mojom::FeaturePolicyFeature::kGeolocation, - blink::mojom::FeaturePolicyFeature::kOversizedImages}), + blink::mojom::FeaturePolicyFeature::kPayment}), root->current_replication_state().feature_policy_header); // When the main frame navigates to a page without a policy, the replicated @@ -8847,14 +8841,14 @@ FrameTreeNode* root = web_contents()->GetFrameTree()->root(); EXPECT_EQ(CreateParsedFeaturePolicy( {blink::mojom::FeaturePolicyFeature::kGeolocation, - blink::mojom::FeaturePolicyFeature::kOversizedImages}, + blink::mojom::FeaturePolicyFeature::kPayment}, {main_url.GetOrigin(), GURL("http://example.com/")}), root->current_replication_state().feature_policy_header); EXPECT_EQ(1UL, root->child_count()); EXPECT_EQ( CreateParsedFeaturePolicy( {blink::mojom::FeaturePolicyFeature::kGeolocation, - blink::mojom::FeaturePolicyFeature::kOversizedImages}, + blink::mojom::FeaturePolicyFeature::kPayment}, {main_url.GetOrigin()}), root->child_at(0)->current_replication_state().feature_policy_header); @@ -8863,7 +8857,7 @@ EXPECT_EQ( CreateParsedFeaturePolicyMatchesAll( {blink::mojom::FeaturePolicyFeature::kGeolocation, - blink::mojom::FeaturePolicyFeature::kOversizedImages}), + blink::mojom::FeaturePolicyFeature::kPayment}), root->child_at(0)->current_replication_state().feature_policy_header); // Navigate the iframe to another location, this one with no policy header @@ -8877,7 +8871,7 @@ EXPECT_EQ( CreateParsedFeaturePolicyMatchesAll( {blink::mojom::FeaturePolicyFeature::kGeolocation, - blink::mojom::FeaturePolicyFeature::kOversizedImages}), + blink::mojom::FeaturePolicyFeature::kPayment}), root->child_at(0)->current_replication_state().feature_policy_header); } @@ -8908,7 +8902,7 @@ EXPECT_EQ( CreateParsedFeaturePolicyMatchesAll( {blink::mojom::FeaturePolicyFeature::kGeolocation, - blink::mojom::FeaturePolicyFeature::kOversizedImages}), + blink::mojom::FeaturePolicyFeature::kPayment}), root->child_at(1)->current_replication_state().feature_policy_header); EXPECT_EQ(1UL, root->child_at(1)->child_count());
diff --git a/content/browser/site_per_process_hit_test_browsertest.cc b/content/browser/site_per_process_hit_test_browsertest.cc index bdfcffa..e420211 100644 --- a/content/browser/site_per_process_hit_test_browsertest.cc +++ b/content/browser/site_per_process_hit_test_browsertest.cc
@@ -43,6 +43,7 @@ #include "content/test/mock_overscroll_observer.h" #include "third_party/blink/public/common/features.h" #include "third_party/blink/public/mojom/frame/user_activation_update_types.mojom.h" +#include "ui/base/cursor/cursor.h" #include "ui/base/mojom/cursor_type.mojom-shared.h" #include "ui/display/display_switches.h" #include "ui/events/base_event_utils.h" @@ -4239,7 +4240,7 @@ EXPECT_TRUE( root_view->GetCursorManager()->GetCursorForTesting(child_view, cursor)); // Since this moused over a text box, this should not be the default cursor. - EXPECT_EQ(cursor.info().type, ui::mojom::CursorType::kIBeam); + EXPECT_EQ(cursor.cursor().type(), ui::mojom::CursorType::kIBeam); } } // namespace
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc index ff4fd59..2b5e6c8 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -193,6 +193,11 @@ const int kMinimumDelayBetweenLoadingUpdatesMS = 100; const char kDotGoogleDotCom[] = ".google.com"; +// TODO(crbug.com/1059903): Clean up after the initial investigation. +constexpr base::Feature kCheckWebContentsAccessFromNonCurrentFrame{ + "CheckWebContentsAccessFromNonCurrentFrame", + base::FEATURE_DISABLED_BY_DEFAULT}; + base::LazyInstance<std::vector< WebContentsImpl::FriendWrapper::CreatedCallback>>::DestructorAtExit g_created_callbacks = LAZY_INSTANCE_INITIALIZER; @@ -368,6 +373,11 @@ WebContents* WebContents::FromRenderFrameHost(RenderFrameHost* rfh) { if (!rfh) return nullptr; + if (!rfh->IsCurrent() && base::FeatureList::IsEnabled( + kCheckWebContentsAccessFromNonCurrentFrame)) { + // TODO(crbug.com/1059903): return nullptr here eventually. + base::debug::DumpWithoutCrashing(); + } return static_cast<RenderFrameHostImpl*>(rfh)->delegate()->GetAsWebContents(); }
diff --git a/content/child/child_thread_impl.cc b/content/child/child_thread_impl.cc index 921dcd8..36574e6 100644 --- a/content/child/child_thread_impl.cc +++ b/content/child/child_thread_impl.cc
@@ -10,7 +10,7 @@ #include "base/base_switches.h" #include "base/bind.h" -#include "base/clang_coverage_buildflags.h" +#include "base/clang_profiling_buildflags.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/debug/alias.h" @@ -84,7 +84,7 @@ #include "base/mac/mach_port_rendezvous.h" #endif -#if BUILDFLAG(CLANG_COVERAGE_INSIDE_SANDBOX) +#if BUILDFLAG(CLANG_PROFILING_INSIDE_SANDBOX) #include <stdio.h> #if defined(OS_WIN) #include <io.h> @@ -372,8 +372,8 @@ weak_main_thread_, std::move(receiver))); } -#if BUILDFLAG(CLANG_COVERAGE_INSIDE_SANDBOX) - void SetCoverageFile(base::File file) override { +#if BUILDFLAG(CLANG_PROFILING_INSIDE_SANDBOX) + void SetProfilingFile(base::File file) override { // TODO(crbug.com/985574) Remove Android check when possible. #if defined(OS_POSIX) && !defined(OS_ANDROID) // Take the file descriptor so that |file| does not close it.
diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc index 7331d23..e134f6f 100644 --- a/content/child/runtime_features.cc +++ b/content/child/runtime_features.cc
@@ -525,6 +525,9 @@ blink::features::kNativeFileSystemAPI.name, base::FeatureList::OVERRIDE_ENABLE_FEATURE)) { WebRuntimeFeatures::EnableFeatureFromString("NativeFileSystem", true); + WebRuntimeFeatures::EnableFeatureFromString( + "CloneableNativeFileSystemHandles", true); + WebRuntimeFeatures::EnableFeatureFromString("WritableFileStream", true); } if (base::FeatureList::IsEnabled(blink::features::kNativeFileSystemAPI) && base::FeatureList::IsEnabled(blink::features::kFileHandlingAPI)) {
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn index 35eb5cde..af7b2f3 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn
@@ -411,10 +411,10 @@ deps += [ "//third_party/fuchsia-sdk/sdk/pkg/fdio" ] } - if (use_clang_coverage_inside_sandbox) { + if (use_clang_profiling_inside_sandbox) { sources += [ - "coverage_utils.cc", - "coverage_utils.h", + "profiling_utils.cc", + "profiling_utils.h", ] } } @@ -476,8 +476,8 @@ if (is_linux || is_chromeos) { enabled_features += [ "supports_thread_priorities" ] } - if (use_clang_coverage_inside_sandbox) { - enabled_features += [ "clang_coverage_inside_sandbox" ] + if (use_clang_profiling_inside_sandbox) { + enabled_features += [ "clang_profiling_inside_sandbox" ] } import_dirs = [ "//mojo/services" ]
diff --git a/content/common/child_process.mojom b/content/common/child_process.mojom index b981e6a..d85e2810 100644 --- a/content/common/child_process.mojom +++ b/content/common/child_process.mojom
@@ -91,7 +91,8 @@ // depends on the process type and potentially on the Content embedder. BindReceiver(mojo_base.mojom.GenericPendingReceiver receiver); - // Sets the coverage file for the child process. - [EnableIf=clang_coverage_inside_sandbox] - SetCoverageFile(mojo_base.mojom.File file); + // Sets the profiling file for the child process. + // Used for the coverage builds. + [EnableIf=clang_profiling_inside_sandbox] + SetProfilingFile(mojo_base.mojom.File file); };
diff --git a/content/common/child_process_host_impl.cc b/content/common/child_process_host_impl.cc index 5543ebf..06f21f0 100644 --- a/content/common/child_process_host_impl.cc +++ b/content/common/child_process_host_impl.cc
@@ -7,7 +7,7 @@ #include <limits> #include "base/atomic_sequence_num.h" -#include "base/clang_coverage_buildflags.h" +#include "base/clang_profiling_buildflags.h" #include "base/command_line.h" #include "base/files/file.h" #include "base/files/file_path.h" @@ -42,8 +42,8 @@ #include "content/common/mac_helpers.h" #endif // OS_LINUX -#if BUILDFLAG(CLANG_COVERAGE_INSIDE_SANDBOX) -#include "content/common/coverage_utils.h" +#if BUILDFLAG(CLANG_PROFILING_INSIDE_SANDBOX) +#include "content/common/profiling_utils.h" #endif namespace { @@ -207,8 +207,8 @@ child_process_->SetIPCLoggingEnabled(enabled); #endif -#if BUILDFLAG(CLANG_COVERAGE_INSIDE_SANDBOX) - child_process_->SetCoverageFile(OpenCoverageFile()); +#if BUILDFLAG(CLANG_PROFILING_INSIDE_SANDBOX) + child_process_->SetProfilingFile(OpenProfilingFile()); #endif opening_channel_ = true;
diff --git a/content/common/common_param_traits_unittest.cc b/content/common/common_param_traits_unittest.cc index 3a2f65a0..0d234b4 100644 --- a/content/common/common_param_traits_unittest.cc +++ b/content/common/common_param_traits_unittest.cc
@@ -27,6 +27,7 @@ #include "printing/page_range.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/cursor/cursor.h" #include "ui/base/mojom/cursor_type.mojom-shared.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/ipc/gfx_param_traits.h" @@ -270,11 +271,13 @@ } TEST(IPCMessageTest, WebCursor) { - content::CursorInfo info(ui::mojom::CursorType::kCustom); - info.custom_image.allocN32Pixels(32, 32); - info.hotspot = gfx::Point(10, 20); - info.image_scale_factor = 1.5f; - content::WebCursor input(info); + ui::Cursor cursor(ui::mojom::CursorType::kCustom); + SkBitmap bitmap; + bitmap.allocN32Pixels(32, 32); + cursor.set_custom_bitmap(bitmap); + cursor.set_custom_hotspot(gfx::Point(10, 20)); + cursor.set_image_scale_factor(1.5f); + content::WebCursor input(cursor); IPC::Message msg(1, 2, IPC::Message::PRIORITY_NORMAL); IPC::ParamTraits<content::WebCursor>::Write(&msg, input);
diff --git a/content/common/content_param_traits.cc b/content/common/content_param_traits.cc index 93a2822..f0b3209 100644 --- a/content/common/content_param_traits.cc +++ b/content/common/content_param_traits.cc
@@ -25,6 +25,7 @@ #include "third_party/blink/public/mojom/feature_policy/policy_value.mojom.h" #include "third_party/blink/public/mojom/messaging/transferable_message.mojom.h" #include "ui/accessibility/ax_mode.h" +#include "ui/base/cursor/cursor.h" #include "ui/base/mojom/cursor_type.mojom-shared.h" #include "ui/gfx/ipc/skia/gfx_skia_param_traits.h" @@ -32,29 +33,38 @@ void ParamTraits<content::WebCursor>::Write(base::Pickle* m, const param_type& p) { - WriteParam(m, p.info().type); - if (p.info().type == ui::mojom::CursorType::kCustom) { - WriteParam(m, p.info().hotspot); - WriteParam(m, p.info().image_scale_factor); - WriteParam(m, p.info().custom_image); + WriteParam(m, p.cursor().type()); + if (p.cursor().type() == ui::mojom::CursorType::kCustom) { + WriteParam(m, p.cursor().custom_hotspot()); + WriteParam(m, p.cursor().image_scale_factor()); + WriteParam(m, p.cursor().custom_bitmap()); } } bool ParamTraits<content::WebCursor>::Read(const base::Pickle* m, base::PickleIterator* iter, param_type* r) { - content::CursorInfo info; - if (!ReadParam(m, iter, &info.type)) + ui::mojom::CursorType type; + if (!ReadParam(m, iter, &type)) return false; - if (info.type == ui::mojom::CursorType::kCustom && - (!ReadParam(m, iter, &info.hotspot) || - !ReadParam(m, iter, &info.image_scale_factor) || - !ReadParam(m, iter, &info.custom_image))) { - return false; + ui::Cursor cursor(type); + if (cursor.type() == ui::mojom::CursorType::kCustom) { + gfx::Point hotspot; + float image_scale_factor; + SkBitmap bitmap; + if (!ReadParam(m, iter, &hotspot) || + !ReadParam(m, iter, &image_scale_factor) || + !ReadParam(m, iter, &bitmap)) { + return false; + } + + cursor.set_custom_hotspot(hotspot); + cursor.set_image_scale_factor(image_scale_factor); + cursor.set_custom_bitmap(bitmap); } - return r->SetInfo(info); + return r->SetCursor(cursor); } void ParamTraits<content::WebCursor>::Log(const param_type& p, std::string* l) {
diff --git a/content/common/content_param_traits_macros.h b/content/common/content_param_traits_macros.h index 846c5d0..0e38351 100644 --- a/content/common/content_param_traits_macros.h +++ b/content/common/content_param_traits_macros.h
@@ -39,8 +39,9 @@ network::mojom::ContentSecurityPolicySource::kMaxValue) IPC_ENUM_TRAITS_MAX_VALUE(network::mojom::ContentSecurityPolicyType, network::mojom::ContentSecurityPolicyType::kMaxValue) -IPC_ENUM_TRAITS_MAX_VALUE(ui::mojom::CursorType, - ui::mojom::CursorType::kMaxValue) +IPC_ENUM_TRAITS_MIN_MAX_VALUE(ui::mojom::CursorType, + ui::mojom::CursorType::kNull, + ui::mojom::CursorType::kMaxValue) IPC_ENUM_TRAITS_MIN_MAX_VALUE(blink::WebInputEvent::Type, blink::WebInputEvent::kTypeFirst, blink::WebInputEvent::kTypeLast)
diff --git a/content/common/cursors/webcursor.cc b/content/common/cursors/webcursor.cc index 58ad253..ada5f75 100644 --- a/content/common/cursors/webcursor.cc +++ b/content/common/cursors/webcursor.cc
@@ -18,8 +18,8 @@ CleanupPlatformData(); } -WebCursor::WebCursor(const CursorInfo& info) { - SetInfo(info); +WebCursor::WebCursor(const ui::Cursor& cursor) { + SetCursor(cursor); } WebCursor::WebCursor(const WebCursor& other) { @@ -32,33 +32,37 @@ return *this; } -bool WebCursor::SetInfo(const CursorInfo& info) { +bool WebCursor::SetCursor(const ui::Cursor& cursor) { static constexpr int kMaxSize = 1024; - if (info.image_scale_factor < 0.01f || info.image_scale_factor > 100.f || - (info.type == ui::mojom::CursorType::kCustom && - (info.custom_image.width() > kMaxSize || - info.custom_image.height() > kMaxSize || - info.custom_image.width() / info.image_scale_factor > kMaxSize || - info.custom_image.height() / info.image_scale_factor > kMaxSize))) { + if (cursor.image_scale_factor() < 0.01f || + cursor.image_scale_factor() > 100.f || + (cursor.type() == ui::mojom::CursorType::kCustom && + (cursor.custom_bitmap().width() > kMaxSize || + cursor.custom_bitmap().height() > kMaxSize || + cursor.custom_bitmap().width() / cursor.image_scale_factor() > + kMaxSize || + cursor.custom_bitmap().height() / cursor.image_scale_factor() > + kMaxSize))) { return false; } CleanupPlatformData(); - info_ = info; + cursor_ = cursor; // Clamp the hotspot to the custom image's dimensions. - if (info_.type == ui::mojom::CursorType::kCustom) { - info_.hotspot.set_x(std::max( - 0, std::min(info_.custom_image.width() - 1, info_.hotspot.x()))); - info_.hotspot.set_y(std::max( - 0, std::min(info_.custom_image.height() - 1, info_.hotspot.y()))); + if (cursor_.type() == ui::mojom::CursorType::kCustom) { + cursor_.set_custom_hotspot( + gfx::Point(std::max(0, std::min(cursor_.custom_bitmap().width() - 1, + cursor_.custom_hotspot().x())), + std::max(0, std::min(cursor_.custom_bitmap().height() - 1, + cursor_.custom_hotspot().y())))); } return true; } bool WebCursor::operator==(const WebCursor& other) const { - return info_ == other.info_ && + return cursor_ == other.cursor_ && #if defined(USE_AURA) || defined(USE_OZONE) rotation_ == other.rotation_ && #endif @@ -70,7 +74,7 @@ } void WebCursor::CopyAllData(const WebCursor& other) { - SetInfo(other.info_); + SetCursor(other.cursor_); CopyPlatformData(other); }
diff --git a/content/common/cursors/webcursor.h b/content/common/cursors/webcursor.h index a4693a7..6ae0aa5f 100644 --- a/content/common/cursors/webcursor.h +++ b/content/common/cursors/webcursor.h
@@ -9,7 +9,7 @@ #include "build/build_config.h" #include "content/common/content_export.h" -#include "content/public/common/cursor_info.h" +#include "ui/base/cursor/cursor.h" #include "ui/display/display.h" #include "ui/gfx/geometry/point.h" #include "ui/gfx/geometry/size.h" @@ -30,15 +30,15 @@ class CONTENT_EXPORT WebCursor { public: WebCursor(); - explicit WebCursor(const CursorInfo& info); + explicit WebCursor(const ui::Cursor& info); explicit WebCursor(const WebCursor& other); WebCursor& operator=(const WebCursor& other); ~WebCursor(); - const CursorInfo& info() const { return info_; } + const ui::Cursor& cursor() const { return cursor_; } - // Sets the cursor |info|; returns whether the struct has reasonable values. - bool SetInfo(const CursorInfo& info); + // Sets the ui::Cursor |cursor|; returns whether it has reasonable values. + bool SetCursor(const ui::Cursor& cursor); // Equality operator; performs bitmap content comparison as needed. bool operator==(const WebCursor& other) const; @@ -76,7 +76,7 @@ float GetCursorScaleFactor(SkBitmap* bitmap); // The basic cursor info. - CursorInfo info_; + ui::Cursor cursor_; #if defined(USE_AURA) || defined(USE_OZONE) // Only used for custom cursors.
diff --git a/content/common/cursors/webcursor_aura.cc b/content/common/cursors/webcursor_aura.cc index 35eb18e..f979945 100644 --- a/content/common/cursors/webcursor_aura.cc +++ b/content/common/cursors/webcursor_aura.cc
@@ -12,7 +12,7 @@ namespace content { gfx::NativeCursor WebCursor::GetNativeCursor() { - if (info_.type == ui::mojom::CursorType::kCustom) { + if (cursor_.type() == ui::mojom::CursorType::kCustom) { if (!custom_cursor_) { custom_cursor_.emplace(ui::mojom::CursorType::kCustom); SkBitmap bitmap; @@ -26,14 +26,15 @@ } return *custom_cursor_; } - return info_.type; + return cursor_.type(); } void WebCursor::CreateScaledBitmapAndHotspotFromCustomData(SkBitmap* bitmap, gfx::Point* hotspot, float* scale) { - *bitmap = info_.custom_image; - *hotspot = info_.hotspot; + DCHECK_EQ(ui::mojom::CursorType::kCustom, cursor_.type()); + *bitmap = cursor_.custom_bitmap(); + *hotspot = cursor_.custom_hotspot(); *scale = GetCursorScaleFactor(bitmap); ui::ScaleAndRotateCursorBitmapAndHotpoint(*scale, rotation_, bitmap, hotspot); } @@ -51,8 +52,8 @@ // ozone also has extra calculations for scale factor (taking max cursor size // into account). float WebCursor::GetCursorScaleFactor(SkBitmap* bitmap) { - DCHECK_NE(0, info_.image_scale_factor); - return device_scale_factor_ / info_.image_scale_factor; + DCHECK_NE(0, cursor_.image_scale_factor()); + return device_scale_factor_ / cursor_.image_scale_factor(); } #endif
diff --git a/content/common/cursors/webcursor_aurawin.cc b/content/common/cursors/webcursor_aurawin.cc index f8f484e..f70096e 100644 --- a/content/common/cursors/webcursor_aurawin.cc +++ b/content/common/cursors/webcursor_aurawin.cc
@@ -13,7 +13,7 @@ namespace content { ui::PlatformCursor WebCursor::GetPlatformCursor(const ui::Cursor& cursor) { - if (info_.type != ui::mojom::CursorType::kCustom) + if (cursor_.type() != ui::mojom::CursorType::kCustom) return LoadCursor(nullptr, IDC_ARROW); if (platform_cursor_)
diff --git a/content/common/cursors/webcursor_mac.mm b/content/common/cursors/webcursor_mac.mm index 97a754bd..792cde4 100644 --- a/content/common/cursors/webcursor_mac.mm +++ b/content/common/cursors/webcursor_mac.mm
@@ -13,6 +13,7 @@ #include "content/public/common/content_client.h" #include "skia/ext/skia_utils_mac.h" #include "third_party/blink/public/platform/web_size.h" +#include "ui/base/cursor/cursor.h" #include "ui/base/mojom/cursor_type.mojom-shared.h" #include "ui/gfx/geometry/point_conversions.h" #include "ui/gfx/geometry/size_conversions.h" @@ -125,9 +126,10 @@ return LoadCursor(resource_id, hotspot_x, hotspot_y); } -NSCursor* CreateCustomCursor(const content::CursorInfo& info) { - float custom_scale = info.image_scale_factor; - gfx::Size custom_size(info.custom_image.width(), info.custom_image.height()); +NSCursor* CreateCustomCursor(const ui::Cursor& cursor) { + float custom_scale = cursor.image_scale_factor(); + gfx::Size custom_size(cursor.custom_bitmap().width(), + cursor.custom_bitmap().height()); // Convert from pixels to view units. if (custom_scale == 0) @@ -135,19 +137,20 @@ NSSize dip_size = NSSizeFromCGSize( gfx::ScaleToFlooredSize(custom_size, 1 / custom_scale).ToCGSize()); NSPoint dip_hotspot = NSPointFromCGPoint( - gfx::ScaleToFlooredPoint(info.hotspot, 1 / custom_scale).ToCGPoint()); + gfx::ScaleToFlooredPoint(cursor.custom_hotspot(), 1 / custom_scale) + .ToCGPoint()); // Both the image and its representation need to have the same size for // cursors to appear in high resolution on retina displays. Note that the // size of a representation is not the same as pixelsWide or pixelsHigh. - NSImage* cursor_image = skia::SkBitmapToNSImage(info.custom_image); + NSImage* cursor_image = skia::SkBitmapToNSImage(cursor.custom_bitmap()); [cursor_image setSize:dip_size]; [[[cursor_image representations] objectAtIndex:0] setSize:dip_size]; - NSCursor* cursor = [[NSCursor alloc] initWithImage:cursor_image - hotSpot:dip_hotspot]; + NSCursor* nscursor = [[NSCursor alloc] initWithImage:cursor_image + hotSpot:dip_hotspot]; - return [cursor autorelease]; + return [nscursor autorelease]; } } // namespace @@ -156,7 +159,7 @@ // Match Safari's cursor choices; see platform/mac/CursorMac.mm . gfx::NativeCursor WebCursor::GetNativeCursor() { - switch (info_.type) { + switch (cursor_.type()) { case ui::mojom::CursorType::kPointer: return [NSCursor arrowCursor]; case ui::mojom::CursorType::kCross: @@ -262,7 +265,7 @@ case ui::mojom::CursorType::kGrabbing: return [NSCursor closedHandCursor]; case ui::mojom::CursorType::kCustom: - return CreateCustomCursor(info_); + return CreateCustomCursor(cursor_); case ui::mojom::CursorType::kNull: case ui::mojom::CursorType::kDndNone: case ui::mojom::CursorType::kDndMove:
diff --git a/content/common/cursors/webcursor_ozone.cc b/content/common/cursors/webcursor_ozone.cc index 324765d..1f3644b 100644 --- a/content/common/cursors/webcursor_ozone.cc +++ b/content/common/cursors/webcursor_ozone.cc
@@ -47,7 +47,7 @@ DCHECK_LT(0, maximum_cursor_size_.width()); DCHECK_LT(0, maximum_cursor_size_.height()); return std::min( - {device_scale_factor_ / info_.image_scale_factor, + {device_scale_factor_ / cursor_.image_scale_factor(), static_cast<float>(maximum_cursor_size_.width()) / bitmap->width(), static_cast<float>(maximum_cursor_size_.height()) / bitmap->height()}); }
diff --git a/content/common/cursors/webcursor_unittest.cc b/content/common/cursors/webcursor_unittest.cc index 4887ddb7..2cbd51dc 100644 --- a/content/common/cursors/webcursor_unittest.cc +++ b/content/common/cursors/webcursor_unittest.cc
@@ -8,6 +8,7 @@ #include "content/common/cursors/webcursor.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/cursor/cursor.h" #include "ui/base/cursor/cursor_lookup.h" #include "ui/base/mojom/cursor_type.mojom-shared.h" @@ -27,46 +28,46 @@ } TEST(WebCursorTest, DefaultConstructor) { - WebCursor cursor; - EXPECT_EQ(ui::mojom::CursorType::kPointer, cursor.info().type); - EXPECT_TRUE(cursor.info().custom_image.isNull()); - EXPECT_TRUE(cursor.info().hotspot.IsOrigin()); - EXPECT_EQ(1.f, cursor.info().image_scale_factor); + WebCursor webcursor; + EXPECT_EQ(ui::mojom::CursorType::kNull, webcursor.cursor().type()); + EXPECT_TRUE(webcursor.cursor().custom_bitmap().isNull()); + EXPECT_TRUE(webcursor.cursor().custom_hotspot().IsOrigin()); + EXPECT_EQ(1.f, webcursor.cursor().image_scale_factor()); } -TEST(WebCursorTest, CursorInfoConstructor) { - CursorInfo info(ui::mojom::CursorType::kHand); - WebCursor cursor(info); - EXPECT_EQ(info, cursor.info()); +TEST(WebCursorTest, WebCursorCursorConstructor) { + ui::Cursor cursor(ui::mojom::CursorType::kHand); + WebCursor webcursor(cursor); + EXPECT_EQ(cursor, webcursor.cursor()); } -TEST(WebCursorTest, CursorInfoConstructorCustom) { - CursorInfo info(ui::mojom::CursorType::kCustom); - info.custom_image = CreateTestBitmap(32, 32); - info.hotspot = gfx::Point(10, 20); - info.image_scale_factor = 2.f; - WebCursor cursor(info); - EXPECT_EQ(info, cursor.info()); +TEST(WebCursorTest, WebCursorCursorConstructorCustom) { + ui::Cursor cursor(ui::mojom::CursorType::kCustom); + cursor.set_custom_bitmap(CreateTestBitmap(32, 32)); + cursor.set_custom_hotspot(gfx::Point(10, 20)); + cursor.set_image_scale_factor(2.f); + WebCursor webcursor(cursor); + EXPECT_EQ(cursor, webcursor.cursor()); #if defined(USE_AURA) // Test if the custom cursor is correctly cached and updated // on aura platform. - gfx::NativeCursor native_cursor = cursor.GetNativeCursor(); + gfx::NativeCursor native_cursor = webcursor.GetNativeCursor(); EXPECT_EQ(gfx::Point(5, 10), GetCursorHotspot(native_cursor)); - EXPECT_TRUE(cursor.has_custom_cursor_for_test()); - cursor.SetInfo(info); - EXPECT_FALSE(cursor.has_custom_cursor_for_test()); - cursor.GetNativeCursor(); - EXPECT_TRUE(cursor.has_custom_cursor_for_test()); + EXPECT_TRUE(webcursor.has_custom_cursor_for_test()); + webcursor.SetCursor(cursor); + EXPECT_FALSE(webcursor.has_custom_cursor_for_test()); + webcursor.GetNativeCursor(); + EXPECT_TRUE(webcursor.has_custom_cursor_for_test()); #if defined(USE_OZONE) // Test if the rotating custom cursor works correctly. display::Display display; display.set_panel_rotation(display::Display::ROTATE_90); - cursor.SetDisplayInfo(display); - EXPECT_FALSE(cursor.has_custom_cursor_for_test()); - native_cursor = cursor.GetNativeCursor(); - EXPECT_TRUE(cursor.has_custom_cursor_for_test()); + webcursor.SetDisplayInfo(display); + EXPECT_FALSE(webcursor.has_custom_cursor_for_test()); + native_cursor = webcursor.GetNativeCursor(); + EXPECT_TRUE(webcursor.has_custom_cursor_for_test()); // Hotspot should be scaled & rotated. We're using the icon created for 2.0, // on the display with dsf=1.0, so the host spot should be // ((32 - 20) / 2, 10 / 2) = (6, 5). @@ -76,112 +77,110 @@ } TEST(WebCursorTest, CopyConstructorType) { - CursorInfo info(ui::mojom::CursorType::kHand); - WebCursor cursor(info); - WebCursor copy(cursor); - EXPECT_EQ(cursor, copy); + ui::Cursor cursor(ui::mojom::CursorType::kHand); + WebCursor webcursor(cursor); + WebCursor copy(webcursor); + EXPECT_EQ(webcursor, copy); } TEST(WebCursorTest, CopyConstructorCustom) { - CursorInfo info(ui::mojom::CursorType::kCustom); - info.custom_image = CreateTestBitmap(32, 32); - info.hotspot = gfx::Point(10, 20); - info.image_scale_factor = 1.5f; - WebCursor cursor(info); - WebCursor copy(cursor); - EXPECT_EQ(cursor, copy); + ui::Cursor cursor(ui::mojom::CursorType::kCustom); + cursor.set_custom_bitmap(CreateTestBitmap(32, 32)); + cursor.set_custom_hotspot(gfx::Point(10, 20)); + cursor.set_image_scale_factor(1.5f); + WebCursor webcursor(cursor); + WebCursor copy(webcursor); + EXPECT_EQ(webcursor, copy); } TEST(WebCursorTest, ClampHotspot) { // Initialize a cursor with an invalid hotspot; it should be clamped. - CursorInfo info(ui::mojom::CursorType::kCustom); - info.hotspot = gfx::Point(100, 100); - info.custom_image = CreateTestBitmap(5, 7); - WebCursor cursor(info); - EXPECT_EQ(gfx::Point(4, 6), cursor.info().hotspot); - // SetInfo should also clamp the hotspot. - EXPECT_TRUE(cursor.SetInfo(info)); - EXPECT_EQ(gfx::Point(4, 6), cursor.info().hotspot); + ui::Cursor cursor(ui::mojom::CursorType::kCustom); + cursor.set_custom_hotspot(gfx::Point(100, 100)); + cursor.set_custom_bitmap(CreateTestBitmap(5, 7)); + WebCursor webcursor(cursor); + EXPECT_EQ(gfx::Point(4, 6), webcursor.cursor().custom_hotspot()); + // SetCursor should also clamp the hotspot. + EXPECT_TRUE(webcursor.SetCursor(cursor)); + EXPECT_EQ(gfx::Point(4, 6), webcursor.cursor().custom_hotspot()); } -TEST(WebCursorTest, SetInfo) { - WebCursor cursor; - EXPECT_TRUE(cursor.SetInfo(CursorInfo())); - EXPECT_TRUE(cursor.SetInfo(CursorInfo(ui::mojom::CursorType::kHand))); - EXPECT_TRUE(cursor.SetInfo(CursorInfo(ui::mojom::CursorType::kCustom))); +TEST(WebCursorTest, SetCursor) { + WebCursor webcursor; + EXPECT_TRUE(webcursor.SetCursor(ui::Cursor())); + EXPECT_TRUE(webcursor.SetCursor(ui::Cursor(ui::mojom::CursorType::kHand))); + EXPECT_TRUE(webcursor.SetCursor(ui::Cursor(ui::mojom::CursorType::kCustom))); - CursorInfo info(ui::mojom::CursorType::kCustom); - info.custom_image = CreateTestBitmap(32, 32); - info.hotspot = gfx::Point(10, 20); - info.image_scale_factor = 1.5f; - EXPECT_TRUE(cursor.SetInfo(info)); + ui::Cursor cursor(ui::mojom::CursorType::kCustom); + cursor.set_custom_bitmap(CreateTestBitmap(32, 32)); + cursor.set_custom_hotspot(gfx::Point(10, 20)); + cursor.set_image_scale_factor(1.5f); + EXPECT_TRUE(webcursor.SetCursor(cursor)); - // SetInfo should return false when the scale factor is too small. - info.image_scale_factor = 0.001f; - EXPECT_FALSE(cursor.SetInfo(info)); + // SetCursor should return false when the scale factor is too small. + cursor.set_image_scale_factor(0.001f); + EXPECT_FALSE(webcursor.SetCursor(cursor)); - // SetInfo should return false when the scale factor is too large. - info.image_scale_factor = 1000.f; - EXPECT_FALSE(cursor.SetInfo(info)); + // SetCursor should return false when the scale factor is too large. + cursor.set_image_scale_factor(1000.f); + EXPECT_FALSE(webcursor.SetCursor(cursor)); - // SetInfo should return false when the image width is too large. - info.image_scale_factor = 1.f; - info.custom_image = CreateTestBitmap(1025, 3); - EXPECT_FALSE(cursor.SetInfo(info)); + // SetCursor should return false when the image width is too large. + cursor.set_image_scale_factor(1.f); + cursor.set_custom_bitmap(CreateTestBitmap(1025, 3)); + EXPECT_FALSE(webcursor.SetCursor(cursor)); - // SetInfo should return false when the image height is too large. - info.custom_image = CreateTestBitmap(3, 1025); - EXPECT_FALSE(cursor.SetInfo(info)); + // SetCursor should return false when the image height is too large. + cursor.set_custom_bitmap(CreateTestBitmap(3, 1025)); + EXPECT_FALSE(webcursor.SetCursor(cursor)); - // SetInfo should return false when the scaled image width is too large. - info.image_scale_factor = 0.02f; - info.custom_image = CreateTestBitmap(50, 5); - EXPECT_FALSE(cursor.SetInfo(info)); + // SetCursor should return false when the scaled image width is too large. + cursor.set_image_scale_factor(0.02f); + cursor.set_custom_bitmap(CreateTestBitmap(50, 5)); + EXPECT_FALSE(webcursor.SetCursor(cursor)); - // SetInfo should return false when the scaled image height is too large. - info.image_scale_factor = 0.1f; - info.custom_image = CreateTestBitmap(5, 200); - EXPECT_FALSE(cursor.SetInfo(info)); + // SetCursor should return false when the scaled image height is too large. + cursor.set_image_scale_factor(0.1f); + cursor.set_custom_bitmap(CreateTestBitmap(5, 200)); + EXPECT_FALSE(webcursor.SetCursor(cursor)); } #if defined(USE_AURA) TEST(WebCursorTest, CursorScaleFactor) { - CursorInfo info; - info.type = ui::mojom::CursorType::kCustom; - info.hotspot = gfx::Point(0, 1); - info.image_scale_factor = 2.0f; - info.custom_image = CreateTestBitmap(128, 128); - WebCursor cursor(info); + ui::Cursor cursor(ui::mojom::CursorType::kCustom); + cursor.set_custom_hotspot(gfx::Point(0, 1)); + cursor.set_image_scale_factor(2.0f); + cursor.set_custom_bitmap(CreateTestBitmap(128, 128)); + WebCursor webcursor(cursor); display::Display display; display.set_device_scale_factor(4.2f); - cursor.SetDisplayInfo(display); + webcursor.SetDisplayInfo(display); #if defined(USE_OZONE) // For Ozone cursors, the size of the cursor is capped at 64px, and this is // enforce through the calculated scale factor. - EXPECT_EQ(0.5f, cursor.GetNativeCursor().image_scale_factor()); + EXPECT_EQ(0.5f, webcursor.GetNativeCursor().image_scale_factor()); #else - EXPECT_EQ(2.1f, cursor.GetNativeCursor().image_scale_factor()); + EXPECT_EQ(2.1f, webcursor.GetNativeCursor().image_scale_factor()); #endif // Test that the Display dsf is copied. - WebCursor copy(cursor); - EXPECT_EQ(cursor.GetNativeCursor().image_scale_factor(), + WebCursor copy(webcursor); + EXPECT_EQ(webcursor.GetNativeCursor().image_scale_factor(), copy.GetNativeCursor().image_scale_factor()); } TEST(WebCursorTest, UnscaledImageCopy) { - CursorInfo info; - info.type = ui::mojom::CursorType::kCustom; - info.hotspot = gfx::Point(0, 1); - info.custom_image = CreateTestBitmap(2, 2); - WebCursor cursor(info); + ui::Cursor cursor(ui::mojom::CursorType::kCustom); + cursor.set_custom_hotspot(gfx::Point(0, 1)); + cursor.set_custom_bitmap(CreateTestBitmap(2, 2)); + WebCursor webcursor(cursor); SkBitmap copy; gfx::Point hotspot; float dsf = 0.f; - cursor.CreateScaledBitmapAndHotspotFromCustomData(©, &hotspot, &dsf); + webcursor.CreateScaledBitmapAndHotspotFromCustomData(©, &hotspot, &dsf); EXPECT_EQ(1.f, dsf); EXPECT_EQ(2, copy.width()); EXPECT_EQ(2, copy.height()); @@ -192,17 +191,16 @@ #if defined(OS_WIN) void ScaleCursor(float scale, int hotspot_x, int hotspot_y) { - CursorInfo info; - info.type = ui::mojom::CursorType::kCustom; - info.hotspot = gfx::Point(hotspot_x, hotspot_y); - info.custom_image = CreateTestBitmap(10, 10); - WebCursor cursor(info); + ui::Cursor cursor(ui::mojom::CursorType::kCustom); + cursor.set_custom_hotspot(gfx::Point(hotspot_x, hotspot_y)); + cursor.set_custom_bitmap(CreateTestBitmap(10, 10)); + WebCursor webcursor(cursor); display::Display display; display.set_device_scale_factor(scale); - cursor.SetDisplayInfo(display); + webcursor.SetDisplayInfo(display); - HCURSOR windows_cursor_handle = cursor.GetNativeCursor().platform(); + HCURSOR windows_cursor_handle = webcursor.GetNativeCursor().platform(); EXPECT_NE(nullptr, windows_cursor_handle); ICONINFO windows_icon_info; EXPECT_TRUE(GetIconInfo(windows_cursor_handle, &windows_icon_info));
diff --git a/content/common/coverage_utils.cc b/content/common/profiling_utils.cc similarity index 91% rename from content/common/coverage_utils.cc rename to content/common/profiling_utils.cc index 609f503..48772eb 100644 --- a/content/common/coverage_utils.cc +++ b/content/common/profiling_utils.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/common/coverage_utils.h" +#include "content/common/profiling_utils.h" #include <memory> @@ -23,7 +23,7 @@ namespace content { -base::File OpenCoverageFile() { +base::File OpenProfilingFile() { base::ScopedAllowBlockingForTesting allows_blocking; std::unique_ptr<base::Environment> env(base::Environment::Create()); std::string prof_template; @@ -41,6 +41,8 @@ // sajjadm@ and liaoyuke@ experimentally determined that a size 4 pool works // well for the coverage builder. + // TODO(https://crbug.com/1059335): Check if this is an appropriate value for + // the PGO builds. int pool_index = base::RandInt(0, 3); std::string filename = base::StrCat( {"child_pool-", base::NumberToString(pool_index), ".profraw"});
diff --git a/content/common/coverage_utils.h b/content/common/profiling_utils.h similarity index 62% rename from content/common/coverage_utils.h rename to content/common/profiling_utils.h index 24d8270..f9e6e17 100644 --- a/content/common/coverage_utils.h +++ b/content/common/profiling_utils.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_COMMON_COVERAGE_UTILS_H_ -#define CONTENT_COMMON_COVERAGE_UTILS_H_ +#ifndef CONTENT_COMMON_PROFILING_UTILS_H_ +#define CONTENT_COMMON_PROFILING_UTILS_H_ #include <string> @@ -11,8 +11,8 @@ namespace content { -base::File OpenCoverageFile(); +base::File OpenProfilingFile(); } // namespace content -#endif // CONTENT_COMMON_COVERAGE_UTILS_H_ +#endif // CONTENT_COMMON_PROFILING_UTILS_H_
diff --git a/content/public/browser/render_widget_host.h b/content/public/browser/render_widget_host.h index 31381ec2..5b3da8e 100644 --- a/content/public/browser/render_widget_host.h +++ b/content/public/browser/render_widget_host.h
@@ -35,6 +35,7 @@ } namespace ui { +class Cursor; class LatencyInfo; } @@ -43,8 +44,6 @@ } namespace content { - -struct CursorInfo; class RenderProcessHost; class RenderWidgetHostIterator; class RenderWidgetHostObserver; @@ -318,7 +317,7 @@ virtual void FilterDropData(DropData* drop_data) {} // Sets cursor to a specified one when it is over this widget. - virtual void SetCursor(const CursorInfo& cursor_info) {} + virtual void SetCursor(const ui::Cursor& cursor) {} }; } // namespace content
diff --git a/content/public/common/BUILD.gn b/content/public/common/BUILD.gn index 7891594..4c6ffb5 100644 --- a/content/public/common/BUILD.gn +++ b/content/public/common/BUILD.gn
@@ -119,8 +119,6 @@ "content_switches.h", "context_menu_params.cc", "context_menu_params.h", - "cursor_info.cc", - "cursor_info.h", "drop_data.cc", "drop_data.h", "font_cache_dispatcher_win.h",
diff --git a/content/public/common/cursor_info.cc b/content/public/common/cursor_info.cc deleted file mode 100644 index 6dfa10a..0000000 --- a/content/public/common/cursor_info.cc +++ /dev/null
@@ -1,39 +0,0 @@ -// Copyright 2019 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "content/public/common/cursor_info.h" - -#include "ui/base/cursor/cursor.h" -#include "ui/gfx/skia_util.h" - -namespace content { - -CursorInfo::CursorInfo(ui::mojom::CursorType cursor) : type(cursor) {} - -CursorInfo::CursorInfo(const ui::Cursor& cursor) - : type(cursor.type()), image_scale_factor(cursor.image_scale_factor()) { - if (type == ui::mojom::CursorType::kCustom) { - custom_image = cursor.custom_bitmap(); - hotspot = cursor.custom_hotspot(); - } -} - -bool CursorInfo::operator==(const CursorInfo& other) const { - return type == other.type && image_scale_factor == other.image_scale_factor && - (type != ui::mojom::CursorType::kCustom || - (hotspot == other.hotspot && - gfx::BitmapsAreEqual(custom_image, other.custom_image))); -} - -ui::Cursor CursorInfo::GetCursor() const { - ui::Cursor cursor(type); - cursor.set_image_scale_factor(image_scale_factor); - if (type == ui::mojom::CursorType::kCustom) { - cursor.set_custom_hotspot(hotspot); - cursor.set_custom_bitmap(custom_image); - } - return cursor; -} - -} // namespace content
diff --git a/content/public/common/cursor_info.h b/content/public/common/cursor_info.h deleted file mode 100644 index 3496629..0000000 --- a/content/public/common/cursor_info.h +++ /dev/null
@@ -1,49 +0,0 @@ -// Copyright 2019 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CONTENT_PUBLIC_COMMON_CURSOR_INFO_H_ -#define CONTENT_PUBLIC_COMMON_CURSOR_INFO_H_ - -#include "content/common/content_export.h" -#include "third_party/skia/include/core/SkBitmap.h" -#include "ui/base/mojom/cursor_type.mojom-shared.h" -#include "ui/gfx/geometry/point.h" - -namespace ui { -class Cursor; -} - -namespace content { - -// This struct represents the data sufficient to create a cross-platform cursor: -// either a predefined cursor type (from ui::Cursor) or custom image. -// This structure is highly similar to ui::Cursor. -struct CONTENT_EXPORT CursorInfo { - CursorInfo() = default; - explicit CursorInfo(ui::mojom::CursorType cursor); - explicit CursorInfo(const ui::Cursor& info); - - // Equality operator; performs bitmap content comparison as needed. - bool operator==(const CursorInfo& other) const; - - // Get a ui::Cursor struct with fields matching this struct. - ui::Cursor GetCursor() const; - - // One of the predefined cursors. - ui::mojom::CursorType type = ui::mojom::CursorType::kPointer; - - // Custom cursor image. - SkBitmap custom_image; - - // Hotspot in custom image in pixels. - gfx::Point hotspot; - - // The scale factor of custom image, used to possibly re-scale the image - // for a different density display. - float image_scale_factor = 1.f; -}; - -} // namespace content - -#endif // CONTENT_PUBLIC_COMMON_CURSOR_INFO_H_
diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.cc b/content/renderer/pepper/pepper_plugin_instance_impl.cc index cae56cb..c07a987 100644 --- a/content/renderer/pepper/pepper_plugin_instance_impl.cc +++ b/content/renderer/pepper/pepper_plugin_instance_impl.cc
@@ -119,9 +119,7 @@ #include "third_party/blink/public/web/web_script_source.h" #include "third_party/blink/public/web/web_view.h" #include "third_party/khronos/GLES2/gl2.h" -#include "ui/base/cursor/cursor.h" #include "ui/base/cursor/cursor_lookup.h" -#include "ui/base/mojom/cursor_type.mojom-shared.h" #include "ui/events/blink/blink_event_util.h" #include "ui/events/blink/web_input_event.h" #include "ui/events/keycodes/dom/dom_code.h"
diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.h b/content/renderer/pepper/pepper_plugin_instance_impl.h index 56b5f224c..e358c31 100644 --- a/content/renderer/pepper/pepper_plugin_instance_impl.h +++ b/content/renderer/pepper/pepper_plugin_instance_impl.h
@@ -62,7 +62,9 @@ #include "third_party/blink/public/web/web_associated_url_loader_client.h" #include "third_party/blink/public/web/web_plugin.h" #include "ui/accessibility/ax_mode.h" +#include "ui/base/cursor/cursor.h" #include "ui/base/ime/text_input_type.h" +#include "ui/base/mojom/cursor_type.mojom-shared.h" #include "ui/gfx/geometry/rect.h" #include "url/gurl.h" #include "v8/include/v8.h" @@ -101,10 +103,6 @@ class MetafileSkia; } -namespace ui { -class Cursor; -} - namespace content { class FullscreenContainer; @@ -800,7 +798,8 @@ const PPP_Graphics3D* plugin_graphics_3d_interface_; // Contains the cursor if it's set by the plugin. - std::unique_ptr<ui::Cursor> cursor_; + std::unique_ptr<ui::Cursor> cursor_ = + std::make_unique<ui::Cursor>(ui::mojom::CursorType::kPointer); // Set to true if this plugin thinks it will always be on top. This allows us // to use a more optimized painting path in some cases.
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc index b46b9d4..09e791f 100644 --- a/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc
@@ -1644,7 +1644,7 @@ void RenderWidget::DidChangeCursor(const ui::Cursor& cursor) { // TODO(darin): Eliminate this temporary. - WebCursor webcursor{CursorInfo(cursor)}; + WebCursor webcursor(cursor); // Only send a SetCursor message if we need to make a change. if (input_handler_->DidChangeCursor(webcursor)) Send(new WidgetHostMsg_SetCursor(routing_id_, webcursor));
diff --git a/content/test/data/feature-policy-main.html.mock-http-headers b/content/test/data/feature-policy-main.html.mock-http-headers index 5c7b52e5..2098486 100644 --- a/content/test/data/feature-policy-main.html.mock-http-headers +++ b/content/test/data/feature-policy-main.html.mock-http-headers
@@ -1,2 +1,2 @@ HTTP/1.1 200 OK -Feature-Policy: geolocation 'self' http://example.com; oversized-images 'self' http://example.com; +Feature-Policy: geolocation 'self' http://example.com; payment 'self' http://example.com;
diff --git a/content/test/data/feature-policy1.html.mock-http-headers b/content/test/data/feature-policy1.html.mock-http-headers index 585b13b5..69bccf0 100644 --- a/content/test/data/feature-policy1.html.mock-http-headers +++ b/content/test/data/feature-policy1.html.mock-http-headers
@@ -1,2 +1,2 @@ HTTP/1.1 200 OK -Feature-Policy: geolocation 'self'; oversized-images 'self'; +Feature-Policy: geolocation 'self'; payment 'self';
diff --git a/content/test/data/feature-policy2.html.mock-http-headers b/content/test/data/feature-policy2.html.mock-http-headers index 4dd410c9..4c50dd1c 100644 --- a/content/test/data/feature-policy2.html.mock-http-headers +++ b/content/test/data/feature-policy2.html.mock-http-headers
@@ -1,2 +1,2 @@ HTTP/1.1 200 OK -Feature-Policy: geolocation *; oversized-images *; +Feature-Policy: geolocation *; payment *;
diff --git a/content/test/data/feature-policy3.html.mock-http-headers b/content/test/data/feature-policy3.html.mock-http-headers index 4dd410c9..4c50dd1c 100644 --- a/content/test/data/feature-policy3.html.mock-http-headers +++ b/content/test/data/feature-policy3.html.mock-http-headers
@@ -1,2 +1,2 @@ HTTP/1.1 200 OK -Feature-Policy: geolocation *; oversized-images *; +Feature-Policy: geolocation *; payment *;
diff --git a/content/test/gpu/gpu_tests/test_expectations/webgl2_conformance_expectations.txt b/content/test/gpu/gpu_tests/test_expectations/webgl2_conformance_expectations.txt index 0e0a89e..beb0100 100644 --- a/content/test/gpu/gpu_tests/test_expectations/webgl2_conformance_expectations.txt +++ b/content/test/gpu/gpu_tests/test_expectations/webgl2_conformance_expectations.txt
@@ -215,6 +215,7 @@ crbug.com/965648 [ opengl win passthrough nvidia-0x1cb3 ] deqp/functional/gles3/shaderstruct.html [ RetryOnFailure ] crbug.com/822733 [ opengl win nvidia-0x1cb3 ] deqp/functional/gles3/transformfeedback/* [ RetryOnFailure ] crbug.com/1060024 [ opengl win passthrough nvidia-0x1cb3 ] deqp/functional/gles3/shaderloop_do_while.html [ RetryOnFailure ] +crbug.com/1060024 [ opengl win passthrough nvidia-0x1cb3 ] deqp/functional/gles3/shaderloop_while.html [ RetryOnFailure ] # Win / AMD
diff --git a/extensions/browser/api/declarative_net_request/flat_ruleset_indexer.cc b/extensions/browser/api/declarative_net_request/flat_ruleset_indexer.cc index 883158e..4eae25a 100644 --- a/extensions/browser/api/declarative_net_request/flat_ruleset_indexer.cc +++ b/extensions/browser/api/declarative_net_request/flat_ruleset_indexer.cc
@@ -280,6 +280,7 @@ return {index_builders_[flat::IndexType_allow_all_requests].get()}; case dnr_api::RULE_ACTION_TYPE_REMOVEHEADERS: return GetRemoveHeaderBuilders(indexed_rule.remove_headers_set); + case dnr_api::RULE_ACTION_TYPE_MODIFYHEADERS: case dnr_api::RULE_ACTION_TYPE_NONE: break; }
diff --git a/extensions/browser/api/declarative_net_request/indexed_rule.cc b/extensions/browser/api/declarative_net_request/indexed_rule.cc index a4fc367..d122a8fb 100644 --- a/extensions/browser/api/declarative_net_request/indexed_rule.cc +++ b/extensions/browser/api/declarative_net_request/indexed_rule.cc
@@ -391,6 +391,7 @@ return true; case dnr_api::RULE_ACTION_TYPE_REMOVEHEADERS: return false; + case dnr_api::RULE_ACTION_TYPE_MODIFYHEADERS: case dnr_api::RULE_ACTION_TYPE_NONE: break; } @@ -412,6 +413,7 @@ return 1; case dnr_api::RULE_ACTION_TYPE_REMOVEHEADERS: return 0; + case dnr_api::RULE_ACTION_TYPE_MODIFYHEADERS: case dnr_api::RULE_ACTION_TYPE_NONE: break; }
diff --git a/extensions/browser/api/declarative_net_request/utils.cc b/extensions/browser/api/declarative_net_request/utils.cc index 0516a20b..ad112409 100644 --- a/extensions/browser/api/declarative_net_request/utils.cc +++ b/extensions/browser/api/declarative_net_request/utils.cc
@@ -260,6 +260,7 @@ return flat::ActionType_upgrade_scheme; case dnr_api::RULE_ACTION_TYPE_ALLOWALLREQUESTS: return flat::ActionType_allow_all_requests; + case dnr_api::RULE_ACTION_TYPE_MODIFYHEADERS: case dnr_api::RULE_ACTION_TYPE_NONE: break; }
diff --git a/extensions/common/api/declarative_net_request.idl b/extensions/common/api/declarative_net_request.idl index 5899bb2..411ac63 100644 --- a/extensions/common/api/declarative_net_request.idl +++ b/extensions/common/api/declarative_net_request.idl
@@ -40,6 +40,13 @@ setCookie }; + // This describes the possible opeations for a "modifyHeaders" rule. + // TODO(crbug.com/947591): Add documentation once implementation is complete. + [nodoc] + enum HeaderOperation { + remove + }; + // Describes the kind of action to take if a given RuleCondition matches. enum RuleActionType { // Block the network request. @@ -54,6 +61,11 @@ upgradeScheme, // Remove request/response headers from the network request. removeHeaders, + // Modify request/response headers from the network request. + // TODO(crbug.com/947591): Add documentation once implementation is + // complete. + [nodoc] + modifyHeaders, // Allow all requests within a frame hierarchy, including the frame request // itself. allowAllRequests @@ -213,6 +225,13 @@ DomainType? domainType; }; + // TODO(crbug.com/947591): Add documentation once implementation is complete. + [nodoc] + dictionary ModifyHeaderInfo { + DOMString header; + HeaderOperation operation; + }; + dictionary RuleAction { // The type of action to perform. RuleActionType type; @@ -224,6 +243,20 @@ // The headers to remove from the request. Only valid if RuleActionType is // "removeHeaders". RemoveHeaderType[]? removeHeadersList; + + // The request headers to modify for the request. Only valid if + // RuleActionType is "modifyHeaders". + // TODO(crbug.com/947591): Add documentation once implementation is + // complete. + [nodoc] + ModifyHeaderInfo[]? requestHeaders; + + // The response headers to modify for the request. Only valid if + // RuleActionType is "modifyHeaders". + // TODO(crbug.com/947591): Add documentation once implementation is + // complete. + [nodoc] + ModifyHeaderInfo[]? responseHeaders; }; dictionary Rule {
diff --git a/extensions/common/constants.cc b/extensions/common/constants.cc index db5a7cf3..b00b70e 100644 --- a/extensions/common/constants.cc +++ b/extensions/common/constants.cc
@@ -133,7 +133,7 @@ const char kScreensaverAppId[] = "mnoijifedipmbjaoekhadjcijipaijjc"; const char kScreensaverEveAppId[] = "gdobaoeekhiklaljmhladjfdfkigampc"; const char kScreensaverNocturneAppId[] = "lminefdanffajachfahfpmphfkhahcnj"; -const char kScreensaverAltAppId[] = "bnabjkecnachpogjlfilfcnlpcmacglh"; +const char kScreensaverAtlasAppId[] = "bnabjkecnachpogjlfilfcnlpcmacglh"; const char kScreensaverKukuiAppId[] = "fafhbhdboeiciklpkminlncemohljlkj"; bool IsSystemUIApp(base::StringPiece extension_id) { @@ -149,7 +149,7 @@ kHighlightsAppId, kScreensaverEveAppId, kScreensaverNocturneAppId, - kScreensaverAltAppId, + kScreensaverAtlasAppId, kScreensaverAppId, // clang-format on };
diff --git a/extensions/common/constants.h b/extensions/common/constants.h index b859afe3..4cf62fd 100644 --- a/extensions/common/constants.h +++ b/extensions/common/constants.h
@@ -238,10 +238,10 @@ // The extension id of the nocturne Demo Mode screensaver app. extern const char kScreensaverNocturneAppId[]; -// The extension id of an alternate Demo Mode screensaver app. -extern const char kScreensaverAltAppId[]; +// The extension id of the atlas Demo Mode screensaver app. +extern const char kScreensaverAtlasAppId[]; -// The extension id of an kukui Demo Mode screensaver app. +// The extension id of the kukui Demo Mode screensaver app. extern const char kScreensaverKukuiAppId[]; // Returns true if this app is part of the "system UI". Generally this is UI
diff --git a/gpu/command_buffer/build_webgpu_cmd_buffer.py b/gpu/command_buffer/build_webgpu_cmd_buffer.py index 8d611c5..2a10676 100755 --- a/gpu/command_buffer/build_webgpu_cmd_buffer.py +++ b/gpu/command_buffer/build_webgpu_cmd_buffer.py
@@ -54,12 +54,14 @@ }, }, 'AssociateMailbox': { + 'impl_func': False, + 'client_test': False, 'type': 'PUT', 'count': 16, # GL_MAILBOX_SIZE_CHROMIUM - 'trace_level': 1, }, 'DissociateMailbox': { - 'trace_level': 1, + 'impl_func': False, + 'client_test': False, }, 'RequestAdapter': { 'impl_func': False,
diff --git a/gpu/command_buffer/client/webgpu_implementation.cc b/gpu/command_buffer/client/webgpu_implementation.cc index cc8c468..7db6a3c 100644 --- a/gpu/command_buffer/client/webgpu_implementation.cc +++ b/gpu/command_buffer/client/webgpu_implementation.cc
@@ -603,6 +603,42 @@ #endif } +void WebGPUImplementation::AssociateMailbox(GLuint64 device_client_id, + GLuint device_generation, + GLuint id, + GLuint generation, + GLuint usage, + const GLbyte* mailbox) { +#if BUILDFLAG(USE_DAWN) + // Flush previous Dawn commands as they may manipulate texture object IDs + // and need to be resolved prior to the AssociateMailbox command. Otherwise + // the service side might not know, for example that the previous texture + // using that ID has been released. + WebGPUCommandSerializer* command_serializer = + GetCommandSerializerWithDeviceClientID(device_client_id); + DCHECK(command_serializer); + command_serializer->Flush(); + + helper_->AssociateMailboxImmediate(device_client_id, device_generation, id, + generation, usage, mailbox); +#endif +} + +void WebGPUImplementation::DissociateMailbox(GLuint64 device_client_id, + GLuint texture_id, + GLuint texture_generation) { +#if BUILDFLAG(USE_DAWN) + // Flush previous Dawn commands that might be rendering to the texture, prior + // to Dissociating the shared image from that texture. + WebGPUCommandSerializer* command_serializer = + GetCommandSerializerWithDeviceClientID(device_client_id); + DCHECK(command_serializer); + command_serializer->Flush(); + + helper_->DissociateMailbox(device_client_id, texture_id, texture_generation); +#endif +} + void WebGPUImplementation::RemoveDevice(DawnDeviceClientID device_client_id) { #if BUILDFLAG(USE_DAWN) auto it = command_serializers_.find(device_client_id);
diff --git a/gpu/command_buffer/client/webgpu_implementation_impl_autogen.h b/gpu/command_buffer/client/webgpu_implementation_impl_autogen.h index ce49c09..06f94d4 100644 --- a/gpu/command_buffer/client/webgpu_implementation_impl_autogen.h +++ b/gpu/command_buffer/client/webgpu_implementation_impl_autogen.h
@@ -13,33 +13,4 @@ #ifndef GPU_COMMAND_BUFFER_CLIENT_WEBGPU_IMPLEMENTATION_IMPL_AUTOGEN_H_ #define GPU_COMMAND_BUFFER_CLIENT_WEBGPU_IMPLEMENTATION_IMPL_AUTOGEN_H_ -void WebGPUImplementation::AssociateMailbox(GLuint64 device_client_id, - GLuint device_generation, - GLuint id, - GLuint generation, - GLuint usage, - const GLbyte* mailbox) { - GPU_CLIENT_SINGLE_THREAD_CHECK(); - GPU_CLIENT_LOG("[" << GetLogPrefix() << "] wgAssociateMailbox(" - << device_client_id << ", " << device_generation << ", " - << id << ", " << generation << ", " << usage << ", " - << static_cast<const void*>(mailbox) << ")"); - uint32_t count = 16; - for (uint32_t ii = 0; ii < count; ++ii) - GPU_CLIENT_LOG("value[" << ii << "]: " << mailbox[ii]); - helper_->AssociateMailboxImmediate(device_client_id, device_generation, id, - generation, usage, mailbox); - CheckGLError(); -} - -void WebGPUImplementation::DissociateMailbox(GLuint64 device_client_id, - GLuint texture_id, - GLuint texture_generation) { - GPU_CLIENT_SINGLE_THREAD_CHECK(); - GPU_CLIENT_LOG("[" << GetLogPrefix() << "] wgDissociateMailbox(" - << device_client_id << ", " << texture_id << ", " - << texture_generation << ")"); - helper_->DissociateMailbox(device_client_id, texture_id, texture_generation); -} - #endif // GPU_COMMAND_BUFFER_CLIENT_WEBGPU_IMPLEMENTATION_IMPL_AUTOGEN_H_
diff --git a/gpu/command_buffer/client/webgpu_implementation_unittest_autogen.h b/gpu/command_buffer/client/webgpu_implementation_unittest_autogen.h index d2f97a2..12aa0d1 100644 --- a/gpu/command_buffer/client/webgpu_implementation_unittest_autogen.h +++ b/gpu/command_buffer/client/webgpu_implementation_unittest_autogen.h
@@ -13,30 +13,4 @@ #ifndef GPU_COMMAND_BUFFER_CLIENT_WEBGPU_IMPLEMENTATION_UNITTEST_AUTOGEN_H_ #define GPU_COMMAND_BUFFER_CLIENT_WEBGPU_IMPLEMENTATION_UNITTEST_AUTOGEN_H_ -TEST_F(WebGPUImplementationTest, AssociateMailbox) { - GLbyte data[16] = {0}; - struct Cmds { - cmds::AssociateMailboxImmediate cmd; - GLbyte data[16]; - }; - - for (int jj = 0; jj < 16; ++jj) { - data[jj] = static_cast<GLbyte>(jj); - } - Cmds expected; - expected.cmd.Init(1, 2, 3, 4, 5, &data[0]); - gl_->AssociateMailbox(1, 2, 3, 4, 5, &data[0]); - EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected))); -} - -TEST_F(WebGPUImplementationTest, DissociateMailbox) { - struct Cmds { - cmds::DissociateMailbox cmd; - }; - Cmds expected; - expected.cmd.Init(1, 2, 3); - - gl_->DissociateMailbox(1, 2, 3); - EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected))); -} #endif // GPU_COMMAND_BUFFER_CLIENT_WEBGPU_IMPLEMENTATION_UNITTEST_AUTOGEN_H_
diff --git a/gpu/command_buffer/common/webgpu_cmd_format_autogen.h b/gpu/command_buffer/common/webgpu_cmd_format_autogen.h index b975fb3..5a7f561 100644 --- a/gpu/command_buffer/common/webgpu_cmd_format_autogen.h +++ b/gpu/command_buffer/common/webgpu_cmd_format_autogen.h
@@ -69,7 +69,7 @@ typedef AssociateMailboxImmediate ValueType; static const CommandId kCmdId = kAssociateMailboxImmediate; static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN; - static const uint8_t cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(1); + static const uint8_t cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3); static uint32_t ComputeDataSize() { return static_cast<uint32_t>(sizeof(GLbyte) * 16); @@ -149,7 +149,7 @@ typedef DissociateMailbox ValueType; static const CommandId kCmdId = kDissociateMailbox; static const cmd::ArgFlags kArgFlags = cmd::kFixed; - static const uint8_t cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(1); + static const uint8_t cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3); static uint32_t ComputeSize() { return static_cast<uint32_t>(sizeof(ValueType)); // NOLINT
diff --git a/gpu/command_buffer/tests/webgpu_mailbox_unittest.cc b/gpu/command_buffer/tests/webgpu_mailbox_unittest.cc index 421df0f..6ffe964 100644 --- a/gpu/command_buffer/tests/webgpu_mailbox_unittest.cc +++ b/gpu/command_buffer/tests/webgpu_mailbox_unittest.cc
@@ -126,8 +126,6 @@ wgpu::Queue queue = device.CreateQueue(); queue.Submit(1, &commands); - // Dissociate the mailbox, flushing previous commands first - webgpu()->FlushCommands(); webgpu()->DissociateMailbox(device_client_id, reservation.id, reservation.generation); } @@ -138,10 +136,6 @@ gpu::webgpu::ReservedTexture reservation = webgpu()->ReserveTexture(device_client_id); - // Make sure previous Dawn wire commands are sent so that the texture IDs - // are validated correctly. - webgpu()->FlushCommands(); - webgpu()->AssociateMailbox(device_client_id, 0, reservation.id, reservation.generation, WGPUTextureUsage_CopySrc, reinterpret_cast<GLbyte*>(&mailbox)); @@ -174,8 +168,6 @@ wgpu::Queue queue = device.CreateQueue(); queue.Submit(1, &commands); - // Dissociate the mailbox, flushing previous commands first - webgpu()->FlushCommands(); webgpu()->DissociateMailbox(device_client_id, reservation.id, reservation.generation);
diff --git a/ios/chrome/browser/ui/badges/BUILD.gn b/ios/chrome/browser/ui/badges/BUILD.gn index a9c7548..2e0827c 100644 --- a/ios/chrome/browser/ui/badges/BUILD.gn +++ b/ios/chrome/browser/ui/badges/BUILD.gn
@@ -9,6 +9,8 @@ "badge_constants.mm", "badge_item.h", "badge_type.h", + "badges_histograms.h", + "badges_histograms.mm", ] }
diff --git a/ios/chrome/browser/ui/badges/badge_mediator.mm b/ios/chrome/browser/ui/badges/badge_mediator.mm index a920288..2a1f51a 100644 --- a/ios/chrome/browser/ui/badges/badge_mediator.mm +++ b/ios/chrome/browser/ui/badges/badge_mediator.mm
@@ -34,6 +34,13 @@ // The minimum number of non-Fullscreen badges to display the overflow popup // menu. const int kMinimumNonFullScreenBadgesForOverflow = 2; +// Historgram name for when an overflow badge was tapped. +const char kInfobarOverflowBadgeTappedUserAction[] = + "MobileMessagesOverflowBadgeTapped"; +// Histogram name for when the overflow badge is shown +const char kInfobarOverflowBadgeShownUserAction[] = + "MobileMessagesOverflowBadgeShown"; + } // namespace @interface BadgeMediator () <InfobarBadgeTabHelperDelegate, @@ -230,6 +237,9 @@ [popupMenuBadges addObject:item]; } } + // Log overflow badge tap. + base::RecordAction( + base::UserMetricsAction(kInfobarOverflowBadgeTappedUserAction)); [self.dispatcher displayPopupMenuWithBadgeItems:popupMenuBadges]; [self updateConsumerReadStatus]; // TODO(crbug.com/976901): Add metric for this action. @@ -402,6 +412,11 @@ // displayed badge, so mark it as read. displayedBadge.badgeState |= BadgeStateRead; } + if (displayedBadge.badgeType == BadgeType::kBadgeTypeOverflow) { + // Log that the overflow badge is being shown. + base::RecordAction( + base::UserMetricsAction(kInfobarOverflowBadgeShownUserAction)); + } [self.consumer updateDisplayedBadge:displayedBadge fullScreenBadge:self.offTheRecordBadge]; [self updateConsumerReadStatus];
diff --git a/ios/chrome/browser/ui/badges/badge_popup_menu_coordinator.mm b/ios/chrome/browser/ui/badges/badge_popup_menu_coordinator.mm index 363811b..f9993197 100644 --- a/ios/chrome/browser/ui/badges/badge_popup_menu_coordinator.mm +++ b/ios/chrome/browser/ui/badges/badge_popup_menu_coordinator.mm
@@ -5,11 +5,14 @@ #import "ios/chrome/browser/ui/badges/badge_popup_menu_coordinator.h" #include "base/logging.h" +#include "base/metrics/histogram_macros.h" +#include "ios/chrome/browser/infobars/infobar_metrics_recorder.h" #import "ios/chrome/browser/infobars/infobar_type.h" #import "ios/chrome/browser/main/browser.h" #import "ios/chrome/browser/ui/badges/badge_constants.h" #import "ios/chrome/browser/ui/badges/badge_item.h" #import "ios/chrome/browser/ui/badges/badge_popup_menu_item.h" +#import "ios/chrome/browser/ui/badges/badges_histograms.h" #import "ios/chrome/browser/ui/commands/command_dispatcher.h" #import "ios/chrome/browser/ui/commands/infobar_commands.h" #import "ios/chrome/browser/ui/popup_menu/public/cells/popup_menu_item.h" @@ -95,18 +98,26 @@ HandlerForProtocol(self.browser->GetCommandDispatcher(), InfobarCommands); switch (item.actionIdentifier) { case PopupMenuActionShowSavePasswordOptions: { + UMA_HISTOGRAM_ENUMERATION(kInfobarOverflowMenuTappedHistogram, + MobileMessagesInfobarType::SavePassword); [handler displayModalInfobar:InfobarType::kInfobarTypePasswordSave]; break; } case PopupMenuActionShowUpdatePasswordOptions: { + UMA_HISTOGRAM_ENUMERATION(kInfobarOverflowMenuTappedHistogram, + MobileMessagesInfobarType::UpdatePassword); [handler displayModalInfobar:InfobarType::kInfobarTypePasswordUpdate]; break; } case PopupMenuActionShowSaveCardOptions: { + UMA_HISTOGRAM_ENUMERATION(kInfobarOverflowMenuTappedHistogram, + MobileMessagesInfobarType::SaveCard); [handler displayModalInfobar:InfobarType::kInfobarTypeSaveCard]; break; } case PopupMenuActionShowTranslateOptions: { + UMA_HISTOGRAM_ENUMERATION(kInfobarOverflowMenuTappedHistogram, + MobileMessagesInfobarType::Translate); [handler displayModalInfobar:InfobarType::kInfobarTypeTranslate]; break; }
diff --git a/ios/chrome/browser/ui/badges/badges_histograms.h b/ios/chrome/browser/ui/badges/badges_histograms.h new file mode 100644 index 0000000..b56aca2 --- /dev/null +++ b/ios/chrome/browser/ui/badges/badges_histograms.h
@@ -0,0 +1,23 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef IOS_CHROME_BROWSER_UI_BADGES_BADGES_HISTOGRAMS_H_ +#define IOS_CHROME_BROWSER_UI_BADGES_BADGES_HISTOGRAMS_H_ + +// Histogram name for tapping on a row in the Badge overflow menu. +extern const char kInfobarOverflowMenuTappedHistogram[]; + +// Values for the Mobile.Messages.OverflowRow.Tapped histogram. Entries should +// not be renumbered and numeric values should never be reused. +enum class MobileMessagesInfobarType { + Confirm = 0, + SavePassword = 1, + UpdatePassword = 2, + SaveCard = 3, + Translate = 4, + // Highest enumerator. Recommended by Histogram metrics best practices. + kMaxValue = Translate, +}; + +#endif // IOS_CHROME_BROWSER_UI_BADGES_BADGES_HISTOGRAMS_H_
diff --git a/ios/chrome/browser/ui/badges/badges_histograms.mm b/ios/chrome/browser/ui/badges/badges_histograms.mm new file mode 100644 index 0000000..9ca0f83 --- /dev/null +++ b/ios/chrome/browser/ui/badges/badges_histograms.mm
@@ -0,0 +1,12 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#import "ios/chrome/browser/ui/badges/badges_histograms.h" + +#if !defined(__has_feature) || !__has_feature(objc_arc) +#error "This file requires ARC support." +#endif + +const char kInfobarOverflowMenuTappedHistogram[] = + "Mobile.Messages.OverflowRow.Tapped";
diff --git a/ios/chrome/browser/ui/download/BUILD.gn b/ios/chrome/browser/ui/download/BUILD.gn index 57f0a1a..42f2bbc 100644 --- a/ios/chrome/browser/ui/download/BUILD.gn +++ b/ios/chrome/browser/ui/download/BUILD.gn
@@ -121,12 +121,14 @@ deps = [ "//base", "//base/test:test_support", + "//components/infobars/core:feature_flags", "//ios/chrome/app:app_internal", "//ios/chrome/app/strings", "//ios/chrome/browser:browser", "//ios/chrome/browser/download", "//ios/chrome/browser/download:test_support", "//ios/chrome/browser/ui/browser_view", + "//ios/chrome/browser/ui/infobars/banners:public", "//ios/chrome/browser/ui/util", "//ios/chrome/test:eg_test_support", "//ios/chrome/test:test_support", @@ -160,10 +162,12 @@ ] deps = [ + "//components/infobars/core:feature_flags", "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser:chrome_url_constants", "//ios/chrome/browser/download:mime_types", "//ios/chrome/browser/download:test_support", + "//ios/chrome/browser/ui/infobars/banners:public", "//ios/chrome/test:eg_test_support+eg2", "//ios/chrome/test/earl_grey:eg_test_support+eg2", "//ios/testing:embedded_test_server_support",
diff --git a/ios/chrome/browser/ui/download/pass_kit_egtest.mm b/ios/chrome/browser/ui/download/pass_kit_egtest.mm index ec71d28..63f3ae49 100644 --- a/ios/chrome/browser/ui/download/pass_kit_egtest.mm +++ b/ios/chrome/browser/ui/download/pass_kit_egtest.mm
@@ -8,11 +8,14 @@ #include "base/bind.h" #import "base/test/ios/wait_util.h" +#include "components/infobars/core/infobar_feature.h" #include "ios/chrome/browser/download/download_test_util.h" #include "ios/chrome/browser/download/pass_kit_mime_type.h" +#import "ios/chrome/browser/ui/infobars/banners/infobar_banner_constants.h" #include "ios/chrome/grit/ios_strings.h" #import "ios/chrome/test/earl_grey/chrome_earl_grey.h" #import "ios/chrome/test/earl_grey/chrome_test_case.h" +#import "ios/testing/earl_grey/app_launch_manager.h" #import "ios/testing/earl_grey/earl_grey_test.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/http_request.h" @@ -20,6 +23,7 @@ #include "ui/base/l10n/l10n_util_mac.h" #if defined(CHROME_EARL_GREY_1) +#include "base/test/scoped_feature_list.h" // EG1 test relies on view controller presentation as the signal that PassKit // Dialog is shown. #import "ios/chrome/app/main_controller.h" // nogncheck @@ -38,9 +42,10 @@ // Returns matcher for PassKit error infobar. id<GREYMatcher> PassKitErrorInfobar() { - using l10n_util::GetNSStringWithFixup; - NSString* label = GetNSStringWithFixup(IDS_IOS_GENERIC_PASSKIT_ERROR); - return grey_accessibilityLabel(label); + return grey_allOf(grey_accessibilityID(kInfobarBannerViewIdentifier), + grey_accessibilityLabel( + l10n_util::GetNSString(IDS_IOS_GENERIC_PASSKIT_ERROR)), + nil); } // PassKit landing page and download request handler. @@ -70,15 +75,30 @@ @interface PassKitEGTest : ChromeTestCase @end -@implementation PassKitEGTest +@implementation PassKitEGTest { +#if defined(CHROME_EARL_GREY_1) + base::test::ScopedFeatureList _featureList; +#endif +} - (void)setUp { [super setUp]; +// Turn on Messages UI. +#if defined(CHROME_EARL_GREY_1) + _featureList.InitAndEnableFeature(kIOSInfobarUIReboot); +#endif + self.testServer->RegisterRequestHandler(base::Bind(&GetResponse)); GREYAssertTrue(self.testServer->Start(), @"Test server failed to start."); } +- (AppLaunchConfiguration)appConfigurationForTestCase { + AppLaunchConfiguration config; + config.features_enabled.push_back(kIOSInfobarUIReboot); + return config; +} + // Tests that Chrome presents PassKit error infobar if pkpass file cannot be // parsed. - (void)testPassKitParsingError {
diff --git a/ios/chrome/browser/ui/infobars/BUILD.gn b/ios/chrome/browser/ui/infobars/BUILD.gn index 94416bbd..55a61c6 100644 --- a/ios/chrome/browser/ui/infobars/BUILD.gn +++ b/ios/chrome/browser/ui/infobars/BUILD.gn
@@ -184,6 +184,10 @@ deps = [ ":eg_test_support", "//base", + "//base/test:test_support", + "//components/infobars/core:feature_flags", + "//ios/chrome/browser/ui/infobars:constants", + "//ios/chrome/browser/ui/infobars/banners:public", "//ios/chrome/test/earl_grey:test_support", "//ios/testing/earl_grey:earl_grey_support", "//ios/web/public/test/http_server",
diff --git a/ios/chrome/browser/ui/infobars/banners/BUILD.gn b/ios/chrome/browser/ui/infobars/banners/BUILD.gn index 5ffff7d..7fd81fb 100644 --- a/ios/chrome/browser/ui/infobars/banners/BUILD.gn +++ b/ios/chrome/browser/ui/infobars/banners/BUILD.gn
@@ -17,6 +17,7 @@ "//base", "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser/infobars:public", + "//ios/chrome/browser/ui/infobars:feature_flags", "//ios/chrome/browser/ui/util", "//ios/chrome/common/ui/colors", "//ui/base", @@ -28,6 +29,7 @@ sources = [ "infobar_banner_constants.h", "infobar_banner_constants.mm", + "infobar_banner_container.h", "infobar_banner_interaction_delegate.h", "infobar_banner_presentation_state.h", ]
diff --git a/ios/chrome/browser/ui/infobars/banners/infobar_banner_container.h b/ios/chrome/browser/ui/infobars/banners/infobar_banner_container.h new file mode 100644 index 0000000..bee8eff --- /dev/null +++ b/ios/chrome/browser/ui/infobars/banners/infobar_banner_container.h
@@ -0,0 +1,25 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef IOS_CHROME_BROWSER_UI_INFOBARS_BANNERS_INFOBAR_BANNER_CONTAINER_H_ +#define IOS_CHROME_BROWSER_UI_INFOBARS_BANNERS_INFOBAR_BANNER_CONTAINER_H_ + +// Protocol for the InfobarBanners to communicate with the InfobarContainer +// Coordinator if needed. +@protocol InfobarBannerContainer + +// Called whener an InfobarBannerContained banner has been dismissed. +- (void)infobarBannerFinishedPresenting; + +@end + +// Infobar banners presented by an InfobarCoordinatorContainer. +@protocol InfobarBannerContained + +// Container managing InfobarBanner presentations. +@property(nonatomic, weak) id<InfobarBannerContainer> infobarBannerContainer; + +@end + +#endif // IOS_CHROME_BROWSER_UI_INFOBARS_BANNERS_INFOBAR_BANNER_CONTAINER_H_
diff --git a/ios/chrome/browser/ui/infobars/banners/infobar_banner_view_controller.h b/ios/chrome/browser/ui/infobars/banners/infobar_banner_view_controller.h index de0e28ed..5d6a7aa 100644 --- a/ios/chrome/browser/ui/infobars/banners/infobar_banner_view_controller.h +++ b/ios/chrome/browser/ui/infobars/banners/infobar_banner_view_controller.h
@@ -9,6 +9,7 @@ #import "ios/chrome/browser/infobars/infobar_type.h" #import "ios/chrome/browser/ui/infobars/banners/infobar_banner_consumer.h" +#import "ios/chrome/browser/ui/infobars/banners/infobar_banner_container.h" #import "ios/chrome/browser/ui/infobars/banners/infobar_banner_interaction_delegate.h" @protocol InfobarBannerDelegate; @@ -16,7 +17,9 @@ // ViewController that manages an InfobarBanner. It consists of a leading icon, // a title and optional subtitle, and a trailing button. @interface InfobarBannerViewController - : UIViewController <InfobarBannerConsumer, InfobarBannerInteractable> + : UIViewController <InfobarBannerConsumer, + InfobarBannerInteractable, + InfobarBannerContained> // Designated Initializer. |delegate| handles InfobarBannerVC actions. // |presentsModal| should be YES if the banner is able to present an
diff --git a/ios/chrome/browser/ui/infobars/banners/infobar_banner_view_controller.mm b/ios/chrome/browser/ui/infobars/banners/infobar_banner_view_controller.mm index 080baf78..97cd74f9 100644 --- a/ios/chrome/browser/ui/infobars/banners/infobar_banner_view_controller.mm +++ b/ios/chrome/browser/ui/infobars/banners/infobar_banner_view_controller.mm
@@ -9,7 +9,9 @@ #include "base/metrics/user_metrics_action.h" #include "ios/chrome/browser/infobars/infobar_metrics_recorder.h" #import "ios/chrome/browser/ui/infobars/banners/infobar_banner_constants.h" +#import "ios/chrome/browser/ui/infobars/banners/infobar_banner_container.h" #import "ios/chrome/browser/ui/infobars/banners/infobar_banner_delegate.h" +#import "ios/chrome/browser/ui/infobars/infobar_feature.h" #import "ios/chrome/browser/ui/util/uikit_ui_util.h" #import "ios/chrome/common/ui/colors/semantic_color_names.h" #include "ios/chrome/grit/ios_strings.h" @@ -94,6 +96,9 @@ @end @implementation InfobarBannerViewController +// Synthesized from InfobarBannerContained. +@synthesize infobarBannerContainer = _infobarBannerContainer; +// Synthesized from InfobarBannerInteractable. @synthesize interactionDelegate = _interactionDelegate; - (instancetype)initWithDelegate:(id<InfobarBannerDelegate>)delegate @@ -315,7 +320,14 @@ - (void)viewDidDisappear:(BOOL)animated { [self.metricsRecorder recordBannerEvent:MobileMessagesBannerEvent::Dismissed]; - [self.delegate infobarBannerWasDismissed]; + // If the delegate exists at the time of dismissal it should handle the + // dismissal cleanup. Otherwise the BannerContainer needs to be informed that + // this banner was dismissed in case it needs to present a queued one. + if (self.delegate) { + [self.delegate infobarBannerWasDismissed]; + } else { + [self.infobarBannerContainer infobarBannerFinishedPresenting]; + } [super viewDidDisappear:animated]; } @@ -370,6 +382,15 @@ self.view.accessibilityCustomActions = [self accessibilityActions]; } +- (void)setInfobarBannerContainer: + (id<InfobarBannerContainer>)infobarBannerContainer { + _infobarBannerContainer = infobarBannerContainer; + // infobarBannerContainer should only be set when the banner by the + // InfobarContainerCoordinator and not Overlays. Once we migrate to Overlays + // InfobarBannerContainer shouldn't be necessary. + DCHECK(!IsInfobarOverlayUIEnabled()); +} + #pragma mark - Private Methods - (void)bannerInfobarButtonWasPressed:(UIButton*)sender {
diff --git a/ios/chrome/browser/ui/infobars/coordinators/infobar_coordinator.h b/ios/chrome/browser/ui/infobars/coordinators/infobar_coordinator.h index d6c92a0..2cd7b0e 100644 --- a/ios/chrome/browser/ui/infobars/coordinators/infobar_coordinator.h +++ b/ios/chrome/browser/ui/infobars/coordinators/infobar_coordinator.h
@@ -17,6 +17,7 @@ @protocol ApplicationCommands; @protocol InfobarBadgeUIDelegate; @protocol InfobarContainer; +@protocol InfobarBannerContained; @class InfobarBannerTransitionDriver; @class InfobarBannerViewController; @@ -76,7 +77,8 @@ @property(nonatomic, assign) BOOL started; // BannerViewController owned by this Coordinator. Can be nil. -@property(nonatomic, strong, readonly) UIViewController* bannerViewController; +@property(nonatomic, strong, readonly) + UIViewController<InfobarBannerContained>* bannerViewController; // ModalViewController owned by this Coordinator. Can be nil. @property(nonatomic, strong, readonly) UIViewController* modalViewController;
diff --git a/ios/chrome/browser/ui/infobars/coordinators/infobar_coordinator.mm b/ios/chrome/browser/ui/infobars/coordinators/infobar_coordinator.mm index 491aa1d..139bdef3 100644 --- a/ios/chrome/browser/ui/infobars/coordinators/infobar_coordinator.mm +++ b/ios/chrome/browser/ui/infobars/coordinators/infobar_coordinator.mm
@@ -128,24 +128,27 @@ } self.infobarBannerState = InfobarBannerPresentationState::IsAnimating; - __weak __typeof(self) weakSelf = self; [self.baseViewController presentViewController:self.bannerViewController animated:animated completion:^{ - [weakSelf - configureAccessibilityForBannerInViewController: - weakSelf.baseViewController - presenting:YES]; - weakSelf.bannerWasPresented = YES; + // Capture self in order to make sure the animation dismisses + // correctly in case the Coordinator gets stopped mid + // presentation. This will also make sure some cleanup tasks + // like configuring accessibility for the presenter VC are + // performed successfully. + [self configureAccessibilityForBannerInViewController: + self.baseViewController + presenting:YES]; + self.bannerWasPresented = YES; // Set to NO for each Banner this coordinator might present. - weakSelf.bannerIsBeingDismissed = NO; - weakSelf.infobarBannerState = + self.bannerIsBeingDismissed = NO; + self.infobarBannerState = InfobarBannerPresentationState::Presented; - [weakSelf.badgeDelegate - infobarBannerWasPresented:weakSelf.infobarType - forWebState:weakSelf.webState]; - [weakSelf infobarBannerWasPresented]; + [self.badgeDelegate + infobarBannerWasPresented:self.infobarType + forWebState:self.webState]; + [self infobarBannerWasPresented]; if (completion) completion(); }]; @@ -222,6 +225,9 @@ #pragma mark InfobarBannerDelegate - (void)bannerInfobarButtonWasPressed:(id)sender { + if (!self.infobarDelegate) + return; + [self performInfobarAction]; // The Infobar action might be async, and the badge should not change until // the Infobar has been accepted. @@ -256,6 +262,8 @@ } - (void)infobarBannerWasDismissed { + DCHECK(self.infobarBannerState == InfobarBannerPresentationState::Presented); + self.infobarBannerState = InfobarBannerPresentationState::NotPresented; [self configureAccessibilityForBannerInViewController:self.baseViewController presenting:NO];
diff --git a/ios/chrome/browser/ui/infobars/infobar_container_coordinator.mm b/ios/chrome/browser/ui/infobars/infobar_container_coordinator.mm index 3babcd2..d26f3bc 100644 --- a/ios/chrome/browser/ui/infobars/infobar_container_coordinator.mm +++ b/ios/chrome/browser/ui/infobars/infobar_container_coordinator.mm
@@ -13,6 +13,7 @@ #import "ios/chrome/browser/ui/commands/application_commands.h" #import "ios/chrome/browser/ui/commands/command_dispatcher.h" #import "ios/chrome/browser/ui/fullscreen/fullscreen_controller.h" +#import "ios/chrome/browser/ui/infobars/banners/infobar_banner_container.h" #import "ios/chrome/browser/ui/infobars/coordinators/infobar_coordinator.h" #import "ios/chrome/browser/ui/infobars/infobar_container.h" #import "ios/chrome/browser/ui/infobars/infobar_container_consumer.h" @@ -28,7 +29,8 @@ #endif @interface InfobarContainerCoordinator () <InfobarContainer, - InfobarContainerConsumer> + InfobarContainerConsumer, + InfobarBannerContainer> // ViewController of the Infobar currently being presented, can be nil. @property(nonatomic, weak) UIViewController* infobarViewController; @@ -215,6 +217,7 @@ infobarCoordinator.webState = self.browser->GetWebStateList()->GetActiveWebState(); infobarCoordinator.baseViewController = self.baseViewController; + infobarCoordinator.bannerViewController.infobarBannerContainer = self; // TODO(crbug.com/1045047): Use HandlerForProtocol after commands protocol // clean up. infobarCoordinator.dispatcher = static_cast<id<ApplicationCommands>>( @@ -242,10 +245,7 @@ - (void)childCoordinatorBannerFinishedPresented: (InfobarCoordinator*)infobarCoordinator { - InfobarCoordinator* coordinator = - [self.infobarCoordinatorsToPresent firstObject]; - if (coordinator) - [self presentBannerForInfobarCoordinator:coordinator]; + [self presentNextBannerInQueue]; } - (void)childCoordinatorStopped:(InfobarCoordinator*)infobarCoordinator { @@ -255,6 +255,12 @@ [self.infobarCoordinatorsToPresent removeObject:infobarCoordinator]; } +#pragma mark InfobarBannerContainerDelegate + +- (void)infobarBannerFinishedPresenting { + [self presentNextBannerInQueue]; +} + #pragma mark InfobarCommands - (void)displayModalInfobar:(InfobarType)infobarType { @@ -267,6 +273,14 @@ #pragma mark - Private +// Presents the Banner for the next InfobarCoordinator in queue, if any. +- (void)presentNextBannerInQueue { + InfobarCoordinator* coordinator = + [self.infobarCoordinatorsToPresent firstObject]; + if (coordinator) + [self presentBannerForInfobarCoordinator:coordinator]; +} + // Presents the infobarBanner for |infobarCoordinator| if possible, if not it // queues the banner in self.infobarCoordinatorsToPresent for future // presentation.
diff --git a/ios/chrome/browser/ui/infobars/infobar_egtest.mm b/ios/chrome/browser/ui/infobars/infobar_egtest.mm index 0d973120..cc6a376 100644 --- a/ios/chrome/browser/ui/infobars/infobar_egtest.mm +++ b/ios/chrome/browser/ui/infobars/infobar_egtest.mm
@@ -5,10 +5,16 @@ #import <XCTest/XCTest.h> #include "base/strings/sys_string_conversions.h" +#import "base/test/ios/wait_util.h" +#include "base/test/scoped_feature_list.h" +#include "components/infobars/core/infobar_feature.h" +#import "ios/chrome/browser/ui/infobars/banners/infobar_banner_constants.h" +#import "ios/chrome/browser/ui/infobars/infobar_constants.h" #import "ios/chrome/browser/ui/infobars/infobar_manager_app_interface.h" #import "ios/chrome/test/earl_grey/chrome_earl_grey.h" #import "ios/chrome/test/earl_grey/chrome_matchers.h" #import "ios/chrome/test/earl_grey/chrome_test_case.h" +#import "ios/testing/earl_grey/app_launch_manager.h" #import "ios/testing/earl_grey/earl_grey_test.h" #import "ios/web/public/test/http_server/http_server.h" #include "ios/web/public/test/http_server/http_server_util.h" @@ -28,20 +34,18 @@ GREY_STUB_CLASS_IN_APP_MAIN_QUEUE(InfobarManagerAppInterface); #endif // defined(CHROME_EARL_GREY_2) -namespace { +using base::test::ios::WaitUntilConditionOrTimeout; -// Timeout for how long to wait for an infobar to appear or disapper. -const CFTimeInterval kTimeout = 4.0; +namespace { // Verifies that a single TestInfoBar with |message| is either present or absent // on the current tab. void VerifyTestInfoBarVisibleForCurrentTab(bool visible, NSString* message) { - id<GREYMatcher> expected_visibility = - visible ? grey_minimumVisiblePercent(1.0f) : grey_notVisible(); NSString* condition_name = visible ? @"Waiting for infobar to show" : @"Waiting for infobar to hide"; - + id<GREYMatcher> expected_visibility = visible ? grey_notNil() : grey_nil(); #if defined(CHROME_EARL_GREY_1) + CFTimeInterval kTimeout = 4.0; [[GREYCondition conditionWithName:condition_name block:^BOOL { @@ -54,20 +58,20 @@ return error == nil; }] waitWithTimeout:kTimeout]; #elif defined(CHROME_EARL_GREY_2) - GREYAssertTrue( - [[GREYCondition - conditionWithName:condition_name - block:^BOOL { - NSError* error = nil; - [[EarlGrey - selectElementWithMatcher: - chrome_test_util:: - StaticTextWithAccessibilityLabel(message)] - assertWithMatcher:expected_visibility - error:&error]; - return error == nil; - }] waitWithTimeout:kTimeout], - condition_name); + BOOL bannerShown = WaitUntilConditionOrTimeout( + kInfobarBannerDefaultPresentationDurationInSeconds, ^{ + NSError* error = nil; + [[EarlGrey + selectElementWithMatcher:grey_allOf( + grey_accessibilityID( + kInfobarBannerViewIdentifier), + grey_accessibilityLabel(message), nil)] + assertWithMatcher:expected_visibility + error:&error]; + return error == nil; + }); + + GREYAssertTrue(bannerShown, condition_name); #else #error Must define either CHROME_EARL_GREY_1 or CHROME_EARL_GREY_2. #endif @@ -79,12 +83,18 @@ @interface InfobarTestCase : ChromeTestCase @end -@implementation InfobarTestCase +@implementation InfobarTestCase { + base::test::ScopedFeatureList _featureList; +} + +- (AppLaunchConfiguration)appConfigurationForTestCase { + AppLaunchConfiguration config; + config.features_enabled.push_back(kIOSInfobarUIReboot); + return config; +} // Tests that page infobars don't persist on navigation. - (void)testInfobarsDismissOnNavigate { - web::test::SetUpFileBasedHttpServer(); - // Open a new tab and navigate to the test page. const GURL testURL = web::test::HttpServer::MakeUrl( "http://ios/testing/data/http_server_files/pony.html"); @@ -118,7 +128,6 @@ "http://ios/testing/data/http_server_files/destination.html"); const GURL ponyURL = web::test::HttpServer::MakeUrl( "http://ios/testing/data/http_server_files/pony.html"); - web::test::SetUpFileBasedHttpServer(); // Create the first tab and navigate to the test page. [ChromeEarlGrey loadURL:destinationURL]; @@ -151,19 +160,13 @@ // navigation does not hide the infobar in the second tab. [ChromeEarlGrey loadURL:ponyURL]; - // Close the first tab. Verify that there is only one tab remaining and its - // infobar is visible. + // Close the first tab. Verify that there is only one tab remaining. [ChromeEarlGrey closeCurrentTab]; [ChromeEarlGrey waitForMainTabCount:1]; - VerifyTestInfoBarVisibleForCurrentTab(true, infoBarMessage); - GREYAssertTrue([InfobarManagerAppInterface verifyInfobarCount:1], - @"Incorrect number of infobars."); } // Tests that the Infobar dissapears once the "OK" button is tapped. - (void)testInfobarButtonDismissal { - web::test::SetUpFileBasedHttpServer(); - // Open a new tab and navigate to the test page. const GURL testURL = web::test::HttpServer::MakeUrl( "http://ios/testing/data/http_server_files/pony.html"); @@ -194,7 +197,10 @@ // Tests adding an Infobar on top of an existing one. - (void)testInfobarTopMostVisible { - web::test::SetUpFileBasedHttpServer(); +// Turn on Messages UI. +#if defined(CHROME_EARL_GREY_1) + _featureList.InitAndEnableFeature(kIOSInfobarUIReboot); +#endif // Open a new tab and navigate to the test page. const GURL testURL = web::test::HttpServer::MakeUrl( @@ -224,15 +230,21 @@ [InfobarManagerAppInterface addTestInfoBarToCurrentTabWithMessage:secondInfoBarMessage], @"Failed to add infobar to test tab."); - VerifyTestInfoBarVisibleForCurrentTab(true, secondInfoBarMessage); - VerifyTestInfoBarVisibleForCurrentTab(false, firstInfoBarMessage); GREYAssertTrue([InfobarManagerAppInterface verifyInfobarCount:2], @"Incorrect number of infobars."); + VerifyTestInfoBarVisibleForCurrentTab(false, firstInfoBarMessage); + VerifyTestInfoBarVisibleForCurrentTab(true, secondInfoBarMessage); + // Confirm infobars are destroyed after their banners are dismissed. + GREYAssertTrue([InfobarManagerAppInterface verifyInfobarCount:1], + @"Incorrect number of infobars."); } // Tests that a taller Infobar layout is correct and the OK button is tappable. - (void)testInfobarTallerLayout { - web::test::SetUpFileBasedHttpServer(); + // Turn on Messages UI. +#if defined(CHROME_EARL_GREY_1) + _featureList.InitAndEnableFeature(kIOSInfobarUIReboot); +#endif // Open a new tab and navigate to the test page. const GURL testURL = web::test::HttpServer::MakeUrl( @@ -264,58 +276,4 @@ GREYAssertTrue([InfobarManagerAppInterface verifyInfobarCount:0], @"Incorrect number of infobars."); } - -// Tests that adding an Infobar of lower height on top of a taller Infobar only -// displays the top shorter one, and that after dismissing the shorter Infobar -// the taller infobar is now completely displayed again. -- (void)testInfobarTopMostVisibleHeight { - web::test::SetUpFileBasedHttpServer(); - - // Open a new tab and navigate to the test page. - const GURL testURL = web::test::HttpServer::MakeUrl( - "http://ios/testing/data/http_server_files/pony.html"); - [ChromeEarlGrey loadURL:testURL]; - [ChromeEarlGrey waitForMainTabCount:1]; - - // First Infobar Message - NSString* firstInfoBarMessage = - @"This is a really long message that will cause this infobar height to " - @"increase since Confirm Infobar heights changes depending on its " - @"message."; - - // Add a test infobar to the current tab. Verify that the infobar is present - // in the model and that the infobar view is visible on screen. - GREYAssertTrue([InfobarManagerAppInterface - addTestInfoBarToCurrentTabWithMessage:firstInfoBarMessage], - @"Failed to add infobar to test tab."); - VerifyTestInfoBarVisibleForCurrentTab(true, firstInfoBarMessage); - GREYAssertTrue([InfobarManagerAppInterface verifyInfobarCount:1], - @"Incorrect number of infobars."); - - // Second Infobar Message - NSString* secondInfoBarMessage = @"TestSecondInfoBar"; - - // Add a second test infobar to the current tab. Verify that the infobar is - // present in the model, and that only this second infobar is now visible on - // screen. - GREYAssertTrue( - [InfobarManagerAppInterface - addTestInfoBarToCurrentTabWithMessage:secondInfoBarMessage], - @"Failed to add infobar to test tab."); - VerifyTestInfoBarVisibleForCurrentTab(true, secondInfoBarMessage); - VerifyTestInfoBarVisibleForCurrentTab(false, firstInfoBarMessage); - GREYAssertTrue([InfobarManagerAppInterface verifyInfobarCount:2], - @"Incorrect number of infobars."); - - // Dismiss the second Infobar. - [[EarlGrey - selectElementWithMatcher:grey_allOf(grey_buttonTitle(@"OK"), - grey_sufficientlyVisible(), nil)] - performAction:grey_tap()]; - VerifyTestInfoBarVisibleForCurrentTab(false, secondInfoBarMessage); - VerifyTestInfoBarVisibleForCurrentTab(true, firstInfoBarMessage); - GREYAssertTrue([InfobarManagerAppInterface verifyInfobarCount:1], - @"Incorrect number of infobars."); -} - @end
diff --git a/ios/chrome/browser/ui/toolbar/adaptive_toolbar_egtest.mm b/ios/chrome/browser/ui/toolbar/adaptive_toolbar_egtest.mm index 8cb42db..acfffcc 100644 --- a/ios/chrome/browser/ui/toolbar/adaptive_toolbar_egtest.mm +++ b/ios/chrome/browser/ui/toolbar/adaptive_toolbar_egtest.mm
@@ -48,7 +48,6 @@ const char kPageURL2[] = "/test-page-2.html"; const char kPageURL3[] = "/test-page-3.html"; const char kLinkID[] = "linkID"; -const char kTextID[] = "textID"; const char kPageLoadedString[] = "Page loaded!"; // The title of the test infobar. @@ -73,18 +72,6 @@ return std::move(http_response); } -// Provides response for a very tall page. -std::unique_ptr<net::test_server::HttpResponse> TallPageResponse( - const net::test_server::HttpRequest& request) { - std::unique_ptr<net::test_server::BasicHttpResponse> http_response = - std::make_unique<net::test_server::BasicHttpResponse>(); - http_response->set_code(net::HTTP_OK); - http_response->set_content( - "<html><body><p style=\"height:2000pt\"></p><p id=\"" + - std::string(kTextID) + "\">" + kPageLoadedString + "</p></body></html>"); - return std::move(http_response); -} - // Returns a matcher for the bookmark button. id<GREYMatcher> BookmarkButton() { return chrome_test_util::ButtonWithAccessibilityLabelId(IDS_TOOLTIP_STAR); @@ -541,100 +528,6 @@ CheckToolbarButtonVisibility(originalTraitCollection, YES); } -// Tests the interactions between the infobars and the bottom toolbar during -// fullscreen. -- (void)testInfobarFullscreen { - if (![ChromeEarlGrey isSplitToolbarMode]) { - // The interaction between the infobar and fullscreen only happens in split - // toolbar mode. - return; - } - - // Setup the server. - self.testServer->RegisterRequestHandler( - base::BindRepeating(&TallPageResponse)); - GREYAssertTrue(self.testServer->Start(), @"Test server failed to start."); - - // Navigate to a page. - [ChromeEarlGrey loadURL:self.testServer->GetURL(kPageURL)]; - - GREYAssert( - [AdaptiveToolbarAppInterface addInfobarWithTitle:kTestInfoBarTitle], - @"Fail to create infobar."); - - GREYAssert( - [[GREYCondition - conditionWithName:@"Waiting for infobar to show" - block:^BOOL { - NSError* error = nil; - [[EarlGrey selectElementWithMatcher: - chrome_test_util:: - StaticTextWithAccessibilityLabel( - kTestInfoBarTitle)] - assertWithMatcher:grey_sufficientlyVisible() - error:&error]; - return error == nil; - }] waitWithTimeout:4], - @"Infobar did not show."); - - // Check that the button is visible. - [[EarlGrey selectElementWithMatcher:chrome_test_util::OKButton()] - assertWithMatcher:grey_sufficientlyVisible()]; - -#if defined(CHROME_EARL_GREY_1) - UIWindow* window = [[UIApplication sharedApplication] keyWindow]; -#else - UIWindow* window = - [[GREY_REMOTE_CLASS_IN_APP(UIApplication) sharedApplication] keyWindow]; -#endif - - GREYElementMatcherBlock* positionMatcher = [GREYElementMatcherBlock - matcherWithMatchesBlock:^BOOL(UIView* element) { - UILayoutGuide* guide = - [ChromeEarlGreyAppInterface guideWithName:kSecondaryToolbarGuide - view:element]; - - CGFloat toolbarTopPoint = CGRectGetMinY( - [window convertRect:guide.layoutFrame fromView:guide.owningView]); - CGFloat buttonBottomPoint = CGRectGetMaxY( - [window convertRect:element.frame fromView:element.superview]); - - CGFloat bottomSafeArea = CGFLOAT_MAX; - bottomSafeArea = CGRectGetMaxY(window.safeAreaLayoutGuide.layoutFrame); - CGFloat infobarContentBottomPoint = - MIN(bottomSafeArea, toolbarTopPoint); - BOOL buttonIsAbove = buttonBottomPoint < infobarContentBottomPoint - 10; - BOOL buttonIsNear = buttonBottomPoint > infobarContentBottomPoint - 30; - return buttonIsAbove && buttonIsNear; - } - descriptionBlock:^void(id<GREYDescription> description) { - [description - appendText:@"Infobar is position on top of the bottom toolbar."]; - }]; - - // Check that the button is positionned above the bottom toolbar. - [[EarlGrey selectElementWithMatcher:chrome_test_util::OKButton()] - assertWithMatcher:positionMatcher]; - - // Scroll down - [[EarlGrey selectElementWithMatcher:WebStateScrollViewMatcher()] - performAction:grey_swipeFastInDirection(kGREYDirectionUp)]; - - // Check that the button is visible. - [[EarlGrey selectElementWithMatcher:chrome_test_util::OKButton()] - assertWithMatcher:grey_sufficientlyVisible()]; - - // Check that the secondary toolbar is not visible. - [[EarlGrey - selectElementWithMatcher:grey_kindOfClassName(@"SecondaryToolbarView")] - assertWithMatcher:grey_not(grey_sufficientlyVisible())]; - - // Check that the button is positionned above the bottom toolbar (i.e. at the - // bottom). - [[EarlGrey selectElementWithMatcher:chrome_test_util::OKButton()] - assertWithMatcher:positionMatcher]; -} - // Verifies that the back/forward buttons are working and are correctly enabled // during navigations. - (void)testNavigationButtons {
diff --git a/ios/testing/earl_grey/coverage_utils.mm b/ios/testing/earl_grey/coverage_utils.mm index ded91960..02f921b 100644 --- a/ios/testing/earl_grey/coverage_utils.mm +++ b/ios/testing/earl_grey/coverage_utils.mm
@@ -4,15 +4,15 @@ #import "ios/testing/earl_grey/coverage_utils.h" -#include "base/clang_coverage_buildflags.h" +#include "base/clang_profiling_buildflags.h" #import "testing/coverage_util_ios.h" #if !defined(__has_feature) || !__has_feature(objc_arc) #error "This file requires ARC support." #endif -#if BUILDFLAG(CLANG_COVERAGE) -#include "base/test/clang_coverage.h" +#if BUILDFLAG(CLANG_PROFILING) +#include "base/test/profiling_utils.h" extern "C" void __llvm_profile_reset_counters(void); #endif @@ -23,17 +23,17 @@ } + (void)resetCoverageProfileCounters { -#if BUILDFLAG(CLANG_COVERAGE) +#if BUILDFLAG(CLANG_PROFILING) // In this call, the already-dump flag is also reset, so that the same file // can be dumped to again. __llvm_profile_reset_counters(); -#endif // BUILDFLAG(CLANG_COVERAGE) +#endif // BUILDFLAG(CLANG_PROFILING) } + (void)writeClangCoverageProfile { -#if BUILDFLAG(CLANG_COVERAGE) - base::WriteClangCoverageProfile(); -#endif // BUILDFLAG(CLANG_COVERAGE) +#if BUILDFLAG(CLANG_PROFILING) + base::WriteClangProfilingProfile(); +#endif // BUILDFLAG(CLANG_PROFILING) } @end
diff --git a/media/filters/chunk_demuxer_unittest.cc b/media/filters/chunk_demuxer_unittest.cc index a28cf6a6..dc2e68e57 100644 --- a/media/filters/chunk_demuxer_unittest.cc +++ b/media/filters/chunk_demuxer_unittest.cc
@@ -654,14 +654,16 @@ ASSERT_FALSE(AppendData(garbage_cluster.get(), garbage_cluster_size)); } - PipelineStatusCB CreateInitDoneCB(const base::TimeDelta& expected_duration, - PipelineStatus expected_status) { + PipelineStatusCallback CreateInitDoneCallback( + base::TimeDelta expected_duration, + PipelineStatus expected_status) { if (expected_duration != kNoTimestamp) EXPECT_CALL(host_, SetDuration(expected_duration)); - return CreateInitDoneCB(expected_status); + return CreateInitDoneCallback(expected_status); } - PipelineStatusCB CreateInitDoneCB(PipelineStatus expected_status) { + PipelineStatusCallback CreateInitDoneCallback( + PipelineStatus expected_status) { EXPECT_CALL(*this, DemuxerInitialized(expected_status)); return base::Bind(&ChunkDemuxerTest::DemuxerInitialized, base::Unretained(this)); @@ -712,10 +714,10 @@ .Times(Exactly(need_key_count)); } - // Adding expectations prior to CreateInitDoneCB() here because InSequence - // tests require init segment received before duration set. Also, only - // expect an init segment received callback if there is actually a track in - // it. + // Adding expectations prior to CreateInitDoneCallback() here because + // InSequence tests require init segment received before duration set. Also, + // only expect an init segment received callback if there is actually a + // track in it. if (stream_flags != 0) { ExpectInitMediaLogs(stream_flags); EXPECT_CALL(*this, InitSegmentReceivedMock(_)); @@ -726,8 +728,8 @@ EXPECT_MEDIA_LOG(StreamParsingFailed()); } - demuxer_->Initialize(&host_, - CreateInitDoneCB(expected_duration, expected_status)); + demuxer_->Initialize( + &host_, CreateInitDoneCallback(expected_duration, expected_status)); if (AddId(kSourceId, stream_flags) != ChunkDemuxer::kOk) return false; @@ -739,8 +741,8 @@ bool InitDemuxerAudioAndVideoSourcesText(const std::string& audio_id, const std::string& video_id) { EXPECT_CALL(*this, DemuxerOpened()); - demuxer_->Initialize(&host_, - CreateInitDoneCB(kDefaultDuration(), PIPELINE_OK)); + demuxer_->Initialize( + &host_, CreateInitDoneCallback(kDefaultDuration(), PIPELINE_OK)); if (AddId(audio_id, HAS_AUDIO) != ChunkDemuxer::kOk) return false; @@ -752,7 +754,8 @@ // Note: Unlike InitDemuxerWithEncryptionInfo, this method is currently // incompatible with InSequence tests. Refactoring of the duration - // set expectation to not be added during CreateInitDoneCB() could fix this. + // set expectation to not be added during CreateInitDoneCallback() could fix + // this. ExpectInitMediaLogs(audio_flags); EXPECT_CALL(*this, InitSegmentReceivedMock(_)); EXPECT_TRUE(AppendInitSegmentWithSourceId(audio_id, audio_flags)); @@ -791,13 +794,13 @@ EXPECT_CALL(*this, DemuxerOpened()); - // Adding expectation prior to CreateInitDoneCB() here because InSequence - // tests require init segment received before duration set. + // Adding expectation prior to CreateInitDoneCallback() here because + // InSequence tests require init segment received before duration set. ExpectInitMediaLogs(HAS_AUDIO | HAS_VIDEO); EXPECT_CALL(*this, InitSegmentReceivedMock(_)); demuxer_->Initialize( - &host_, - CreateInitDoneCB(base::TimeDelta::FromMilliseconds(2744), PIPELINE_OK)); + &host_, CreateInitDoneCallback(base::TimeDelta::FromMilliseconds(2744), + PIPELINE_OK)); if (AddId(kSourceId, HAS_AUDIO | HAS_VIDEO) != ChunkDemuxer::kOk) return false; @@ -1167,7 +1170,7 @@ const base::TimeDelta& duration, int stream_flags) { EXPECT_CALL(*this, DemuxerOpened()); - demuxer_->Initialize(&host_, CreateInitDoneCB(duration, PIPELINE_OK)); + demuxer_->Initialize(&host_, CreateInitDoneCallback(duration, PIPELINE_OK)); if (AddId(kSourceId, stream_flags) != ChunkDemuxer::kOk) return false; @@ -1899,7 +1902,7 @@ TEST_F(ChunkDemuxerTest, AppendingInPieces) { EXPECT_CALL(*this, DemuxerOpened()); demuxer_->Initialize(&host_, - CreateInitDoneCB(kDefaultDuration(), PIPELINE_OK)); + CreateInitDoneCallback(kDefaultDuration(), PIPELINE_OK)); ASSERT_EQ(AddId(), ChunkDemuxer::kOk); @@ -2094,7 +2097,7 @@ EXPECT_CALL(*this, DemuxerOpened()); demuxer_->Initialize( &host_, - CreateInitDoneCB(kNoTimestamp, CHUNK_DEMUXER_ERROR_APPEND_FAILED)); + CreateInitDoneCallback(kNoTimestamp, CHUNK_DEMUXER_ERROR_APPEND_FAILED)); ASSERT_EQ(AddId(), ChunkDemuxer::kOk); @@ -2109,7 +2112,7 @@ EXPECT_CALL(*this, DemuxerOpened()); demuxer_->Initialize( &host_, - CreateInitDoneCB(kNoTimestamp, CHUNK_DEMUXER_ERROR_APPEND_FAILED)); + CreateInitDoneCallback(kNoTimestamp, CHUNK_DEMUXER_ERROR_APPEND_FAILED)); ASSERT_EQ(AddId(kSourceId, "audio/webm", "vorbis"), ChunkDemuxer::kOk); @@ -2123,7 +2126,7 @@ EXPECT_CALL(*this, DemuxerOpened()); demuxer_->Initialize( &host_, - CreateInitDoneCB(kNoTimestamp, CHUNK_DEMUXER_ERROR_APPEND_FAILED)); + CreateInitDoneCallback(kNoTimestamp, CHUNK_DEMUXER_ERROR_APPEND_FAILED)); ASSERT_EQ(AddId(kSourceId, "video/webm", "vp8"), ChunkDemuxer::kOk); @@ -2138,7 +2141,7 @@ EXPECT_CALL(*this, DemuxerOpened()); demuxer_->Initialize( &host_, - CreateInitDoneCB(kNoTimestamp, CHUNK_DEMUXER_ERROR_APPEND_FAILED)); + CreateInitDoneCallback(kNoTimestamp, CHUNK_DEMUXER_ERROR_APPEND_FAILED)); ASSERT_EQ(AddId(kSourceId, "video/webm", "vorbis,vp8"), ChunkDemuxer::kOk); @@ -2153,7 +2156,7 @@ EXPECT_CALL(*this, DemuxerOpened()); demuxer_->Initialize( &host_, - CreateInitDoneCB(kNoTimestamp, CHUNK_DEMUXER_ERROR_APPEND_FAILED)); + CreateInitDoneCallback(kNoTimestamp, CHUNK_DEMUXER_ERROR_APPEND_FAILED)); ASSERT_EQ(AddId(kSourceId, "video/webm", "vorbis,vp8"), ChunkDemuxer::kOk); @@ -2214,7 +2217,7 @@ TEST_F(ChunkDemuxerTest, AddIdFailures) { EXPECT_CALL(*this, DemuxerOpened()); demuxer_->Initialize(&host_, - CreateInitDoneCB(kDefaultDuration(), PIPELINE_OK)); + CreateInitDoneCallback(kDefaultDuration(), PIPELINE_OK)); std::string audio_id = "audio1"; std::string video_id = "video1"; @@ -3155,7 +3158,7 @@ EXPECT_FOUND_CODEC_NAME(Audio, "aac"); EXPECT_FOUND_CODEC_NAME(Video, "h264"); demuxer_->Initialize(&host_, - CreateInitDoneCB(kInfiniteDuration, PIPELINE_OK)); + CreateInitDoneCallback(kInfiniteDuration, PIPELINE_OK)); EXPECT_EQ(ChunkDemuxer::kOk, AddId(kSourceId, kMp2tMimeType, kMp2tCodecs)); // For info: @@ -3219,7 +3222,7 @@ EXPECT_FOUND_CODEC_NAME(Video, "h264"); EXPECT_FOUND_CODEC_NAME(Audio, "aac"); demuxer_->Initialize(&host_, - CreateInitDoneCB(kInfiniteDuration, PIPELINE_OK)); + CreateInitDoneCallback(kInfiniteDuration, PIPELINE_OK)); EXPECT_EQ(ChunkDemuxer::kOk, AddId(kSourceId, kMp2tMimeType, kMp2tCodecs)); // For info: @@ -3435,7 +3438,8 @@ // the pipeline has a chance to initialize the demuxer. TEST_F(ChunkDemuxerTest, Shutdown_BeforeInitialize) { demuxer_->Shutdown(); - demuxer_->Initialize(&host_, CreateInitDoneCB(DEMUXER_ERROR_COULD_NOT_OPEN)); + demuxer_->Initialize(&host_, + CreateInitDoneCallback(DEMUXER_ERROR_COULD_NOT_OPEN)); base::RunLoop().RunUntilIdle(); } @@ -3868,8 +3872,8 @@ TEST_F(ChunkDemuxerTest, AppendWindow_WebMFile_AudioOnly) { EXPECT_CALL(*this, DemuxerOpened()); demuxer_->Initialize( - &host_, - CreateInitDoneCB(base::TimeDelta::FromMilliseconds(2744), PIPELINE_OK)); + &host_, CreateInitDoneCallback(base::TimeDelta::FromMilliseconds(2744), + PIPELINE_OK)); ASSERT_EQ(ChunkDemuxer::kOk, AddId(kSourceId, HAS_AUDIO)); // Set the append window to [50,150). @@ -3901,8 +3905,8 @@ TEST_F(ChunkDemuxerTest, AppendWindow_AudioConfigUpdateRemovesPreroll) { EXPECT_CALL(*this, DemuxerOpened()); demuxer_->Initialize( - &host_, - CreateInitDoneCB(base::TimeDelta::FromMilliseconds(2744), PIPELINE_OK)); + &host_, CreateInitDoneCallback(base::TimeDelta::FromMilliseconds(2744), + PIPELINE_OK)); ASSERT_EQ(ChunkDemuxer::kOk, AddId(kSourceId, HAS_AUDIO)); // Set the append window such that the first file is completely before the @@ -4451,7 +4455,8 @@ CreateNewDemuxer(); EXPECT_CALL(*this, DemuxerOpened()); EXPECT_CALL(host_, SetDuration(_)).Times(2); - demuxer_->Initialize(&host_, CreateInitDoneCB(kNoTimestamp, PIPELINE_OK)); + demuxer_->Initialize(&host_, + CreateInitDoneCallback(kNoTimestamp, PIPELINE_OK)); const char* kId1 = "id1"; const char* kId2 = "id2"; @@ -4475,7 +4480,7 @@ CreateNewDemuxer(); EXPECT_CALL(*this, DemuxerOpened()); demuxer_->Initialize(&host_, - CreateInitDoneCB(kDefaultDuration(), PIPELINE_OK)); + CreateInitDoneCallback(kDefaultDuration(), PIPELINE_OK)); // Add two ids, then remove one of the ids and verify that adding init segment // only for the remaining id still triggers the InitDoneCB. @@ -4497,7 +4502,7 @@ CreateNewDemuxer(); EXPECT_CALL(*this, DemuxerOpened()); demuxer_->Initialize(&host_, - CreateInitDoneCB(kDefaultDuration(), PIPELINE_OK)); + CreateInitDoneCallback(kDefaultDuration(), PIPELINE_OK)); const char* kId1 = "id1"; EXPECT_EQ(AddId(kId1, "video/webm", "vorbis,vp8"), ChunkDemuxer::kOk); @@ -4565,7 +4570,7 @@ EXPECT_MEDIA_LOG(StreamParsingFailed()); demuxer_->Initialize( &host_, - CreateInitDoneCB(kNoTimestamp, CHUNK_DEMUXER_ERROR_APPEND_FAILED)); + CreateInitDoneCallback(kNoTimestamp, CHUNK_DEMUXER_ERROR_APPEND_FAILED)); ASSERT_EQ(AddId(kSourceId, HAS_AUDIO | HAS_VIDEO), ChunkDemuxer::kOk); AppendGarbage();
diff --git a/media/filters/decoder_selector.cc b/media/filters/decoder_selector.cc index c7a84f0b..44cadaf 100644 --- a/media/filters/decoder_selector.cc +++ b/media/filters/decoder_selector.cc
@@ -198,7 +198,7 @@ decrypting_demuxer_stream_->Initialize( stream_, cdm_context_, - base::BindRepeating( + base::BindOnce( &DecoderSelector<StreamType>::OnDecryptingDemuxerStreamInitializeDone, weak_this_factory_.GetWeakPtr())); }
diff --git a/media/filters/decrypting_demuxer_stream.cc b/media/filters/decrypting_demuxer_stream.cc index cde1a934..8d5b39e 100644 --- a/media/filters/decrypting_demuxer_stream.cc +++ b/media/filters/decrypting_demuxer_stream.cc
@@ -39,7 +39,7 @@ void DecryptingDemuxerStream::Initialize(DemuxerStream* stream, CdmContext* cdm_context, - const PipelineStatusCB& status_cb) { + PipelineStatusCallback status_cb) { DVLOG(2) << __func__; DCHECK(task_runner_->BelongsToCurrentThread()); DCHECK_EQ(state_, kUninitialized) << state_; @@ -49,7 +49,7 @@ weak_this_ = weak_factory_.GetWeakPtr(); demuxer_stream_ = stream; - init_cb_ = BindToCurrentLoop(status_cb); + init_cb_ = BindToCurrentLoop(std::move(status_cb)); InitializeDecoderConfig();
diff --git a/media/filters/decrypting_demuxer_stream.h b/media/filters/decrypting_demuxer_stream.h index eb86d9e4..5663d0f 100644 --- a/media/filters/decrypting_demuxer_stream.h +++ b/media/filters/decrypting_demuxer_stream.h
@@ -43,7 +43,7 @@ // |stream| must be encrypted and |cdm_context| must be non-null. void Initialize(DemuxerStream* stream, CdmContext* cdm_context, - const PipelineStatusCB& status_cb); + PipelineStatusCallback status_cb); // Cancels all pending operations and fires all pending callbacks. If in // kPendingDemuxerRead or kPendingDecrypt state, waits for the pending @@ -149,7 +149,7 @@ State state_ = kUninitialized; - PipelineStatusCB init_cb_; + PipelineStatusCallback init_cb_; ReadCB read_cb_; base::OnceClosure reset_cb_;
diff --git a/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc b/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc index e13fbc3..712f969 100644 --- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc +++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
@@ -11,7 +11,7 @@ #include <sys/types.h> #include <unistd.h> -#include "base/clang_coverage_buildflags.h" +#include "base/clang_profiling_buildflags.h" #include "base/logging.h" #include "build/build_config.h" #include "sandbox/linux/bpf_dsl/bpf_dsl.h" @@ -128,7 +128,7 @@ #endif // defined(ADDRESS_SANITIZER) || defined(THREAD_SANITIZER) || // defined(MEMORY_SANITIZER) -#if BUILDFLAG(CLANG_COVERAGE_INSIDE_SANDBOX) +#if BUILDFLAG(CLANG_PROFILING_INSIDE_SANDBOX) if (SyscallSets::IsPrctl(sysno)) { return Allow(); }
diff --git a/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc b/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc index ddf69c49..fc36187c 100644 --- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc +++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
@@ -24,7 +24,7 @@ #include <time.h> #include <unistd.h> -#include "base/clang_coverage_buildflags.h" +#include "base/clang_profiling_buildflags.h" #include "base/files/scoped_file.h" #include "base/macros.h" #include "base/posix/eintr_wrapper.h" @@ -345,7 +345,7 @@ #define PR_CAPBSET_READ 23 #endif -#if !BUILDFLAG(CLANG_COVERAGE_INSIDE_SANDBOX) +#if !BUILDFLAG(CLANG_PROFILING_INSIDE_SANDBOX) BPF_DEATH_TEST_C(BaselinePolicy, PrctlSigsys, DEATH_SEGV_MESSAGE(GetPrctlErrorMessageContentForTests()),
diff --git a/services/device/generic_sensor/platform_sensor_and_provider_unittest_win.cc b/services/device/generic_sensor/platform_sensor_and_provider_unittest_win.cc index a0a51cfe..4e7d5859 100644 --- a/services/device/generic_sensor/platform_sensor_and_provider_unittest_win.cc +++ b/services/device/generic_sensor/platform_sensor_and_provider_unittest_win.cc
@@ -7,12 +7,8 @@ #include <wrl/implements.h> #include "base/bind.h" -#include "base/bind_helpers.h" -#include "base/metrics/statistics_recorder.h" #include "base/numerics/math_constants.h" #include "base/run_loop.h" -#include "base/test/bind_test_util.h" -#include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "base/win/propvarutil.h" #include "base/win/scoped_com_initializer.h" @@ -785,105 +781,4 @@ EXPECT_FALSE(quaternion_sensor); } -// Tests the sensor activation histogram tracks sensor activation return -// codes correctly. -TEST_F(PlatformSensorAndProviderTestWin, CheckSensorActivationHistogram) { - base::HistogramTester histogram_tester; - - // Trigger ERROR_NOT_FOUND - SetUnsupportedSensor(SENSOR_TYPE_AMBIENT_LIGHT); - auto sensor = CreateSensor(SensorType::AMBIENT_LIGHT); - EXPECT_FALSE(sensor); - EXPECT_EQ(histogram_tester.GetBucketCount( - "Sensors.Windows.ISensor.Activation.Result", - HRESULT_FROM_WIN32(ERROR_NOT_FOUND)), - 1); - - // Trigger S_OK - SetSupportedSensor(SENSOR_TYPE_AMBIENT_LIGHT); - sensor = CreateSensor(SensorType::AMBIENT_LIGHT); - EXPECT_TRUE(sensor); - EXPECT_EQ(histogram_tester.GetBucketCount( - "Sensors.Windows.ISensor.Activation.Result", S_OK), - 1); - - histogram_tester.ExpectTotalCount("Sensors.Windows.ISensor.Activation.Result", - 2); -} - -// Tests the sensor start histogram tracks sensor start return codes -// correctly. -TEST_F(PlatformSensorAndProviderTestWin, CheckSensorStartHistogram) { - base::HistogramTester histogram_tester; - - SetSupportedSensor(SENSOR_TYPE_AMBIENT_LIGHT); - auto sensor = CreateSensor(SensorType::AMBIENT_LIGHT); - EXPECT_TRUE(sensor); - auto client = std::make_unique<NiceMock<MockPlatformSensorClient>>(sensor); - PlatformSensorConfiguration configuration(10); - - // Trigger S_OK - EXPECT_TRUE(sensor->StartListening(client.get(), configuration)); - EXPECT_TRUE(sensor->StopListening(client.get(), configuration)); - base::Optional<base::RunLoop> run_loop; - run_loop.emplace(); - provider_->GetComStaTaskRunnerForTesting()->PostTaskAndReply( - FROM_HERE, base::DoNothing(), run_loop->QuitClosure()); - run_loop->Run(); - EXPECT_EQ(histogram_tester.GetBucketCount( - "Sensors.Windows.ISensor.Start.Result", S_OK), - 1); - - // Trigger E_OUTOFMEMORY - ON_CALL(*(sensor_.Get()), SetEventSink(NotNull())) - .WillByDefault(Invoke([](ISensorEvents*) { return E_OUTOFMEMORY; })); - - // StartListening() swallows SetEventSink() errors so this will return - // true even if the sensor failed to start. - EXPECT_TRUE(sensor->StartListening(client.get(), configuration)); - EXPECT_TRUE(sensor->StopListening(client.get(), configuration)); - run_loop.emplace(); - provider_->GetComStaTaskRunnerForTesting()->PostTaskAndReply( - FROM_HERE, base::DoNothing(), run_loop->QuitClosure()); - run_loop->Run(); - EXPECT_EQ(histogram_tester.GetBucketCount( - "Sensors.Windows.ISensor.Start.Result", E_OUTOFMEMORY), - 1); - - histogram_tester.ExpectTotalCount("Sensors.Windows.ISensor.Start.Result", 2); -} - -// Tests the sensor stop histogram tracks sensor stop return codes -// correctly. -TEST_F(PlatformSensorAndProviderTestWin, CheckSensorStopHistogram) { - base::HistogramTester histogram_tester; - - SetSupportedSensor(SENSOR_TYPE_AMBIENT_LIGHT); - auto sensor = CreateSensor(SensorType::AMBIENT_LIGHT); - EXPECT_TRUE(sensor); - auto client = std::make_unique<NiceMock<MockPlatformSensorClient>>(sensor); - PlatformSensorConfiguration configuration(10); - - // Trigger S_OK - EXPECT_TRUE(sensor->StartListening(client.get(), configuration)); - EXPECT_TRUE(sensor->StopListening(client.get(), configuration)); - EXPECT_EQ(histogram_tester.GetBucketCount( - "Sensors.Windows.ISensor.Stop.Result", S_OK), - 1); - - // Trigger E_POINTER - ON_CALL(*(sensor_.Get()), SetEventSink(IsNull())) - .WillByDefault(Invoke([&](ISensorEvents*) { return E_POINTER; })); - - // StopListening() swallows SetEventSink() errors so this will return - // true even if the sensor failed to start. - EXPECT_TRUE(sensor->StartListening(client.get(), configuration)); - EXPECT_TRUE(sensor->StopListening(client.get(), configuration)); - EXPECT_EQ(histogram_tester.GetBucketCount( - "Sensors.Windows.ISensor.Stop.Result", E_POINTER), - 1); - - histogram_tester.ExpectTotalCount("Sensors.Windows.ISensor.Stop.Result", 2); -} - } // namespace device
diff --git a/services/device/generic_sensor/platform_sensor_reader_win.cc b/services/device/generic_sensor/platform_sensor_reader_win.cc index 5ddbb0b..4111af1 100644 --- a/services/device/generic_sensor/platform_sensor_reader_win.cc +++ b/services/device/generic_sensor/platform_sensor_reader_win.cc
@@ -13,7 +13,6 @@ #include "base/bind.h" #include "base/memory/ptr_util.h" -#include "base/metrics/histogram_functions.h" #include "base/numerics/math_constants.h" #include "base/stl_util.h" #include "base/threading/thread_task_runner_handle.h" @@ -392,7 +391,6 @@ Microsoft::WRL::ComPtr<ISensorCollection> sensor_collection; HRESULT hr = sensor_manager->GetSensorsByType( sensor_type, sensor_collection.GetAddressOf()); - base::UmaHistogramSparse("Sensors.Windows.ISensor.Activation.Result", hr); if (FAILED(hr) || !sensor_collection) return sensor; @@ -426,8 +424,7 @@ void PlatformSensorReaderWin32::StopSensor() { base::AutoLock autolock(lock_); if (sensor_active_) { - HRESULT hr = sensor_->SetEventSink(nullptr); - base::UmaHistogramSparse("Sensors.Windows.ISensor.Stop.Result", hr); + sensor_->SetEventSink(nullptr); sensor_active_ = false; } } @@ -456,7 +453,6 @@ void PlatformSensorReaderWin32::ListenSensorEvent() { // Set event listener. HRESULT hr = sensor_->SetEventSink(event_listener_.Get()); - base::UmaHistogramSparse("Sensors.Windows.ISensor.Start.Result", hr); if (FAILED(hr)) { SensorError(); StopSensor();
diff --git a/services/device/generic_sensor/platform_sensor_reader_winrt.cc b/services/device/generic_sensor/platform_sensor_reader_winrt.cc index 185e3fb..fa980f8 100644 --- a/services/device/generic_sensor/platform_sensor_reader_winrt.cc +++ b/services/device/generic_sensor/platform_sensor_reader_winrt.cc
@@ -6,7 +6,6 @@ #include <cmath> -#include "base/metrics/histogram_functions.h" #include "base/numerics/math_constants.h" #include "base/win/core_winrt_util.h" #include "services/device/generic_sensor/generic_sensor_consts.h" @@ -57,10 +56,6 @@ using Microsoft::WRL::Callback; using Microsoft::WRL::ComPtr; -void RecordSensorStartResult(HRESULT result) { - base::UmaHistogramSparse("Sensors.Windows.WinRT.Start.Result", result); -} - double GetAngleBetweenOrientationSamples(SensorReading reading1, SensorReading reading2) { auto dot_product = reading1.orientation_quat.x * reading2.orientation_quat.x + @@ -173,7 +168,6 @@ hr = sensor_statics->GetDefault(&sensor_); if (FAILED(hr)) { - base::UmaHistogramSparse("Sensors.Windows.WinRT.Activation.Result", hr); DLOG(ERROR) << "Failed to query default sensor: " << logging::SystemErrorCodeToString(hr); return false; @@ -181,17 +175,10 @@ // GetDefault() returns null if the sensor does not exist if (!sensor_) { - // https://docs.microsoft.com/en-us/windows/win32/api/sensorsapi/nf-sensorsapi-isensormanager-getsensorsbytype - // The Win32 flavor returns HRESULT_FROM_WIN32(ERROR_NOT_FOUND) when the - // sensor is not found so log the same error result here as well. - base::UmaHistogramSparse("Sensors.Windows.WinRT.Activation.Result", - HRESULT_FROM_WIN32(ERROR_NOT_FOUND)); VLOG(1) << "Sensor does not exist on system"; return false; } - base::UmaHistogramSparse("Sensors.Windows.WinRT.Activation.Result", S_OK); - minimum_report_interval_ = GetMinimumReportIntervalFromSensor(); if (minimum_report_interval_.is_zero()) @@ -264,7 +251,6 @@ if (FAILED(hr)) { DLOG(ERROR) << "Failed to set report interval: " << logging::SystemErrorCodeToString(hr); - RecordSensorStartResult(hr); return false; } @@ -278,12 +264,10 @@ if (FAILED(hr)) { DLOG(ERROR) << "Failed to add reading callback handler: " << logging::SystemErrorCodeToString(hr); - RecordSensorStartResult(hr); return false; } reading_callback_token_ = event_token; - RecordSensorStartResult(hr); } return true; @@ -306,7 +290,6 @@ HRESULT hr = sensor_->remove_ReadingChanged(reading_callback_token_.value()); - base::UmaHistogramSparse("Sensors.Windows.WinRT.Stop.Result", hr); if (FAILED(hr)) { DLOG(ERROR) << "Failed to remove ALS reading callback handler: " << logging::SystemErrorCodeToString(hr);
diff --git a/services/device/generic_sensor/platform_sensor_reader_winrt_unittests.cc b/services/device/generic_sensor/platform_sensor_reader_winrt_unittests.cc index 1c21181e..80f1327 100644 --- a/services/device/generic_sensor/platform_sensor_reader_winrt_unittests.cc +++ b/services/device/generic_sensor/platform_sensor_reader_winrt_unittests.cc
@@ -8,7 +8,6 @@ #include "base/numerics/math_constants.h" #include "base/test/bind_test_util.h" -#include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "base/win/core_winrt_util.h" #include "base/win/scoped_com_initializer.h" @@ -1728,151 +1727,4 @@ sensor->StopSensor(); } -// Tests the sensor activation histogram tracks sensor activation return -// codes correctly. -TEST_F(PlatformSensorReaderTestWinrt, CheckSensorActivationHistogram) { - auto fake_sensor_factory = Microsoft::WRL::Make<FakeSensorFactoryWinrt< - ABI::Windows::Devices::Sensors::ILightSensorStatics, - ABI::Windows::Devices::Sensors::ILightSensor, - ABI::Windows::Devices::Sensors::LightSensor, - ABI::Windows::Devices::Sensors::ILightSensorReading, - ABI::Windows::Devices::Sensors::ILightSensorReadingChangedEventArgs, - ABI::Windows::Devices::Sensors::LightSensorReadingChangedEventArgs>>(); - - auto sensor = std::make_unique<PlatformSensorReaderWinrtLightSensor>(); - sensor->InitForTesting(base::BindLambdaForTesting( - [&](ABI::Windows::Devices::Sensors::ILightSensorStatics** sensor_factory) - -> HRESULT { return fake_sensor_factory.CopyTo(sensor_factory); })); - base::HistogramTester histogram_tester; - - // Trigger S_OK - EXPECT_TRUE(sensor->Initialize()); - - EXPECT_EQ(histogram_tester.GetBucketCount( - "Sensors.Windows.WinRT.Activation.Result", S_OK), - 1); - - // Trigger HRESULT_FROM_WIN32(ERROR_NOT_FOUND) which happens when the sensor - // does not exist - fake_sensor_factory->fake_sensor_ = nullptr; - EXPECT_EQ(sensor->Initialize(), false); - - EXPECT_EQ( - histogram_tester.GetBucketCount("Sensors.Windows.WinRT.Activation.Result", - HRESULT_FROM_WIN32(ERROR_NOT_FOUND)), - 1); - - // Trigger E_ACCESSDENIED twice - fake_sensor_factory->SetGetDefaultReturnCode(E_ACCESSDENIED); - EXPECT_FALSE(sensor->Initialize()); - - EXPECT_EQ(histogram_tester.GetBucketCount( - "Sensors.Windows.WinRT.Activation.Result", E_ACCESSDENIED), - 1); - - EXPECT_FALSE(sensor->Initialize()); - - EXPECT_EQ(histogram_tester.GetBucketCount( - "Sensors.Windows.WinRT.Activation.Result", E_ACCESSDENIED), - 2); - - histogram_tester.ExpectTotalCount("Sensors.Windows.WinRT.Activation.Result", - 4); -} - -// Tests the sensor start histogram tracks sensor start return codes -// correctly. -TEST_F(PlatformSensorReaderTestWinrt, CheckSensorStartHistogram) { - auto fake_sensor_factory = Microsoft::WRL::Make<FakeSensorFactoryWinrt< - ABI::Windows::Devices::Sensors::ILightSensorStatics, - ABI::Windows::Devices::Sensors::ILightSensor, - ABI::Windows::Devices::Sensors::LightSensor, - ABI::Windows::Devices::Sensors::ILightSensorReading, - ABI::Windows::Devices::Sensors::ILightSensorReadingChangedEventArgs, - ABI::Windows::Devices::Sensors::LightSensorReadingChangedEventArgs>>(); - auto fake_sensor = fake_sensor_factory->fake_sensor_; - - auto sensor = std::make_unique<PlatformSensorReaderWinrtLightSensor>(); - sensor->InitForTesting(base::BindLambdaForTesting( - [&](ABI::Windows::Devices::Sensors::ILightSensorStatics** sensor_factory) - -> HRESULT { return fake_sensor_factory.CopyTo(sensor_factory); })); - EXPECT_TRUE(sensor->Initialize()); - base::HistogramTester histogram_tester; - - // Trigger S_OK - PlatformSensorConfiguration sensor_config(kExpectedReportFrequencySet); - EXPECT_TRUE(sensor->StartSensor(sensor_config)); - sensor->StopSensor(); - EXPECT_EQ(histogram_tester.GetBucketCount( - "Sensors.Windows.WinRT.Start.Result", S_OK), - 1); - - // Trigger E_POINTER due to setting report interval failure - fake_sensor->SetPutReportIntervalReturnCode(E_POINTER); - EXPECT_FALSE(sensor->StartSensor(sensor_config)); - EXPECT_EQ(histogram_tester.GetBucketCount( - "Sensors.Windows.WinRT.Start.Result", E_POINTER), - 1); - fake_sensor->SetPutReportIntervalReturnCode(S_OK); - - // Trigger E_FAIL twice due to reading changed registration failure - fake_sensor->SetAddReadingChangedReturnCode(E_FAIL); - EXPECT_FALSE(sensor->StartSensor(sensor_config)); - EXPECT_EQ(histogram_tester.GetBucketCount( - "Sensors.Windows.WinRT.Start.Result", E_FAIL), - 1); - - EXPECT_FALSE(sensor->StartSensor(sensor_config)); - EXPECT_EQ(histogram_tester.GetBucketCount( - "Sensors.Windows.WinRT.Start.Result", E_FAIL), - 2); - - histogram_tester.ExpectTotalCount("Sensors.Windows.WinRT.Start.Result", 4); -} - -// Tests the sensor stop histogram tracks sensor stop return codes -// correctly. -TEST_F(PlatformSensorReaderTestWinrt, CheckSensorStopHistogram) { - auto fake_sensor_factory = Microsoft::WRL::Make<FakeSensorFactoryWinrt< - ABI::Windows::Devices::Sensors::ILightSensorStatics, - ABI::Windows::Devices::Sensors::ILightSensor, - ABI::Windows::Devices::Sensors::LightSensor, - ABI::Windows::Devices::Sensors::ILightSensorReading, - ABI::Windows::Devices::Sensors::ILightSensorReadingChangedEventArgs, - ABI::Windows::Devices::Sensors::LightSensorReadingChangedEventArgs>>(); - auto fake_sensor = fake_sensor_factory->fake_sensor_; - - auto sensor = std::make_unique<PlatformSensorReaderWinrtLightSensor>(); - sensor->InitForTesting(base::BindLambdaForTesting( - [&](ABI::Windows::Devices::Sensors::ILightSensorStatics** sensor_factory) - -> HRESULT { return fake_sensor_factory.CopyTo(sensor_factory); })); - EXPECT_TRUE(sensor->Initialize()); - base::HistogramTester histogram_tester; - - // Trigger E_UNEXPECTED - PlatformSensorConfiguration sensor_config(kExpectedReportFrequencySet); - fake_sensor->SetRemoveReadingChangedReturnCode(E_UNEXPECTED); - EXPECT_TRUE(sensor->StartSensor(sensor_config)); - sensor->StopSensor(); - EXPECT_EQ(histogram_tester.GetBucketCount("Sensors.Windows.WinRT.Stop.Result", - E_UNEXPECTED), - 1); - - // Trigger S_OK twice - fake_sensor->SetRemoveReadingChangedReturnCode(S_OK); - EXPECT_TRUE(sensor->StartSensor(sensor_config)); - sensor->StopSensor(); - EXPECT_EQ(histogram_tester.GetBucketCount("Sensors.Windows.WinRT.Stop.Result", - S_OK), - 1); - - EXPECT_TRUE(sensor->StartSensor(sensor_config)); - sensor->StopSensor(); - EXPECT_EQ(histogram_tester.GetBucketCount("Sensors.Windows.WinRT.Stop.Result", - S_OK), - 2); - - histogram_tester.ExpectTotalCount("Sensors.Windows.WinRT.Stop.Result", 3); -} - } // namespace device
diff --git a/services/device/public/cpp/device_features.cc b/services/device/public/cpp/device_features.cc index 4f05b0c..07072a57 100644 --- a/services/device/public/cpp/device_features.cc +++ b/services/device/public/cpp/device_features.cc
@@ -13,7 +13,7 @@ // Enables usage of the Windows.Devices.Sensors WinRT API for the sensor // backend instead of the ISensor API on Windows. const base::Feature kWinrtSensorsImplementation{ - "WinrtSensorsImplementation", base::FEATURE_DISABLED_BY_DEFAULT}; + "WinrtSensorsImplementation", base::FEATURE_ENABLED_BY_DEFAULT}; // Enables usage of the Windows.Devices.Geolocation WinRT API for the // LocationProvider instead of the NetworkLocationProvider on Windows. const base::Feature kWinrtGeolocationImplementation{
diff --git a/testing/android/native_test/native_test_launcher.cc b/testing/android/native_test/native_test_launcher.cc index c66af52b..9fd87ca8 100644 --- a/testing/android/native_test/native_test_launcher.cc +++ b/testing/android/native_test/native_test_launcher.cc
@@ -18,7 +18,7 @@ #include "base/android/scoped_java_ref.h" #include "base/at_exit.h" #include "base/base_switches.h" -#include "base/clang_coverage_buildflags.h" +#include "base/clang_profiling_buildflags.h" #include "base/command_line.h" #include "base/debug/debugger.h" #include "base/files/file_path.h" @@ -33,8 +33,8 @@ #include "testing/android/native_test/native_test_jni_headers/NativeTest_jni.h" #include "testing/android/native_test/native_test_util.h" -#if BUILDFLAG(CLANG_COVERAGE) -#include "base/test/clang_coverage.h" +#if BUILDFLAG(CLANG_PROFILING) +#include "base/test/clang_profiling.h" #endif using base::android::JavaParamRef; @@ -140,9 +140,9 @@ ScopedMainEntryLogger scoped_main_entry_logger; main(argc, &argv[0]); -// Explicitly write coverage data to LLVM profile file. -#if BUILDFLAG(CLANG_COVERAGE) - base::WriteClangCoverageProfile(); +// Explicitly write profiling data to LLVM profile file. +#if BUILDFLAG(CLANG_PROFILING) + base::WriteClangProfilingProfile(); #endif }
diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json index e61c3eec..55bbcba 100644 --- a/testing/variations/fieldtrial_testing_config.json +++ b/testing/variations/fieldtrial_testing_config.json
@@ -3697,21 +3697,6 @@ ] } ], - "OzoneDrmMojo": [ - { - "platforms": [ - "chromeos" - ], - "experiments": [ - { - "name": "OzoneDrmMojo", - "enable_features": [ - "OzoneDrmMojo" - ] - } - ] - } - ], "PaintHolding": [ { "platforms": [
diff --git a/third_party/blink/common/feature_policy/feature_policy.cc b/third_party/blink/common/feature_policy/feature_policy.cc index a123b77c..cce4d109 100644 --- a/third_party/blink/common/feature_policy/feature_policy.cc +++ b/third_party/blink/common/feature_policy/feature_policy.cc
@@ -541,9 +541,6 @@ {mojom::FeaturePolicyFeature::kMagnetometer, FeatureDefaultValue(FeaturePolicy::FeatureDefault::EnableForSelf, mojom::PolicyValueType::kBool)}, - {mojom::FeaturePolicyFeature::kOversizedImages, - FeatureDefaultValue(FeaturePolicy::FeatureDefault::EnableForAll, - mojom::PolicyValueType::kDecDouble)}, {mojom::FeaturePolicyFeature::kMicrophone, FeatureDefaultValue(FeaturePolicy::FeatureDefault::EnableForSelf, mojom::PolicyValueType::kBool)}, @@ -589,15 +586,6 @@ {mojom::FeaturePolicyFeature::kTopNavigation, FeatureDefaultValue(FeaturePolicy::FeatureDefault::EnableForAll, mojom::PolicyValueType::kBool)}, - {mojom::FeaturePolicyFeature::kUnoptimizedLosslessImages, - FeatureDefaultValue(FeaturePolicy::FeatureDefault::EnableForAll, - mojom::PolicyValueType::kDecDouble)}, - {mojom::FeaturePolicyFeature::kUnoptimizedLosslessImagesStrict, - FeatureDefaultValue(FeaturePolicy::FeatureDefault::EnableForAll, - mojom::PolicyValueType::kDecDouble)}, - {mojom::FeaturePolicyFeature::kUnoptimizedLossyImages, - FeatureDefaultValue(FeaturePolicy::FeatureDefault::EnableForAll, - mojom::PolicyValueType::kDecDouble)}, {mojom::FeaturePolicyFeature::kUnsizedMedia, FeatureDefaultValue(FeaturePolicy::FeatureDefault::EnableForAll, mojom::PolicyValueType::kBool)},
diff --git a/third_party/blink/public/common/security_context/insecure_request_policy.h b/third_party/blink/public/common/security_context/insecure_request_policy.h index 498fdf7e5..950c3db 100644 --- a/third_party/blink/public/common/security_context/insecure_request_policy.h +++ b/third_party/blink/public/common/security_context/insecure_request_policy.h
@@ -35,11 +35,6 @@ return static_cast<InsecureRequestPolicy>(~static_cast<int>(flags)); } -inline std::ostream& operator<<(std::ostream& out, - InsecureRequestPolicy flags) { - return out << std::bitset<sizeof(int) * 8>(static_cast<int>(flags)); -} - } // namespace mojom } // namespace blink
diff --git a/third_party/blink/public/mojom/feature_policy/document_policy_feature.mojom b/third_party/blink/public/mojom/feature_policy/document_policy_feature.mojom index 576fd9f..a3b09fa 100644 --- a/third_party/blink/public/mojom/feature_policy/document_policy_feature.mojom +++ b/third_party/blink/public/mojom/feature_policy/document_policy_feature.mojom
@@ -9,10 +9,17 @@ kNotFound = 0, // Controls access to font-display attribute in @font-face CSS rule kFontDisplay = 1, - // When disallowed, these policies require images to have a reasonable byte-to-pixel ratio. + // Takes a parameter, |bpp|, i.e. byte-per-pixel ratio, that images + // needs to obey. kUnoptimizedLosslessImages = 2, // Controls whether the browser should allow navigations that cause the page to scroll. kForceLoadAtTop = 3, + + kUnoptimizedLosslessImagesStrict = 4, + kUnoptimizedLossyImages = 5, + // Takes a parameter, |scale_ratio|, and restricts source image sizes to be + // no more than |scale_ratio| x larger than the image's containing block. + kOversizedImages = 6, // Don't change assigned numbers of any item, and don't reuse removed slots. // Add new features at the end of the enum. };
diff --git a/third_party/blink/public/mojom/feature_policy/feature_policy_feature.mojom b/third_party/blink/public/mojom/feature_policy/feature_policy_feature.mojom index e88d525..2178ada 100644 --- a/third_party/blink/public/mojom/feature_policy/feature_policy_feature.mojom +++ b/third_party/blink/public/mojom/feature_policy/feature_policy_feature.mojom
@@ -54,9 +54,6 @@ // Controls the layout size of intrinsically sized images and videos. When // disabled, default size (300 x 150) is used to prevent relayout. kUnsizedMedia = 21, - // When disallowed, restricts source image size to be no more 2x larger than - // the image's containing block. - kOversizedImages = 25, // Controls access to Picture-in-Picture. kPictureInPicture = 26, // Controls the ability to block and interfere with vertical scrolling. @@ -94,11 +91,6 @@ // Controls access to Idle Detection kIdleDetection = 44, - // When disallowed, these policies require images to have a reasonable byte-to-pixel ratio. - kUnoptimizedLossyImages = 45, - kUnoptimizedLosslessImages = 46, - kUnoptimizedLosslessImagesStrict = 47, - // Loading policies. kLoadingFrameDefaultEager = 48,
diff --git a/third_party/blink/public/mojom/web_feature/web_feature.mojom b/third_party/blink/public/mojom/web_feature/web_feature.mojom index 2541661..0a40681 100644 --- a/third_party/blink/public/mojom/web_feature/web_feature.mojom +++ b/third_party/blink/public/mojom/web_feature/web_feature.mojom
@@ -2453,8 +2453,8 @@ kLongTaskBufferFull = 3118, kHTMLMetaElementMonetization = 3119, kHTMLLinkElementMonetization = 3120, - kInputTypeCheckboxRenderedNonSquare = 3121, - kInputTypeRadioRenderedNonSquare = 3122, + kInputTypeCheckboxRenderedNonSquare_Obsolete = 3121, + kInputTypeRadioRenderedNonSquare_Obsolete = 3122, kWebkitBoxPackJustifyDoesSomething = 3123, kWebkitBoxPackCenterDoesSomething = 3124, kWebkitBoxPackEndDoesSomething = 3125,
diff --git a/third_party/blink/renderer/bindings/core/v8/serialization/v8_script_value_serializer.h b/third_party/blink/renderer/bindings/core/v8/serialization/v8_script_value_serializer.h index cfba4c7c..b409caf 100644 --- a/third_party/blink/renderer/bindings/core/v8/serialization/v8_script_value_serializer.h +++ b/third_party/blink/renderer/bindings/core/v8/serialization/v8_script_value_serializer.h
@@ -47,6 +47,8 @@ // DataCloneError message will be used. virtual bool WriteDOMObject(ScriptWrappable*, ExceptionState&); + ScriptState* GetScriptState() const { return script_state_; } + void WriteTag(SerializationTag tag) { uint8_t tag_byte = tag; serializer_.WriteRawBytes(&tag_byte, 1);
diff --git a/third_party/blink/renderer/bindings/modules/v8/serialization/v8_script_value_deserializer_for_modules.cc b/third_party/blink/renderer/bindings/modules/v8/serialization/v8_script_value_deserializer_for_modules.cc index 708d171..b5f07e85 100644 --- a/third_party/blink/renderer/bindings/modules/v8/serialization/v8_script_value_deserializer_for_modules.cc +++ b/third_party/blink/renderer/bindings/modules/v8/serialization/v8_script_value_deserializer_for_modules.cc
@@ -302,7 +302,8 @@ NativeFileSystemHandle* V8ScriptValueDeserializerForModules::ReadNativeFileSystemHandle( SerializationTag tag) { - if (!RuntimeEnabledFeatures::CloneableNativeFileSystemHandlesEnabled()) { + if (!RuntimeEnabledFeatures::CloneableNativeFileSystemHandlesEnabled( + ExecutionContext::From(GetScriptState()))) { return nullptr; }
diff --git a/third_party/blink/renderer/bindings/modules/v8/serialization/v8_script_value_serializer_for_modules.cc b/third_party/blink/renderer/bindings/modules/v8/serialization/v8_script_value_serializer_for_modules.cc index e5521f2..6f017cd 100644 --- a/third_party/blink/renderer/bindings/modules/v8/serialization/v8_script_value_serializer_for_modules.cc +++ b/third_party/blink/renderer/bindings/modules/v8/serialization/v8_script_value_serializer_for_modules.cc
@@ -53,13 +53,15 @@ return true; } if (wrapper_type_info == V8FileSystemFileHandle::GetWrapperTypeInfo() && - RuntimeEnabledFeatures::CloneableNativeFileSystemHandlesEnabled()) { + RuntimeEnabledFeatures::CloneableNativeFileSystemHandlesEnabled( + ExecutionContext::From(GetScriptState()))) { return WriteNativeFileSystemHandle( kNativeFileSystemFileHandleTag, wrappable->ToImpl<NativeFileSystemHandle>()); } if (wrapper_type_info == V8FileSystemDirectoryHandle::GetWrapperTypeInfo() && - RuntimeEnabledFeatures::CloneableNativeFileSystemHandlesEnabled()) { + RuntimeEnabledFeatures::CloneableNativeFileSystemHandlesEnabled( + ExecutionContext::From(GetScriptState()))) { return WriteNativeFileSystemHandle( kNativeFileSystemDirectoryHandleTag, wrappable->ToImpl<NativeFileSystemHandle>());
diff --git a/third_party/blink/renderer/core/animation/animation.h b/third_party/blink/renderer/core/animation/animation.h index 2560ea3..5253c82c 100644 --- a/third_party/blink/renderer/core/animation/animation.h +++ b/third_party/blink/renderer/core/animation/animation.h
@@ -165,7 +165,7 @@ virtual void pause(ExceptionState& = ASSERT_NO_EXCEPTION); virtual void play(ExceptionState& = ASSERT_NO_EXCEPTION); - void reverse(ExceptionState& = ASSERT_NO_EXCEPTION); + virtual void reverse(ExceptionState& = ASSERT_NO_EXCEPTION); void finish(ExceptionState& = ASSERT_NO_EXCEPTION); void updatePlaybackRate(double playback_rate, ExceptionState& = ASSERT_NO_EXCEPTION); @@ -202,9 +202,9 @@ double startTime(bool& is_null) const; base::Optional<double> startTime() const; base::Optional<double> StartTimeInternal() const { return start_time_; } - void setStartTime(double, - bool is_null, - ExceptionState& = ASSERT_NO_EXCEPTION); + virtual void setStartTime(double, + bool is_null, + ExceptionState& = ASSERT_NO_EXCEPTION); const AnimationEffect* effect() const { return content_.Get(); } AnimationEffect* effect() { return content_.Get(); }
diff --git a/third_party/blink/renderer/core/animation/css/css_animation.cc b/third_party/blink/renderer/core/animation/css/css_animation.cc index b55401f6..aa032d7 100644 --- a/third_party/blink/renderer/core/animation/css/css_animation.cc +++ b/third_party/blink/renderer/core/animation/css/css_animation.cc
@@ -15,7 +15,7 @@ const String& animation_name) : Animation(execution_context, timeline, content), animation_name_(animation_name), - sticky_play_state_(Animation::kUnset) {} + ignore_css_play_state_(false) {} String CSSAnimation::playState() const { FlushStyles(); @@ -28,13 +28,29 @@ } void CSSAnimation::pause(ExceptionState& exception_state) { - sticky_play_state_ = kPaused; Animation::pause(exception_state); + if (exception_state.HadException()) + return; + ignore_css_play_state_ = true; } void CSSAnimation::play(ExceptionState& exception_state) { - sticky_play_state_ = kRunning; Animation::play(exception_state); + if (exception_state.HadException()) + return; + ignore_css_play_state_ = true; +} + +void CSSAnimation::reverse(ExceptionState& exception_state) { + PlayStateTransitionScope scope(*this); + Animation::reverse(exception_state); +} + +void CSSAnimation::setStartTime(double start_time, + bool is_null, + ExceptionState& exception_state) { + PlayStateTransitionScope scope(*this); + Animation::setStartTime(start_time, is_null, exception_state); } void CSSAnimation::FlushStyles() const { @@ -44,4 +60,16 @@ GetDocument()->UpdateStyleAndLayoutTree(); } +CSSAnimation::PlayStateTransitionScope::PlayStateTransitionScope( + CSSAnimation& animation) + : animation_(animation) { + was_paused_ = animation_.Paused(); +} + +CSSAnimation::PlayStateTransitionScope::~PlayStateTransitionScope() { + bool is_paused = animation_.Paused(); + if (was_paused_ != is_paused) + animation_.ignore_css_play_state_ = true; +} + } // namespace blink
diff --git a/third_party/blink/renderer/core/animation/css/css_animation.h b/third_party/blink/renderer/core/animation/css/css_animation.h index 396237d..6caa02071 100644 --- a/third_party/blink/renderer/core/animation/css/css_animation.h +++ b/third_party/blink/renderer/core/animation/css/css_animation.h
@@ -40,22 +40,37 @@ // conditionally sticky and override the animation-play-state style. void pause(ExceptionState& = ASSERT_NO_EXCEPTION) override; void play(ExceptionState& = ASSERT_NO_EXCEPTION) override; + void reverse(ExceptionState& = ASSERT_NO_EXCEPTION) override; + void setStartTime(double, + bool is_null, + ExceptionState& = ASSERT_NO_EXCEPTION) override; - // When set, the override takes precedence over animation-play-state. + // When set, subsequent changes to animation-play-state no longer affect the + // play state. // https://drafts.csswg.org/css-animations-2/#interaction-between-animation-play-state-and-web-animations-API - AnimationPlayState getWebAnimationOverriddenPlayState() { - return sticky_play_state_; - } - void ResetWebAnimationOverriddenPlayState() { sticky_play_state_ = kUnset; } + bool getIgnoreCSSPlayState() { return ignore_css_play_state_; } + void resetIgnoreCSSPlayState() { ignore_css_play_state_ = false; } private: void FlushStyles() const; + class PlayStateTransitionScope { + STACK_ALLOCATED(); + + public: + explicit PlayStateTransitionScope(CSSAnimation& animation); + ~PlayStateTransitionScope(); + + private: + CSSAnimation& animation_; + bool was_paused_; + }; + String animation_name_; // When set, the web-animation API is overruling the animation-play-state // style. - AnimationPlayState sticky_play_state_; + bool ignore_css_play_state_; }; template <>
diff --git a/third_party/blink/renderer/core/animation/css/css_animations.cc b/third_party/blink/renderer/core/animation/css/css_animations.cc index 71139bb..42b35c2 100644 --- a/third_party/blink/renderer/core/animation/css/css_animations.cc +++ b/third_party/blink/renderer/core/animation/css/css_animations.cc
@@ -399,17 +399,12 @@ // play state via the animation-play-state style. Ensure that the new // play state based on animation-play-state differs from the current // play state and that the change is not blocked by a sticky state. - Animation::AnimationPlayState sticky_override = - animation->getWebAnimationOverriddenPlayState(); bool toggle_pause_state = false; - if (is_paused != was_paused) { - if (animation->Paused() && sticky_override != Animation::kPaused && - !is_paused) { + if (is_paused != was_paused && !animation->getIgnoreCSSPlayState()) { + if (animation->Paused() && !is_paused) toggle_pause_state = true; - } else if (animation->Playing() && - sticky_override != Animation::kRunning && is_paused) { + else if (animation->Playing() && is_paused) toggle_pause_state = true; - } } if (keyframes_rule != existing_animation->style_rule || @@ -504,10 +499,10 @@ if (animation->Paused()) { animation->Unpause(); - animation->ResetWebAnimationOverriddenPlayState(); + animation->resetIgnoreCSSPlayState(); } else { animation->pause(); - animation->ResetWebAnimationOverriddenPlayState(); + animation->resetIgnoreCSSPlayState(); } if (animation->Outdated()) animation->Update(kTimingUpdateOnDemand); @@ -552,7 +547,7 @@ animation->play(); if (inert_animation->Paused()) animation->pause(); - animation->ResetWebAnimationOverriddenPlayState(); + animation->resetIgnoreCSSPlayState(); animation->Update(kTimingUpdateOnDemand); running_animations_.push_back(
diff --git a/third_party/blink/renderer/core/exported/web_plugin_container_impl.cc b/third_party/blink/renderer/core/exported/web_plugin_container_impl.cc index 722dc15..8cec53c 100644 --- a/third_party/blink/renderer/core/exported/web_plugin_container_impl.cc +++ b/third_party/blink/renderer/core/exported/web_plugin_container_impl.cc
@@ -805,7 +805,7 @@ if (event.type() == event_type_names::kMousedown) FocusPlugin(); - ui::Cursor cursor; + ui::Cursor cursor(ui::mojom::CursorType::kPointer); if (web_plugin_ && web_plugin_->HandleInputEvent( WebCoalescedInputEvent(transformed_event), &cursor) != WebInputEventResult::kNotHandled) @@ -864,9 +864,9 @@ WebMouseWheelEvent translated_event = event.NativeEvent().FlattenTransform(); translated_event.SetPositionInWidget(local_point.X(), local_point.Y()); - ui::Cursor cursor; + ui::Cursor dummy_cursor; if (web_plugin_->HandleInputEvent(WebCoalescedInputEvent(translated_event), - &cursor) != + &dummy_cursor) != WebInputEventResult::kNotHandled) event.SetDefaultHandled(); } @@ -887,9 +887,9 @@ if (web_plugin_->SupportsEditCommands()) web_frame->Client()->HandleCurrentKeyboardEvent(); - ui::Cursor cursor; + ui::Cursor dummy_cursor; if (web_plugin_->HandleInputEvent(WebCoalescedInputEvent(web_event), - &cursor) != + &dummy_cursor) != WebInputEventResult::kNotHandled) { event.SetDefaultHandled(); } @@ -992,8 +992,8 @@ WebCoalescedInputEvent transformed_event = TransformCoalescedTouchEvent(*event.NativeEvent()); - ui::Cursor cursor; - if (web_plugin_->HandleInputEvent(transformed_event, &cursor) != + ui::Cursor dummy_cursor; + if (web_plugin_->HandleInputEvent(transformed_event, &dummy_cursor) != WebInputEventResult::kNotHandled) event.SetDefaultHandled(); // FIXME: Can a plugin change the cursor from a touch-event callback? @@ -1022,9 +1022,9 @@ translated_event.FlattenTransform(); translated_event.SetPositionInWidget(local_point); - ui::Cursor cursor; + ui::Cursor dummy_cursor; if (web_plugin_->HandleInputEvent(WebCoalescedInputEvent(translated_event), - &cursor) != + &dummy_cursor) != WebInputEventResult::kNotHandled) { event.SetDefaultHandled(); return; @@ -1039,9 +1039,9 @@ if (web_event.GetType() == WebInputEvent::kUndefined) return; - ui::Cursor cursor; + ui::Cursor dummy_cursor; if (web_plugin_->HandleInputEvent(WebCoalescedInputEvent(web_event), - &cursor) != + &dummy_cursor) != WebInputEventResult::kNotHandled) event.SetDefaultHandled(); }
diff --git a/third_party/blink/renderer/core/feature_policy/document_policy_features.json5 b/third_party/blink/renderer/core/feature_policy/document_policy_features.json5 index 576ee3f..8527819 100644 --- a/third_party/blink/renderer/core/feature_policy/document_policy_features.json5 +++ b/third_party/blink/renderer/core/feature_policy/document_policy_features.json5
@@ -57,5 +57,29 @@ value_type: "Bool", default_value: "false", }, + { + name: "UnoptimizedLosslessImagesStrict", + document_policy_name: "unoptimized-lossless-images-strict", + value_name: "bpp", + value_type: "DecDouble", + default_value: "max", + depends_on: ["UnoptimizedImagePolicies"], + }, + { + name: "UnoptimizedLossyImages", + document_policy_name: "unoptimized-lossy-images", + value_name: "bpp", + value_type: "DecDouble", + default_value: "max", + depends_on: ["UnoptimizedImagePolicies"], + }, + { + name: "OversizedImages", + document_policy_name: "oversized-images", + value_name: "scale", + value_type: "DecDouble", + default_value: "max", + depends_on: ["UnoptimizedImagePolicies"], + }, ], }
diff --git a/third_party/blink/renderer/core/feature_policy/feature_policy.dict b/third_party/blink/renderer/core/feature_policy/feature_policy.dict index 43ebe11..d4a0523d 100644 --- a/third_party/blink/renderer/core/feature_policy/feature_policy.dict +++ b/third_party/blink/renderer/core/feature_policy/feature_policy.dict
@@ -22,7 +22,6 @@ "midi" "modals" "orientation-lock" -"oversized-images" "payment" "picture-in-picture" "pointer-lock" @@ -34,9 +33,6 @@ "sync-script" "sync-xkr" "top-navigation" -"unoptimized-lossless-images" -"unoptimized-lossless-images-strict" -"unoptimized-lossy-images" "unsized-media" "usb" "vertical-scroll"
diff --git a/third_party/blink/renderer/core/feature_policy/feature_policy_features.json5 b/third_party/blink/renderer/core/feature_policy/feature_policy_features.json5 index 9c35128..1e3dbbc3 100644 --- a/third_party/blink/renderer/core/feature_policy/feature_policy_features.json5 +++ b/third_party/blink/renderer/core/feature_policy/feature_policy_features.json5
@@ -211,11 +211,6 @@ depends_on: ["FeaturePolicyForSandbox"], }, { - name: "OversizedImages", - feature_policy_name: "oversized-images", - depends_on: ["UnoptimizedImagePolicies"], - }, - { name: "Payment", feature_policy_name: "payment", depends_on: ["PaymentRequest"], @@ -270,21 +265,6 @@ depends_on: ["FeaturePolicyForSandbox"], }, { - name: "UnoptimizedLosslessImages", - feature_policy_name: "unoptimized-lossless-images", - depends_on: ["UnoptimizedImagePolicies"], - }, - { - name: "UnoptimizedLosslessImagesStrict", - feature_policy_name: "unoptimized-lossless-images-strict", - depends_on: ["UnoptimizedImagePolicies"], - }, - { - name: "UnoptimizedLossyImages", - feature_policy_name: "unoptimized-lossy-images", - depends_on: ["UnoptimizedImagePolicies"], - }, - { name: "UnsizedMedia", feature_policy_name: "unsized-media", depends_on: ["UnsizedMediaPolicy"],
diff --git a/third_party/blink/renderer/core/feature_policy/feature_policy_parser.cc b/third_party/blink/renderer/core/feature_policy/feature_policy_parser.cc index 515a008..e3dcab7 100644 --- a/third_party/blink/renderer/core/feature_policy/feature_policy_parser.cc +++ b/third_party/blink/renderer/core/feature_policy/feature_policy_parser.cc
@@ -145,22 +145,6 @@ bool allowlist_includes_none = false; bool allowlist_includes_origin = false; - // Detect usage of UnoptimizedImagePolicies origin trial. - if (feature == mojom::blink::FeaturePolicyFeature::kOversizedImages || - feature == - mojom::blink::FeaturePolicyFeature::kUnoptimizedLossyImages || - feature == - mojom::blink::FeaturePolicyFeature::kUnoptimizedLosslessImages || - feature == mojom::blink::FeaturePolicyFeature:: - kUnoptimizedLosslessImagesStrict) { - if (delegate) { - delegate->CountFeaturePolicyUsage( - mojom::WebFeature::kUnoptimizedImagePolicies); - } - // Don't analyze allowlists for origin trial features. - count_allowlist_type = false; - } - // Detect usage of UnsizedMediaPolicy origin trial if (feature == mojom::blink::FeaturePolicyFeature::kUnsizedMedia) { if (delegate) { @@ -364,21 +348,6 @@ // parameterized feature (i.e. boolean-type policy value). PolicyValue FeaturePolicyParser::GetFallbackValueForFeature( mojom::blink::FeaturePolicyFeature feature) { - if (feature == mojom::blink::FeaturePolicyFeature::kOversizedImages) { - return PolicyValue(2.0); - } - if (feature == mojom::blink::FeaturePolicyFeature::kUnoptimizedLossyImages) { - // Lossy images default to at most 0.5 bytes per pixel. - return PolicyValue(0.5); - } - if (feature == - mojom::blink::FeaturePolicyFeature::kUnoptimizedLosslessImages || - feature == mojom::blink::FeaturePolicyFeature:: - kUnoptimizedLosslessImagesStrict) { - // Lossless images default to at most 1 byte per pixel. - return PolicyValue(1.0); - } - return PolicyValue(false); }
diff --git a/third_party/blink/renderer/core/feature_policy/feature_policy_test.cc b/third_party/blink/renderer/core/feature_policy/feature_policy_test.cc index 970c744..abec6e4 100644 --- a/third_party/blink/renderer/core/feature_policy/feature_policy_test.cc +++ b/third_party/blink/renderer/core/feature_policy/feature_policy_test.cc
@@ -54,14 +54,6 @@ "fullscreen " ORIGIN_A "(false)", "fullscreen " ORIGIN_A "(True)", "fullscreen " ORIGIN_A "(TRUE)", - "oversized-images " ORIGIN_A "(2.0)", - "oversized-images " ORIGIN_A "(0.0)", - "oversized-images " ORIGIN_A "(4)", - "oversized-images " ORIGIN_A "(20000)", - "oversized-images " ORIGIN_A "(2e50)", - "oversized-images " ORIGIN_A "(inf)", - "oversized-images " ORIGIN_A "(Inf)", - "oversized-images " ORIGIN_A "(INF)", "fullscreen " ORIGIN_A "; payment *, geolocation 'self'"}; const char* const kInvalidPolicies[] = { @@ -77,12 +69,6 @@ "fullscreen(true)", "fullscreen " ORIGIN_A "(notabool)", "fullscreen " ORIGIN_A "(2.0)", - "oversized-images " ORIGIN_A "(true)", - "oversized-images " ORIGIN_A "(Something else)", - "oversized-images " ORIGIN_A "(1", - "oversized-images " ORIGIN_A "(-1)", - "oversized-images " ORIGIN_A "(1.2.3)", - "oversized-images " ORIGIN_A "(1.a.3)", "fullscreen " ORIGIN_A "()"}; // Names of UMA histograms @@ -113,9 +99,7 @@ const FeatureNameMap test_feature_name_map = { {"fullscreen", blink::mojom::blink::FeaturePolicyFeature::kFullscreen}, {"payment", blink::mojom::blink::FeaturePolicyFeature::kPayment}, - {"geolocation", blink::mojom::blink::FeaturePolicyFeature::kGeolocation}, - {"oversized-images", - blink::mojom::blink::FeaturePolicyFeature::kOversizedImages}}; + {"geolocation", blink::mojom::blink::FeaturePolicyFeature::kGeolocation}}; const PolicyValue min_value = PolicyValue(false); const PolicyValue max_value = PolicyValue(true); @@ -440,150 +424,6 @@ EXPECT_EQ(0UL, parsed_policy[0].values.size()); } -TEST_F(FeaturePolicyParserTest, DoublePolicyParametersParsedCorrectly) { - Vector<String> messages; - ParsedFeaturePolicy parsed_policy; - - // 'self'(inf) - parsed_policy = FeaturePolicyParser::Parse("oversized-images 'self'(inf)", - origin_a_.get(), origin_b_.get(), - &messages, test_feature_name_map); - EXPECT_EQ(1UL, parsed_policy.size()); - - EXPECT_EQ(mojom::blink::FeaturePolicyFeature::kOversizedImages, - parsed_policy[0].feature); - EXPECT_EQ(default_double_value, parsed_policy[0].fallback_value); - EXPECT_EQ(default_double_value, parsed_policy[0].opaque_value); - EXPECT_EQ(1UL, parsed_policy[0].values.size()); - EXPECT_TRUE(parsed_policy[0].values.begin()->first.IsSameOriginWith( - expected_url_origin_a_)); - EXPECT_EQ(max_double_value, parsed_policy[0].values.begin()->second); - - // 'self'(1.5) - parsed_policy = FeaturePolicyParser::Parse("oversized-images 'self'(1.5)", - origin_a_.get(), origin_b_.get(), - &messages, test_feature_name_map); - EXPECT_EQ(1UL, parsed_policy.size()); - - EXPECT_EQ(mojom::blink::FeaturePolicyFeature::kOversizedImages, - parsed_policy[0].feature); - EXPECT_EQ(default_double_value, parsed_policy[0].fallback_value); - EXPECT_EQ(default_double_value, parsed_policy[0].opaque_value); - EXPECT_EQ(1UL, parsed_policy[0].values.size()); - EXPECT_TRUE(parsed_policy[0].values.begin()->first.IsSameOriginWith( - expected_url_origin_a_)); - EXPECT_EQ(sample_double_value, parsed_policy[0].values.begin()->second); - - // *(inf) - parsed_policy = FeaturePolicyParser::Parse("oversized-images *(inf)", - origin_a_.get(), origin_b_.get(), - &messages, test_feature_name_map); - EXPECT_EQ(1UL, parsed_policy.size()); - - EXPECT_EQ(mojom::blink::FeaturePolicyFeature::kOversizedImages, - parsed_policy[0].feature); - EXPECT_EQ(max_double_value, parsed_policy[0].fallback_value); - EXPECT_EQ(max_double_value, parsed_policy[0].opaque_value); - EXPECT_EQ(0UL, parsed_policy[0].values.size()); - - // *(0) - parsed_policy = FeaturePolicyParser::Parse("oversized-images *(0)", - origin_a_.get(), origin_b_.get(), - &messages, test_feature_name_map); - EXPECT_EQ(1UL, parsed_policy.size()); - - EXPECT_EQ(mojom::blink::FeaturePolicyFeature::kOversizedImages, - parsed_policy[0].feature); - EXPECT_EQ(min_double_value, parsed_policy[0].fallback_value); - EXPECT_EQ(min_double_value, parsed_policy[0].opaque_value); - EXPECT_EQ(0UL, parsed_policy[0].values.size()); - - // *(1.5) - parsed_policy = FeaturePolicyParser::Parse("oversized-images *(1.5)", - origin_a_.get(), origin_b_.get(), - &messages, test_feature_name_map); - EXPECT_EQ(1UL, parsed_policy.size()); - - EXPECT_EQ(mojom::blink::FeaturePolicyFeature::kOversizedImages, - parsed_policy[0].feature); - EXPECT_EQ(sample_double_value, parsed_policy[0].fallback_value); - EXPECT_EQ(sample_double_value, parsed_policy[0].opaque_value); - EXPECT_EQ(0UL, parsed_policy[0].values.size()); - - // 'self'(1.5) 'src'(inf) - // Fallbacks should be default values. - parsed_policy = FeaturePolicyParser::Parse( - "oversized-images 'self'(1.5) 'src'(inf)", origin_a_.get(), - origin_b_.get(), &messages, test_feature_name_map); - EXPECT_EQ(1UL, parsed_policy.size()); - - EXPECT_EQ(mojom::blink::FeaturePolicyFeature::kOversizedImages, - parsed_policy[0].feature); - EXPECT_EQ(default_double_value, parsed_policy[0].fallback_value); - EXPECT_EQ(default_double_value, parsed_policy[0].opaque_value); - EXPECT_EQ(2UL, parsed_policy[0].values.size()); - auto origin_and_value = parsed_policy[0].values.begin(); - EXPECT_TRUE(origin_and_value->first.IsSameOriginWith(expected_url_origin_a_)); - EXPECT_EQ(sample_double_value, origin_and_value->second); - origin_and_value++; - EXPECT_TRUE(origin_and_value->first.IsSameOriginWith(expected_url_origin_b_)); - EXPECT_EQ(max_double_value, origin_and_value->second); - - // *(1.5) 'src'(inf) - // Fallbacks should be 1.5 - parsed_policy = FeaturePolicyParser::Parse( - "oversized-images *(1.5) 'src'(inf)", origin_a_.get(), origin_b_.get(), - &messages, test_feature_name_map); - EXPECT_EQ(1UL, parsed_policy.size()); - - EXPECT_EQ(mojom::blink::FeaturePolicyFeature::kOversizedImages, - parsed_policy[0].feature); - EXPECT_EQ(sample_double_value, parsed_policy[0].fallback_value); - EXPECT_EQ(sample_double_value, parsed_policy[0].opaque_value); - EXPECT_EQ(1UL, parsed_policy[0].values.size()); - origin_and_value = parsed_policy[0].values.begin(); - EXPECT_TRUE(origin_and_value->first.IsSameOriginWith(expected_url_origin_b_)); - EXPECT_EQ(max_double_value, origin_and_value->second); - - // Test policy: 'self'(1.5) https://example.org(inf) - // Fallbacks should be default value. - parsed_policy = FeaturePolicyParser::Parse( - "oversized-images 'self'(1.5) " ORIGIN_C "(inf)", origin_a_.get(), - origin_b_.get(), &messages, test_feature_name_map); - EXPECT_EQ(1UL, parsed_policy.size()); - - EXPECT_EQ(mojom::blink::FeaturePolicyFeature::kOversizedImages, - parsed_policy[0].feature); - EXPECT_EQ(default_double_value, parsed_policy[0].fallback_value); - EXPECT_EQ(default_double_value, parsed_policy[0].opaque_value); - EXPECT_EQ(2UL, parsed_policy[0].values.size()); - origin_and_value = parsed_policy[0].values.begin(); - EXPECT_TRUE(origin_and_value->first.IsSameOriginWith(expected_url_origin_a_)); - EXPECT_EQ(sample_double_value, origin_and_value->second); - origin_and_value++; - EXPECT_TRUE(origin_and_value->first.IsSameOriginWith(expected_url_origin_c_)); - EXPECT_EQ(max_double_value, origin_and_value->second); - - // Test policy: 'self'(1.5) https://example.org(inf) *(0) - // Fallbacks should be 0. - parsed_policy = FeaturePolicyParser::Parse( - "oversized-images 'self'(1.5) " ORIGIN_C "(inf) *(0)", origin_a_.get(), - origin_b_.get(), &messages, test_feature_name_map); - EXPECT_EQ(1UL, parsed_policy.size()); - - EXPECT_EQ(mojom::blink::FeaturePolicyFeature::kOversizedImages, - parsed_policy[0].feature); - EXPECT_EQ(min_double_value, parsed_policy[0].fallback_value); - EXPECT_EQ(min_double_value, parsed_policy[0].opaque_value); - EXPECT_EQ(2UL, parsed_policy[0].values.size()); - origin_and_value = parsed_policy[0].values.begin(); - EXPECT_TRUE(origin_and_value->first.IsSameOriginWith(expected_url_origin_a_)); - EXPECT_EQ(sample_double_value, origin_and_value->second); - origin_and_value++; - EXPECT_TRUE(origin_and_value->first.IsSameOriginWith(expected_url_origin_c_)); - EXPECT_EQ(max_double_value, origin_and_value->second); -} - TEST_F(FeaturePolicyParserTest, RedundantBooleanItemsRemoved) { Vector<String> messages; ParsedFeaturePolicy parsed_policy; @@ -624,46 +464,6 @@ EXPECT_EQ(0UL, parsed_policy[0].values.size()); } -TEST_F(FeaturePolicyParserTest, RedundantDoubleItemsRemoved) { - Vector<String> messages; - ParsedFeaturePolicy parsed_policy; - - // 'self'(1.5) *(1.5) - parsed_policy = FeaturePolicyParser::Parse( - "oversized-images 'self'(1.5) *(1.5)", origin_a_.get(), origin_b_.get(), - &messages, test_feature_name_map); - EXPECT_EQ(1UL, parsed_policy.size()); - - EXPECT_EQ(mojom::blink::FeaturePolicyFeature::kOversizedImages, - parsed_policy[0].feature); - EXPECT_EQ(sample_double_value, parsed_policy[0].fallback_value); - EXPECT_EQ(sample_double_value, parsed_policy[0].opaque_value); - EXPECT_EQ(0UL, parsed_policy[0].values.size()); - - // 'self'(inf) - parsed_policy = FeaturePolicyParser::Parse("oversized-images 'self'(2.0)", - origin_a_.get(), origin_b_.get(), - &messages, test_feature_name_map); - EXPECT_EQ(1UL, parsed_policy.size()); - - EXPECT_EQ(mojom::blink::FeaturePolicyFeature::kOversizedImages, - parsed_policy[0].feature); - EXPECT_EQ(default_double_value, parsed_policy[0].fallback_value); - EXPECT_EQ(default_double_value, parsed_policy[0].opaque_value); - EXPECT_EQ(0UL, parsed_policy[0].values.size()); - - // (inf) - parsed_policy = FeaturePolicyParser::Parse("oversized-images (2.0)", - origin_a_.get(), origin_b_.get(), - &messages, test_feature_name_map); - EXPECT_EQ(1UL, parsed_policy.size()); - EXPECT_EQ(mojom::blink::FeaturePolicyFeature::kOversizedImages, - parsed_policy[0].feature); - EXPECT_EQ(default_double_value, parsed_policy[0].fallback_value); - EXPECT_EQ(default_double_value, parsed_policy[0].opaque_value); - EXPECT_EQ(0UL, parsed_policy[0].values.size()); -} - // Test histogram counting the use of feature policies in header. TEST_F(FeaturePolicyParserTest, HeaderHistogram) { const char* histogram_name = "Blink.UseCounter.FeaturePolicy.Header"; @@ -763,72 +563,6 @@ 1); } -TEST_F(FeaturePolicyParserTest, ParseParameterizedFeatures) { - Vector<String> messages; - - scoped_refptr<SecurityOrigin> opaque_origin = - SecurityOrigin::CreateUniqueOpaque(); - - // Simple policy with *. - ParsedFeaturePolicy parsed_policy = FeaturePolicyParser::Parse( - "oversized-images *", origin_a_.get(), opaque_origin.get(), &messages, - test_feature_name_map); - EXPECT_EQ(1UL, parsed_policy.size()); - EXPECT_EQ(mojom::blink::FeaturePolicyFeature::kOversizedImages, - parsed_policy[0].feature); - EXPECT_EQ(max_double_value, parsed_policy[0].fallback_value); - EXPECT_EQ(max_double_value, parsed_policy[0].opaque_value); - EXPECT_EQ(0UL, parsed_policy[0].values.size()); - - // Policy with explicit origins - parsed_policy = FeaturePolicyParser::Parse( - "oversized-images https://example.net 'src'", origin_a_.get(), - opaque_origin.get(), &messages, test_feature_name_map); - EXPECT_EQ(1UL, parsed_policy.size()); - - EXPECT_EQ(mojom::blink::FeaturePolicyFeature::kOversizedImages, - parsed_policy[0].feature); - EXPECT_GE(default_double_value, parsed_policy[0].fallback_value); - EXPECT_LE(max_double_value, parsed_policy[0].opaque_value); - EXPECT_EQ(1UL, parsed_policy[0].values.size()); - EXPECT_LE(max_double_value, parsed_policy[0].values.begin()->second); -} - -// These declarations should each trigger the Unoptimized Images origin trial -// use counter. -const char* const kUnoptimizedImagesOriginTrialPolicyDeclarations[] = { - "unoptimized-lossy-images", "unoptimized-lossless-images", - "unoptimized-lossless-images-strict", "oversized-images", - "oversized-images; fullscreen", "fullscreen; oversized-images", - "oversized-images 'self'(2.0)", "oversized-images 'none'", - "unoptimized-lossy-images *(0.125)"}; - -TEST_F(FeaturePolicyParserTest, UnoptimizedImagesOriginTrialFeatureUseCounter) { - Vector<String> messages; - - // Validate that features which are not in the origin trial do not trigger - // the use counter. - { - auto dummy = std::make_unique<DummyPageHolder>(); - FeaturePolicyParser::ParseHeader("payment; fullscreen", origin_a_.get(), - &messages, &dummy->GetDocument()); - EXPECT_FALSE(dummy->GetDocument().IsUseCounted( - WebFeature::kUnoptimizedImagePolicies)); - } - - // Validate that declarations which should trigger the use counter do. - for (const char* declaration : - kUnoptimizedImagesOriginTrialPolicyDeclarations) { - auto dummy = std::make_unique<DummyPageHolder>(); - FeaturePolicyParser::ParseHeader(declaration, origin_a_.get(), &messages, - &dummy->GetDocument()); - EXPECT_TRUE(dummy->GetDocument().IsUseCounted( - WebFeature::kUnoptimizedImagePolicies)) - << declaration - << " should trigger the Unoptimized Images origin trial use counter."; - } -} - // These declarations should each trigger the Unsized Media origin trial use // counter. const char* const kUnsizedMediaOriginTrialPolicyDeclarations[] = { @@ -1096,26 +830,6 @@ tester.ExpectTotalCount(kAllowlistAttributeHistogram, 1); } -TEST_F(FeaturePolicyAllowlistHistogramTest, OriginTrialFeaturesNotRecorded) { - Vector<String> messages; - HistogramTester tester; - - auto dummy = std::make_unique<DummyPageHolder>(); - const char* unoptimizedimages_declaration = - "unoptimized-lossy-images;" - "unoptimized-lossless-images;" - "unoptimized-lossless-images-strict;" - "oversized-images *;"; - const char* unsizedmedia_declaration = "unsized-media *"; - FeaturePolicyParser::ParseHeader(unoptimizedimages_declaration, - origin_a_.get(), &messages, - &dummy->GetDocument()); - FeaturePolicyParser::ParseHeader(unsizedmedia_declaration, origin_a_.get(), - &messages, &dummy->GetDocument()); - - tester.ExpectTotalCount(kAllowlistHeaderHistogram, 0); -} - // Test policy mutation methods class FeaturePolicyMutationTest : public testing::Test { protected:
diff --git a/third_party/blink/renderer/core/frame/dom_window.cc b/third_party/blink/renderer/core/frame/dom_window.cc index 2969420..0bf6a7d 100644 --- a/third_party/blink/renderer/core/frame/dom_window.cc +++ b/third_party/blink/renderer/core/frame/dom_window.cc
@@ -336,7 +336,7 @@ MakeGarbageCollected<ConsoleMessage>( mojom::ConsoleMessageSource::kJavaScript, mojom::ConsoleMessageLevel::kWarning, - "Scripts may close only the windows that were opened by it.")); + "Scripts may close only the windows that were opened by them.")); return; }
diff --git a/third_party/blink/renderer/core/html/forms/html_select_element.cc b/third_party/blink/renderer/core/html/forms/html_select_element.cc index b0e2f1d..c2b3793 100644 --- a/third_party/blink/renderer/core/html/forms/html_select_element.cc +++ b/third_party/blink/renderer/core/html/forms/html_select_element.cc
@@ -182,14 +182,33 @@ const Vector<int>& list_indices) { DCHECK(UsesMenuList()); DCHECK(IsMultiple()); - for (wtf_size_t i = 0; i < list_indices.size(); ++i) { - bool add_selection_if_not_first = i > 0; - if (HTMLOptionElement* option = OptionAtListIndex(list_indices[i])) - UpdateSelectedState(option, add_selection_if_not_first, false); + + HeapHashSet<Member<HTMLOptionElement>> old_selection; + for (auto* option : GetOptionList()) { + if (option->Selected()) { + old_selection.insert(option); + option->SetSelectedState(false); + } } + + bool has_new_selection = false; + for (int list_index : list_indices) { + if (auto* option = OptionAtListIndex(list_index)) { + option->SetSelectedState(true); + option->SetDirty(true); + auto iter = old_selection.find(option); + if (iter != old_selection.end()) + old_selection.erase(iter); + else + has_new_selection = true; + } + } + SetNeedsValidityCheck(); - // TODO(tkent): Using listBoxOnChange() is very confusing. - ListBoxOnChange(); + if (has_new_selection || !old_selection.IsEmpty()) { + DispatchInputEvent(); + DispatchChangeEvent(); + } } unsigned HTMLSelectElement::ListBoxSize() const { @@ -576,7 +595,7 @@ } void HTMLSelectElement::ListBoxOnChange() { - DCHECK(!UsesMenuList() || is_multiple_); + DCHECK(!UsesMenuList()); const ListItems& items = GetListItems(); @@ -1177,6 +1196,7 @@ void HTMLSelectElement::UpdateSelectedState(HTMLOptionElement* clicked_option, bool multi, bool shift) { + DCHECK(!UsesMenuList()); DCHECK(clicked_option); // Save the selection so it can be compared to the new selection when // dispatching change events during mouseup, or after autoscroll finishes.
diff --git a/third_party/blink/renderer/core/html/forms/html_select_element_test.cc b/third_party/blink/renderer/core/html/forms/html_select_element_test.cc index 4579eee..e947b14 100644 --- a/third_party/blink/renderer/core/html/forms/html_select_element_test.cc +++ b/third_party/blink/renderer/core/html/forms/html_select_element_test.cc
@@ -9,9 +9,11 @@ #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/renderer/core/dom/document.h" #include "third_party/blink/renderer/core/frame/local_frame_view.h" +#include "third_party/blink/renderer/core/frame/settings.h" #include "third_party/blink/renderer/core/html/forms/form_controller.h" #include "third_party/blink/renderer/core/html/forms/html_form_element.h" #include "third_party/blink/renderer/core/html/forms/select_type.h" +#include "third_party/blink/renderer/core/layout/layout_theme.h" #include "third_party/blink/renderer/core/testing/page_test_base.h" #include "third_party/blink/renderer/platform/heap/heap.h" @@ -20,6 +22,7 @@ class HTMLSelectElementTest : public PageTestBase { protected: void SetUp() override; + void TearDown() override; SelectType& GetSelectType(const HTMLSelectElement& select) { return *select.select_type_; @@ -39,11 +42,29 @@ HTMLOptionElement* option) { return GetSelectType(select).PreviousSelectableOption(option); } + + bool FirstSelectIsConnectedAfterSelectMultiple(const Vector<int>& indices) { + auto* select = To<HTMLSelectElement>(GetDocument().body()->firstChild()); + select->focus(); + select->SelectMultipleOptionsByPopup(indices); + return select->isConnected(); + } + + private: + bool original_delegates_flag_; }; void HTMLSelectElementTest::SetUp() { PageTestBase::SetUp(); GetDocument().SetMimeType("text/html"); + original_delegates_flag_ = + LayoutTheme::GetTheme().DelegatesMenuListRendering(); +} + +void HTMLSelectElementTest::TearDown() { + LayoutTheme::GetTheme().SetDelegatesMenuListRenderingForTesting( + original_delegates_flag_); + PageTestBase::TearDown(); } TEST_F(HTMLSelectElementTest, SaveRestoreSelectSingleFormControlState) { @@ -470,4 +491,62 @@ option->remove(); } +// crbug.com/1060039 +TEST_F(HTMLSelectElementTest, SelectMultipleOptionsByPopup) { + GetDocument().GetSettings()->SetScriptEnabled(true); + LayoutTheme::GetTheme().SetDelegatesMenuListRenderingForTesting(true); + + // Select the same set of options. + { + SetHtmlInnerHTML( + "<select multiple onchange='this.remove();'>" + "<option>o0</option><option>o1</option></select>"); + EXPECT_TRUE(FirstSelectIsConnectedAfterSelectMultiple(Vector<int>{})) + << "Onchange handler should not be executed."; + } + { + SetHtmlInnerHTML( + "<select multiple onchange='this.remove();'>" + "<option>o0</option><option selected>o1</option></select>"); + EXPECT_TRUE(FirstSelectIsConnectedAfterSelectMultiple(Vector<int>{1})) + << "Onchange handler should not be executed."; + } + + // 0 old selected options -> 1+ selected options + { + SetHtmlInnerHTML( + "<select multiple onchange='this.remove();'>" + "<option>o0</option><option>o1</option></select>"); + EXPECT_FALSE(FirstSelectIsConnectedAfterSelectMultiple(Vector<int>{0})) + << "Onchange handler should be executed."; + } + + // 1+ old selected options -> more selected options + { + SetHtmlInnerHTML( + "<select multiple onchange='this.remove();'>" + "<option>o0</option><option selected>o1</option></select>"); + EXPECT_FALSE(FirstSelectIsConnectedAfterSelectMultiple(Vector<int>{0, 1})) + << "Onchange handler should be executed."; + } + + // 1+ old selected options -> 0 selected options + { + SetHtmlInnerHTML( + "<select multiple onchange='this.remove();'>" + "<option>o0</option><option selected>o1</option></select>"); + EXPECT_FALSE(FirstSelectIsConnectedAfterSelectMultiple(Vector<int>{})) + << "Onchange handler should be executed."; + } + + // Multiple old selected options -> less selected options + { + SetHtmlInnerHTML( + "<select multiple onchange='this.remove();'>" + "<option selected>o0</option><option selected>o1</option></select>"); + EXPECT_FALSE(FirstSelectIsConnectedAfterSelectMultiple(Vector<int>{1})) + << "Onchange handler should be executed."; + } +} + } // namespace blink
diff --git a/third_party/blink/renderer/core/layout/layout_box.cc b/third_party/blink/renderer/core/layout/layout_box.cc index d778f6f..74ff560 100644 --- a/third_party/blink/renderer/core/layout/layout_box.cc +++ b/third_party/blink/renderer/core/layout/layout_box.cc
@@ -4365,10 +4365,17 @@ return LogicalHeight() - BorderAndPaddingLogicalHeight(); } - if (IsFlexItem()) { - const LayoutFlexibleBox& flex_box = ToLayoutFlexibleBox(*Parent()); - if (flex_box.UseOverrideLogicalHeightForPerentageResolution(*this)) - return OverrideContentLogicalHeight(); + if (IsFlexItemIncludingNG()) { + if (IsFlexItem()) { + const LayoutFlexibleBox& flex_box = ToLayoutFlexibleBox(*Parent()); + if (flex_box.UseOverrideLogicalHeightForPerentageResolution(*this)) + return OverrideContentLogicalHeight(); + } else if (GetCachedLayoutResult()) { + const NGConstraintSpace& space = + GetCachedLayoutResult()->GetConstraintSpaceForCaching(); + if (space.IsFixedBlockSize() && !space.IsFixedBlockSizeIndefinite()) + return space.AvailableSize().block_size; + } } if (h.IsPercentOrCalc() && IsOutOfFlowPositioned()) {
diff --git a/third_party/blink/renderer/core/layout/layout_box_model_object.cc b/third_party/blink/renderer/core/layout/layout_box_model_object.cc index 373892ff..9e22713 100644 --- a/third_party/blink/renderer/core/layout/layout_box_model_object.cc +++ b/third_party/blink/renderer/core/layout/layout_box_model_object.cc
@@ -37,6 +37,8 @@ #include "third_party/blink/renderer/core/layout/layout_geometry_map.h" #include "third_party/blink/renderer/core/layout/layout_inline.h" #include "third_party/blink/renderer/core/layout/layout_view.h" +#include "third_party/blink/renderer/core/layout/ng/ng_constraint_space.h" +#include "third_party/blink/renderer/core/layout/ng/ng_layout_result.h" #include "third_party/blink/renderer/core/paint/compositing/composited_layer_mapping.h" #include "third_party/blink/renderer/core/paint/compositing/paint_layer_compositor.h" #include "third_party/blink/renderer/core/paint/object_paint_invalidator.h" @@ -692,10 +694,17 @@ logical_height_length.IsPercentOrCalc() && cb && IsBox()) { cb->AddPercentHeightDescendant(const_cast<LayoutBox*>(ToLayoutBox(this))); } - if (this_box && this_box->IsFlexItem()) { - const LayoutFlexibleBox& flex_box = ToLayoutFlexibleBox(*Parent()); - if (flex_box.UseOverrideLogicalHeightForPerentageResolution(*this_box)) - return false; + if (this_box && this_box->IsFlexItemIncludingNG()) { + if (this_box->IsFlexItem()) { + const LayoutFlexibleBox& flex_box = ToLayoutFlexibleBox(*Parent()); + if (flex_box.UseOverrideLogicalHeightForPerentageResolution(*this_box)) + return false; + } else if (this_box->GetCachedLayoutResult()) { + const NGConstraintSpace& space = + this_box->GetCachedLayoutResult()->GetConstraintSpaceForCaching(); + if (space.IsFixedBlockSize() && !space.IsFixedBlockSizeIndefinite()) + return false; + } } if (this_box && this_box->IsGridItem() && this_box->HasOverrideContainingBlockContentLogicalHeight())
diff --git a/third_party/blink/renderer/core/layout/layout_theme.cc b/third_party/blink/renderer/core/layout/layout_theme.cc index 5da1a9e5..dca6e656 100644 --- a/third_party/blink/renderer/core/layout/layout_theme.cc +++ b/third_party/blink/renderer/core/layout/layout_theme.cc
@@ -855,6 +855,14 @@ : GetTheme().PlatformFocusRingColor(); } +bool LayoutTheme::DelegatesMenuListRendering() const { + return delegates_menu_list_rendering_; +} + +void LayoutTheme::SetDelegatesMenuListRenderingForTesting(bool flag) { + delegates_menu_list_rendering_ = flag; +} + String LayoutTheme::DisplayNameForFile(const File& file) const { return file.name(); }
diff --git a/third_party/blink/renderer/core/layout/layout_theme.h b/third_party/blink/renderer/core/layout/layout_theme.h index 31eb58e..9ffb65c 100644 --- a/third_party/blink/renderer/core/layout/layout_theme.h +++ b/third_party/blink/renderer/core/layout/layout_theme.h
@@ -232,7 +232,10 @@ virtual bool ShouldHaveSpinButton(HTMLInputElement*) const; // Functions for <select> elements. - virtual bool DelegatesMenuListRendering() const { return false; } + virtual bool DelegatesMenuListRendering() const; + // This function has no effect for LayoutThemeAndroid, of which + // DelegatesMenuListRendering() always returns true. + void SetDelegatesMenuListRenderingForTesting(bool flag); virtual bool PopsMenuByArrowKeys() const { return false; } virtual bool PopsMenuBySpaceKey() const { return false; } virtual bool PopsMenuByReturnKey() const { return false; } @@ -369,6 +372,8 @@ base::TimeDelta caret_blink_interval_ = base::TimeDelta::FromMilliseconds(500); + bool delegates_menu_list_rendering_ = false; + // This color is expected to be drawn on a semi-transparent overlay, // making it more transparent than its alpha value indicates. static const RGBA32 kDefaultTapHighlightColor = 0x66000000;
diff --git a/third_party/blink/renderer/core/loader/image_loader.cc b/third_party/blink/renderer/core/loader/image_loader.cc index 873ebf3..a238c82 100644 --- a/third_party/blink/renderer/core/loader/image_loader.cc +++ b/third_party/blink/renderer/core/loader/image_loader.cc
@@ -73,7 +73,7 @@ namespace { -bool CheckForUnoptimizedImagePolicy(const Document& document, +bool CheckForUnoptimizedImagePolicy(Document& document, ImageResourceContent* new_image) { if (!new_image) return false; @@ -81,7 +81,10 @@ // Render the image as a placeholder image if the image is not sufficiently // well-compressed, according to the unoptimized image feature policies on // |document|. - if (RuntimeEnabledFeatures::UnoptimizedImagePoliciesEnabled(&document) && + // Note: UnoptimizedImagePolicies is currently part of DocumentPolicy. + // The original runtime feature UnoptimizedImagePolicies is no longer used, + // and are planned to be removed. + if (RuntimeEnabledFeatures::DocumentPolicyEnabled(&document) && !new_image->IsAcceptableCompressionRatio( *document.ToExecutionContext())) { return true;
diff --git a/third_party/blink/renderer/core/loader/resource/image_resource_content.cc b/third_party/blink/renderer/core/loader/resource/image_resource_content.cc index 77c4ea3d..c78d0dbb 100644 --- a/third_party/blink/renderer/core/loader/resource/image_resource_content.cc +++ b/third_party/blink/renderer/core/loader/resource/image_resource_content.cc
@@ -509,7 +509,7 @@ } bool ImageResourceContent::IsAcceptableCompressionRatio( - const ExecutionContext& context) { + ExecutionContext& context) { if (!image_) return true; @@ -538,18 +538,18 @@ if (compression_format == ImageDecoder::kLossyFormat) { // Enforce the lossy image policy. return context.IsFeatureEnabled( - mojom::blink::FeaturePolicyFeature::kUnoptimizedLossyImages, + mojom::blink::DocumentPolicyFeature::kUnoptimizedLossyImages, PolicyValue(compression_ratio_1k), ReportOptions::kReportOnFailure, g_empty_string, image_url); } if (compression_format == ImageDecoder::kLosslessFormat) { // Enforce the lossless image policy. bool enabled_by_10k_policy = context.IsFeatureEnabled( - mojom::blink::FeaturePolicyFeature::kUnoptimizedLosslessImages, + mojom::blink::DocumentPolicyFeature::kUnoptimizedLosslessImages, PolicyValue(compression_ratio_10k), ReportOptions::kReportOnFailure, g_empty_string, image_url); bool enabled_by_1k_policy = context.IsFeatureEnabled( - mojom::blink::FeaturePolicyFeature::kUnoptimizedLosslessImagesStrict, + mojom::blink::DocumentPolicyFeature::kUnoptimizedLosslessImagesStrict, PolicyValue(compression_ratio_1k), ReportOptions::kReportOnFailure, g_empty_string, image_url); return enabled_by_10k_policy && enabled_by_1k_policy;
diff --git a/third_party/blink/renderer/core/loader/resource/image_resource_content.h b/third_party/blink/renderer/core/loader/resource/image_resource_content.h index eb169a9..b7e7c8f4 100644 --- a/third_party/blink/renderer/core/loader/resource/image_resource_content.h +++ b/third_party/blink/renderer/core/loader/resource/image_resource_content.h
@@ -182,7 +182,7 @@ // extraneous metadata). "well-compressed" is determined by comparing the // image's compression ratio against a specific value that is defined by an // unoptimized image feature policy on |context|. - bool IsAcceptableCompressionRatio(const ExecutionContext& context); + bool IsAcceptableCompressionRatio(ExecutionContext& context); void LoadDeferredImage(ResourceFetcher* fetcher);
diff --git a/third_party/blink/renderer/core/paint/image_painter.cc b/third_party/blink/renderer/core/paint/image_painter.cc index 7de0e01..75cfd6a 100644 --- a/third_party/blink/renderer/core/paint/image_painter.cc +++ b/third_party/blink/renderer/core/paint/image_painter.cc
@@ -61,7 +61,7 @@ cached_image ? cached_image->Url().GetString() : g_empty_string; return !layout_image.GetDocument().IsFeatureEnabled( - mojom::blink::FeaturePolicyFeature::kOversizedImages, + mojom::blink::DocumentPolicyFeature::kOversizedImages, blink::PolicyValue( std::max(downscale_ratio_width, downscale_ratio_height), blink::mojom::PolicyValueType::kDecDouble),
diff --git a/third_party/blink/renderer/core/paint/theme_painter.cc b/third_party/blink/renderer/core/paint/theme_painter.cc index 5639ec5..343d327 100644 --- a/third_party/blink/renderer/core/paint/theme_painter.cc +++ b/third_party/blink/renderer/core/paint/theme_painter.cc
@@ -143,18 +143,10 @@ switch (part) { case kCheckboxPart: { COUNT_APPEARANCE(doc, Checkbox); - // Count usage of non-rectangular checkbox and radio buttons. - if (r.Width() != r.Height()) { - UseCounter::Count(doc, WebFeature::kInputTypeCheckboxRenderedNonSquare); - } return PaintCheckbox(node, o.GetDocument(), style, paint_info, r); } case kRadioPart: { COUNT_APPEARANCE(doc, Radio); - // Count usage of non-rectangular checkbox and radio buttons. - if (r.Width() != r.Height()) { - UseCounter::Count(doc, WebFeature::kInputTypeRadioRenderedNonSquare); - } return PaintRadio(node, o.GetDocument(), style, paint_info, r); } case kPushButtonPart: {
diff --git a/third_party/blink/renderer/core/timing/measure_memory/measure_memory_breakdown.idl b/third_party/blink/renderer/core/timing/measure_memory/measure_memory_breakdown.idl index fb7fc06..e90820e6 100644 --- a/third_party/blink/renderer/core/timing/measure_memory/measure_memory_breakdown.idl +++ b/third_party/blink/renderer/core/timing/measure_memory/measure_memory_breakdown.idl
@@ -8,5 +8,5 @@ dictionary MeasureMemoryBreakdown { unsigned long long bytes; sequence<DOMString> attribution; - sequence<DOMString> userAgentSpecificType; + sequence<DOMString> userAgentSpecificTypes; };
diff --git a/third_party/blink/renderer/core/timing/measure_memory/measure_memory_delegate.cc b/third_party/blink/renderer/core/timing/measure_memory/measure_memory_delegate.cc index d669385..3044120 100644 --- a/third_party/blink/renderer/core/timing/measure_memory/measure_memory_delegate.cc +++ b/third_party/blink/renderer/core/timing/measure_memory/measure_memory_delegate.cc
@@ -152,12 +152,13 @@ return per_frame; } -MeasureMemoryBreakdown* CreateMeasureMemoryBreakdown(size_t bytes, - const Vector<String>& type, - const String& url) { +MeasureMemoryBreakdown* CreateMeasureMemoryBreakdown( + size_t bytes, + const Vector<String>& types, + const String& url) { MeasureMemoryBreakdown* result = MeasureMemoryBreakdown::Create(); result->setBytes(bytes); - result->setUserAgentSpecificType(type); + result->setUserAgentSpecificTypes(types); result->setAttribution(url.length() ? Vector<String>{url} : Vector<String>()); return result; }
diff --git a/third_party/blink/renderer/platform/graphics/gpu/webgpu_swap_buffer_provider.cc b/third_party/blink/renderer/platform/graphics/gpu/webgpu_swap_buffer_provider.cc index 2ab22233..4b438b03 100644 --- a/third_party/blink/renderer/platform/graphics/gpu/webgpu_swap_buffer_provider.cc +++ b/third_party/blink/renderer/platform/graphics/gpu/webgpu_swap_buffer_provider.cc
@@ -101,10 +101,6 @@ current_swap_buffer_ = base::AdoptRef(new SwapBuffer( this, mailbox, creation_token, static_cast<gfx::Size>(size))); - // Make sure previous Dawn wire commands are sent so that for example the ID - // is freed before we associate the SharedImage. - webgpu->FlushCommands(); - // Ensure the shared image is allocated service-side before working with it webgpu->WaitSyncTokenCHROMIUM( current_swap_buffer_->access_finished_token.GetConstData());
diff --git a/third_party/blink/renderer/platform/wtf/vector_backed_linked_list.h b/third_party/blink/renderer/platform/wtf/vector_backed_linked_list.h index 4b03b75..928ca4f 100644 --- a/third_party/blink/renderer/platform/wtf/vector_backed_linked_list.h +++ b/third_party/blink/renderer/platform/wtf/vector_backed_linked_list.h
@@ -408,14 +408,10 @@ IncomingValueType&& value) { wtf_size_t position_index = position.GetIndex(); wtf_size_t prev_index = nodes_[position_index].prev_index_; - Node& prev = nodes_[prev_index]; - Node& next = nodes_[position_index]; wtf_size_t new_entry_index; if (IsFreeListEmpty()) { new_entry_index = nodes_.size(); - prev.next_index_ = new_entry_index; - next.prev_index_ = new_entry_index; nodes_.push_back(Node(prev_index, position_index, std::forward<IncomingValueType>(value))); } else { @@ -425,6 +421,8 @@ free_head = Node(prev_index, position_index, std::forward<IncomingValueType>(value)); } + nodes_[prev_index].next_index_ = new_entry_index; + nodes_[position_index].prev_index_ = new_entry_index; size_++; return iterator(new_entry_index, this); }
diff --git a/third_party/blink/renderer/platform/wtf/vector_backed_linked_list_test.cc b/third_party/blink/renderer/platform/wtf/vector_backed_linked_list_test.cc index fae099ff..ca3102c 100644 --- a/third_party/blink/renderer/platform/wtf/vector_backed_linked_list_test.cc +++ b/third_party/blink/renderer/platform/wtf/vector_backed_linked_list_test.cc
@@ -143,6 +143,12 @@ list.push_back(5); EXPECT_EQ(list.size(), 5u); + int i = 1; + for (auto element : list) { + EXPECT_EQ(element, i); + i++; + } + List::iterator target = list.begin(); ++target; it = list.erase(target); // list = {1, 3, 4, 5} @@ -162,6 +168,10 @@ EXPECT_EQ(*it, 5); ++it; EXPECT_TRUE(it == list.end()); + + list.push_back(6); + EXPECT_EQ(list.front(), 3); + EXPECT_EQ(list.back(), 6); } TEST(VectorBackedLinkedList, PopFront) {
diff --git a/third_party/blink/tools/blinkpy/presubmit/audit_non_blink_usage.py b/third_party/blink/tools/blinkpy/presubmit/audit_non_blink_usage.py index c548903..3b0ee35 100755 --- a/third_party/blink/tools/blinkpy/presubmit/audit_non_blink_usage.py +++ b/third_party/blink/tools/blinkpy/presubmit/audit_non_blink_usage.py
@@ -1137,11 +1137,9 @@ path = path.replace('\\', '/') basename, ext = os.path.splitext(path) # Only check code. Ignore tests and fuzzers. - # TODO(tkent): Remove 'Test' after the great mv. if (ext not in ('.cc', '.cpp', '.h', '.mm') or path.find('/testing/') >= 0 or path.find('/tests/') >= 0 - or basename.endswith('Test') or basename.endswith('_test') or basename.endswith('_test_helpers') or basename.endswith('_unittest')
diff --git a/third_party/blink/tools/extract_expectation_names.py b/third_party/blink/tools/extract_expectation_names.py index da3c216..6268ec5 100755 --- a/third_party/blink/tools/extract_expectation_names.py +++ b/third_party/blink/tools/extract_expectation_names.py
@@ -7,7 +7,11 @@ # Given an expectations file (e.g. web_tests/WebGPUExpectations), extracts only # the test name from each expectation (e.g. wpt_internal/webgpu/cts.html?...). -from blinkpy.web_tests.models.test_expectations import TestExpectationLine +from blinkpy.common import path_finder + +path_finder.add_typ_dir_to_sys_path() + +from typ.expectations_parser import TaggedTestListParser import sys @@ -19,9 +23,7 @@ filename = sys.argv[1] with open(filename) as f: port = StubPort() - line_number = 1 - for line in f: - test_expectation = TestExpectationLine.tokenize_line(filename, line, line_number, port) - if test_expectation.name: - print test_expectation.name - line_number += 1 + parser = TaggedTestListParser(f.read()) + for test_expectation in parser.expectations: + if test_expectation.test: + print test_expectation.test
diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/web_tests/TestExpectations index bcc97b2..a76e85df 100644 --- a/third_party/blink/web_tests/TestExpectations +++ b/third_party/blink/web_tests/TestExpectations
@@ -922,7 +922,7 @@ crbug.com/591099 [ Fuchsia ] tables/mozilla_expected_failures/bugs/bug1010.html [ Failure ] crbug.com/591099 [ Fuchsia ] tables/mozilla_expected_failures/bugs/bug1055-2.html [ Failure ] crbug.com/591099 [ Fuchsia ] tables/mozilla_expected_failures/bugs/bug2479-5.html [ Failure ] -crbug.com/591099 [ Win ] images/feature-policy-oversized-images-resize.html [ Skip ] +crbug.com/591099 [ Win ] http/tests/images/document-policy-oversized-images-resize.html [ Skip ] crbug.com/591099 [ Mac ] css2.1/t1202-counter-09-b.html [ Failure ] crbug.com/591099 [ Mac ] css2.1/t1202-counters-09-b.html [ Failure ] crbug.com/591099 [ Mac ] external/wpt/css/CSS2/text/white-space-bidirectionality-001.xht [ Failure ] @@ -959,8 +959,8 @@ crbug.com/591099 [ Mac ] fast/css3-text/css3-text-decoration/text-underline-position/text-underline-position-auto.html [ Failure ] crbug.com/591099 [ Mac ] paint/invalidation/flexbox/remove-inline-block-descendant-of-flex.html [ Failure ] crbug.com/591099 [ Mac ] fast/replaced/input-radio-height-inside-auto-container.html [ Failure ] -crbug.com/591099 [ Mac ] images/feature-policy-oversized-images-resize.html [ Failure ] -crbug.com/974717 [ Linux ] images/feature-policy-oversized-images-resize.html [ Failure Pass ] +crbug.com/591099 [ Mac ] http/tests/images/document-policy-oversized-images-resize.html [ Failure ] +crbug.com/974717 [ Linux ] http/tests/images/document-policy-oversized-images-resize.html [ Failure Pass ] crbug.com/591099 [ Mac10.11 ] virtual/audio-service/media/track/track-cue-rendering-position-auto-rtl.html [ Failure ] crbug.com/591099 [ Mac10.13 ] fast/dynamic/outerHTML-doc.html [ Failure ] @@ -1485,7 +1485,6 @@ # Flexbox in NG # # Fail in NG flex, pass in legacy flex. -crbug.com/845235 virtual/layout_ng_flex_box/css3/flexbox/relpos-with-percentage-top.html [ Failure ] crbug.com/845235 virtual/layout_ng_flex_box/external/wpt/css/css-flexbox/hittest-overlapping-margin.html [ Failure ] crbug.com/845235 virtual/layout_ng_flex_box/external/wpt/css/css-flexbox/hittest-overlapping-order.html [ Failure ] crbug.com/845235 virtual/layout_ng_flex_box/external/wpt/css/css-flexbox/quirks-auto-block-size-with-percentage-item.html [ Pass Failure ] @@ -5518,7 +5517,7 @@ crbug.com/922951 http/tests/cache/subresource-fragment-identifier.html [ Failure Pass Timeout Crash ] crbug.com/922951 http/tests/devtools/tracing/timeline-network-received-data.js [ Failure Pass Timeout Crash ] crbug.com/922951 http/tests/history/back-to-post.html [ Failure Pass Timeout Crash ] -crbug.com/922951 http/tests/images/feature-policy-unoptimized-images-cached-image.html [ Failure Pass Timeout Crash ] +crbug.com/922951 http/tests/images/document-policy-unoptimized-images-cached-image.html [ Failure Pass Timeout Crash ] crbug.com/922951 http/tests/security/offscreencanvas-placeholder-read-blocked-no-crossorigin.html [ Failure Pass Timeout Crash ] crbug.com/922951 http/tests/security/cookies/basic.html [ Failure Pass Timeout Crash ] crbug.com/922951 http/tests/webaudio/autoplay-crossorigin.html [ Failure Pass Timeout Crash ] @@ -5553,9 +5552,6 @@ crbug.com/910979 http/tests/html/validation-bubble-oopif-clip.html [ Failure Pass ] -# Sheriff 2019-01-24 -crbug.com/924954 http/tests/images/feature-policy-image-policies-with-border-radius.html [ Pass Failure ] - # Sheriff 2019-02-01, 2019-02-19 # These are crashy on Win10, and seem to leave processes lying around, causing the swarming # task to hang. @@ -5861,7 +5857,8 @@ # Sheriff 2019-06-24 crbug.com/978000 inspector-protocol/page/setWebLifecycleState.js [ Pass Timeout ] -crbug.com/946700 [ Win ] http/tests/devtools/coverage/decorations-after-script-formatter.js [ Pass Timeout ] +# decorations-after-script-formatter.js disabled to land changes in DevTools https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/1981175 +crbug.com/946700 http/tests/devtools/coverage/decorations-after-script-formatter.js [ Pass Timeout Failure ] crbug.com/978254 [ Win ] http/tests/devtools/elements/edit/edit-dom-actions-4.js [ Pass Timeout ] crbug.com/977015 [ Win ] http/tests/devtools/elements/shadow/shadow-distribution.js [ Pass Timeout ] @@ -6248,7 +6245,6 @@ # Failing document policy tests crbug.com/993790 external/wpt/document-policy/required-policy/separate-document-policies.html [ Failure ] -crbug.com/993790 http/tests/images/document-policy-unoptimized-lossless-images.php [ Failure ] # Temporary suppression to allow devtools-frontend changes crbug.com/1029489 http/tests/devtools/elements/elements-linkify-attributes.js [ Pass Failure Timeout ] @@ -6773,13 +6769,12 @@ crbug.com/1059123 virtual/omt-worker-fetch/http/tests/origin_trials/webexposed/animationworklet-origin-trial-interfaces-worklet-scope.html [ Pass Failure Timeout ] crbug.com/1059123 virtual/origin-trials-runtimeflags-disabled/http/tests/origin_trials/webexposed/animationworklet-origin-trial-interfaces-worklet-scope.html [ Pass Failure ] -# Temporarily disable to land https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/1981175 -crbug.com/1056384 third_party/blink/web_tests/http/tests/devtools/coverage/decorations-after-script-formatter.js [ Pass Failure ] -crbug.com/1056384 third_party/blink/web_tests/http/tests/devtools/sources/debugger-ui/async-call-stack-url.js [ Pass Failure ] -crbug.com/1056384 third_party/blink/web_tests/http/tests/devtools/sources/debugger-ui/reveal-not-skipped.js [ Pass Failure ] -crbug.com/1056384 third_party/blink/web_tests/http/tests/devtools/sources/debugger-ui/script-formatter-breakpoints-2.js [ Pass Failure ] -crbug.com/1056384 third_party/blink/web_tests/http/tests/devtools/sources/debugger-ui/script-formatter-breakpoints-3.js [ Pass Failure ] -crbug.com/1056384 third_party/blink/web_tests/http/tests/devtools/sources/debugger-ui/script-formatter-search.js [ Pass Failure ] +# Temporarily disabled to land changes in DevTools https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/1981175 +crbug.com/1056384 http/tests/devtools/sources/debugger-ui/async-call-stack-url.js [ Pass Failure ] +crbug.com/1056384 http/tests/devtools/sources/debugger-ui/reveal-not-skipped.js [ Pass Failure ] +crbug.com/1056384 http/tests/devtools/sources/debugger-ui/script-formatter-breakpoints-2.js [ Pass Failure ] +crbug.com/1056384 http/tests/devtools/sources/debugger-ui/script-formatter-breakpoints-3.js [ Pass Failure ] +crbug.com/1056384 http/tests/devtools/sources/debugger-ui/script-formatter-search.js [ Pass Failure ] # Sheriff 2020-03-10 crbug.com/1060175 [ Mac ] accessibility/aom-click-action.html [ Pass Failure Timeout ]
diff --git a/third_party/blink/web_tests/external/wpt/css/css-animations/CSSAnimation-pausing.tentative-expected.txt b/third_party/blink/web_tests/external/wpt/css/css-animations/CSSAnimation-pausing.tentative-expected.txt deleted file mode 100644 index c8e6a8202..0000000 --- a/third_party/blink/web_tests/external/wpt/css/css-animations/CSSAnimation-pausing.tentative-expected.txt +++ /dev/null
@@ -1,12 +0,0 @@ -This is a testharness.js-based test. -PASS play() overrides animation-play-state -PASS play() does NOT override the animation-play-state if there was an error -PASS pause() overrides animation-play-state -FAIL reverse() overrides animation-play-state when it starts playing the animation assert_equals: Should still be running even after flipping the animation-play-state expected "running" but got "paused" -PASS reverse() does NOT override animation-play-state if the animation is already running -FAIL Setting the startTime to null overrides animation-play-state if the animation is already running assert_equals: Should still be paused even after flipping the animation-play-state expected "paused" but got "running" -FAIL Setting the startTime to non-null overrides animation-play-state if the animation is paused assert_equals: Should still be running even after flipping the animation-play-state expected "running" but got "paused" -PASS Setting the startTime to non-null does NOT override the animation-play-state if the animation is already running -PASS Setting the current time completes a pending pause -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/external/wpt/feature-policy/reporting/oversized-images-reporting.html b/third_party/blink/web_tests/external/wpt/document-policy/reporting/oversized-images-reporting.html similarity index 82% rename from third_party/blink/web_tests/external/wpt/feature-policy/reporting/oversized-images-reporting.html rename to third_party/blink/web_tests/external/wpt/document-policy/reporting/oversized-images-reporting.html index ef365e06..bef7db2 100644 --- a/third_party/blink/web_tests/external/wpt/feature-policy/reporting/oversized-images-reporting.html +++ b/third_party/blink/web_tests/external/wpt/document-policy/reporting/oversized-images-reporting.html
@@ -3,7 +3,7 @@ <head> <script src='/resources/testharness.js'></script> <script src='/resources/testharnessreport.js'></script> - <script src='../resources/feature-policy-report-json.js'></script> + <script src='../resources/document-policy-report-json.js'></script> </head> <body> <img src="./oversized.jpg" alt="oversized image" width="50" height="50"> @@ -13,7 +13,7 @@ t.step_func_done((reports, _) => { assert_greater_than(reports.length, 0); const report = reports[0]; - assert_equals(report.type, "feature-policy-violation"); + assert_equals(report.type, "document-policy-violation"); assert_equals(report.url, document.location.href); const rbody = report.body; assert_equals(rbody.featureId, "oversized-images"); @@ -22,7 +22,7 @@ assert_equals(rbody.columnNumber, null); check_report_json(reports[0]); }), - {types: ['feature-policy-violation'], buffered: true} + {types: ['document-policy-violation'], buffered: true} ).observe(); }, "oversized-images Report Format")
diff --git a/third_party/blink/web_tests/external/wpt/document-policy/reporting/oversized-images-reporting.html.headers b/third_party/blink/web_tests/external/wpt/document-policy/reporting/oversized-images-reporting.html.headers new file mode 100644 index 0000000..206db53 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/document-policy/reporting/oversized-images-reporting.html.headers
@@ -0,0 +1 @@ +Document-Policy: oversized-images;scale=2.0
diff --git a/third_party/blink/web_tests/external/wpt/feature-policy/reporting/oversized.jpg b/third_party/blink/web_tests/external/wpt/document-policy/reporting/oversized.jpg similarity index 100% rename from third_party/blink/web_tests/external/wpt/feature-policy/reporting/oversized.jpg rename to third_party/blink/web_tests/external/wpt/document-policy/reporting/oversized.jpg Binary files differ
diff --git a/third_party/blink/web_tests/external/wpt/feature-policy/reporting/unoptimized-image.jpg b/third_party/blink/web_tests/external/wpt/document-policy/reporting/unoptimized-image.jpg similarity index 100% rename from third_party/blink/web_tests/external/wpt/feature-policy/reporting/unoptimized-image.jpg rename to third_party/blink/web_tests/external/wpt/document-policy/reporting/unoptimized-image.jpg Binary files differ
diff --git a/third_party/blink/web_tests/external/wpt/feature-policy/reporting/unoptimized-lossy-images-reporting-onload.html b/third_party/blink/web_tests/external/wpt/document-policy/reporting/unoptimized-lossy-images-reporting-onload.html similarity index 81% rename from third_party/blink/web_tests/external/wpt/feature-policy/reporting/unoptimized-lossy-images-reporting-onload.html rename to third_party/blink/web_tests/external/wpt/document-policy/reporting/unoptimized-lossy-images-reporting-onload.html index 8c06047..948c435 100644 --- a/third_party/blink/web_tests/external/wpt/feature-policy/reporting/unoptimized-lossy-images-reporting-onload.html +++ b/third_party/blink/web_tests/external/wpt/document-policy/reporting/unoptimized-lossy-images-reporting-onload.html
@@ -11,7 +11,7 @@ var check_report_format = (reports, observer) => { let report = reports[0]; - assert_equals(report.type, "feature-policy-violation"); + assert_equals(report.type, "document-policy-violation"); assert_equals(report.url, document.location.href); assert_equals(report.body.featureId, "unoptimized-lossy-images"); assert_equals(report.body.disposition, "enforce"); @@ -19,7 +19,7 @@ async_test(t => { new ReportingObserver(t.step_func_done(check_report_format), - {types: ['feature-policy-violation'], buffered: true}).observe(); + {types: ['document-policy-violation'], buffered: true}).observe(); }, "unoptimized-images Report Format"); </script> </body>
diff --git a/third_party/blink/web_tests/external/wpt/document-policy/reporting/unoptimized-lossy-images-reporting-onload.html.headers b/third_party/blink/web_tests/external/wpt/document-policy/reporting/unoptimized-lossy-images-reporting-onload.html.headers new file mode 100644 index 0000000..261d5db1 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/document-policy/reporting/unoptimized-lossy-images-reporting-onload.html.headers
@@ -0,0 +1 @@ +Document-Policy: unoptimized-lossy-images;bpp=0.5
diff --git a/third_party/blink/web_tests/external/wpt/feature-policy/reporting/unoptimized-lossy-images-reporting.html b/third_party/blink/web_tests/external/wpt/document-policy/reporting/unoptimized-lossy-images-reporting.html similarity index 84% rename from third_party/blink/web_tests/external/wpt/feature-policy/reporting/unoptimized-lossy-images-reporting.html rename to third_party/blink/web_tests/external/wpt/document-policy/reporting/unoptimized-lossy-images-reporting.html index 8dcf110d..d4b8611a 100644 --- a/third_party/blink/web_tests/external/wpt/feature-policy/reporting/unoptimized-lossy-images-reporting.html +++ b/third_party/blink/web_tests/external/wpt/document-policy/reporting/unoptimized-lossy-images-reporting.html
@@ -9,7 +9,7 @@ <script> var check_report_format = (reports, observer) => { let report = reports[0]; - assert_equals(report.type, "feature-policy-violation"); + assert_equals(report.type, "document-policy-violation"); assert_equals(report.url, document.location.href); assert_equals(report.body.featureId, "unoptimized-lossy-images"); assert_equals(report.body.disposition, "enforce"); @@ -20,7 +20,7 @@ async_test(t => { new ReportingObserver(t.step_func_done(check_report_format), - {types: ['feature-policy-violation'], buffered: true}).observe(); + {types: ['document-policy-violation'], buffered: true}).observe(); }, "unoptimized-images Report Format"); </script> </body>
diff --git a/third_party/blink/web_tests/external/wpt/document-policy/reporting/unoptimized-lossy-images-reporting.html.headers b/third_party/blink/web_tests/external/wpt/document-policy/reporting/unoptimized-lossy-images-reporting.html.headers new file mode 100644 index 0000000..261d5db1 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/document-policy/reporting/unoptimized-lossy-images-reporting.html.headers
@@ -0,0 +1 @@ +Document-Policy: unoptimized-lossy-images;bpp=0.5
diff --git a/third_party/blink/web_tests/external/wpt/document-policy/resources/document-policy-report-json.js b/third_party/blink/web_tests/external/wpt/document-policy/resources/document-policy-report-json.js new file mode 100644 index 0000000..035857b --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/document-policy/resources/document-policy-report-json.js
@@ -0,0 +1,20 @@ +/** + * @fileoverview functions for ensuring document policy report is serializable + */ + +const check_report_json = (report) => { + // Ensures toJSON method exists on report. + assert_equals(typeof report.toJSON, "function"); + const report_json = report.toJSON(); + // Ensures toJSON() call is successful. + assert_equals(report.type, report_json.type); + assert_equals(report.url, report_json.url); + assert_equals(report.body.featureId, report_json.body.featureId); + assert_equals(report.body.disposition, report_json.body.disposition); + assert_equals(report.body.sourceFile, report_json.body.sourceFile); + assert_equals(report.body.lineNumber, report_json.body.lineNumber); + assert_equals(report.body.columnNumber, report_json.body.columnNumber); + // Ensures JSON.stringify() serializes the report correctly. + assert_false(JSON.stringify(report) === "{}"); + assert_equals(JSON.stringify(report), JSON.stringify(report_json)); +} \ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/feature-policy/reporting/oversized-images-reporting.html.headers b/third_party/blink/web_tests/external/wpt/feature-policy/reporting/oversized-images-reporting.html.headers deleted file mode 100644 index 02bcbb9..0000000 --- a/third_party/blink/web_tests/external/wpt/feature-policy/reporting/oversized-images-reporting.html.headers +++ /dev/null
@@ -1 +0,0 @@ -Feature-Policy: oversized-images 'none'
diff --git a/third_party/blink/web_tests/external/wpt/feature-policy/reporting/unoptimized-lossy-images-reporting-onload.html.headers b/third_party/blink/web_tests/external/wpt/feature-policy/reporting/unoptimized-lossy-images-reporting-onload.html.headers deleted file mode 100644 index 5cda6ae01..0000000 --- a/third_party/blink/web_tests/external/wpt/feature-policy/reporting/unoptimized-lossy-images-reporting-onload.html.headers +++ /dev/null
@@ -1 +0,0 @@ -Feature-Policy: unoptimized-lossy-images 'none'
diff --git a/third_party/blink/web_tests/external/wpt/feature-policy/reporting/unoptimized-lossy-images-reporting.html.headers b/third_party/blink/web_tests/external/wpt/feature-policy/reporting/unoptimized-lossy-images-reporting.html.headers deleted file mode 100644 index 5cda6ae01..0000000 --- a/third_party/blink/web_tests/external/wpt/feature-policy/reporting/unoptimized-lossy-images-reporting.html.headers +++ /dev/null
@@ -1 +0,0 @@ -Feature-Policy: unoptimized-lossy-images 'none'
diff --git a/third_party/blink/web_tests/external/wpt/measure-memory/resources/common.js b/third_party/blink/web_tests/external/wpt/measure-memory/resources/common.js index 3b5201d..f7332a8 100644 --- a/third_party/blink/web_tests/external/wpt/measure-memory/resources/common.js +++ b/third_party/blink/web_tests/external/wpt/measure-memory/resources/common.js
@@ -5,8 +5,8 @@ let allowed = new Set(options.allowed); assert_own_property(breakdown, 'bytes'); assert_greater_than_equal(breakdown.bytes, 0); - assert_own_property(breakdown, 'userAgentSpecificType'); - for (let userAgentSpecificType of breakdown.userAgentSpecificType) { + assert_own_property(breakdown, 'userAgentSpecificTypes'); + for (let userAgentSpecificType of breakdown.userAgentSpecificTypes) { assert_equals(typeof userAgentSpecificType, 'string'); } assert_own_property(breakdown, 'attribution');
diff --git a/third_party/blink/web_tests/http/tests/images/document-policy-image-policies-with-border-radius-expected.txt b/third_party/blink/web_tests/http/tests/images/document-policy-image-policies-with-border-radius-expected.txt new file mode 100644 index 0000000..6c9f3ccb --- /dev/null +++ b/third_party/blink/web_tests/http/tests/images/document-policy-image-policies-with-border-radius-expected.txt
@@ -0,0 +1 @@ +CONSOLE ERROR: Document policy violation: unoptimized-lossy-images is not allowed in this document.
diff --git a/third_party/blink/web_tests/http/tests/images/document-policy-image-policies-with-border-radius.php b/third_party/blink/web_tests/http/tests/images/document-policy-image-policies-with-border-radius.php new file mode 100644 index 0000000..6a226d3 --- /dev/null +++ b/third_party/blink/web_tests/http/tests/images/document-policy-image-policies-with-border-radius.php
@@ -0,0 +1,21 @@ +<?php +header("Document-Policy: unoptimized-lossy-images;bpp=0.5"); +?> +<!DOCTYPE html> +<style> +body { + font: 10px Ahem; +} +img { + border: 1px solid blue; + border-radius: 5px; +} +</style> +<head> + <base href="resources/"> +</head> +<body> + <div width="440" height="180"> + <img src="Fisher-large.jpg"/> + </div> +</body>
diff --git a/third_party/blink/web_tests/http/tests/images/document-policy-oversized-images-edge-cases-expected.txt b/third_party/blink/web_tests/http/tests/images/document-policy-oversized-images-edge-cases-expected.txt new file mode 100644 index 0000000..da7b2ea --- /dev/null +++ b/third_party/blink/web_tests/http/tests/images/document-policy-oversized-images-edge-cases-expected.txt
@@ -0,0 +1 @@ +CONSOLE ERROR: Document policy violation: oversized-images is not allowed in this document.
diff --git a/third_party/blink/web_tests/http/tests/images/document-policy-oversized-images-edge-cases.html b/third_party/blink/web_tests/http/tests/images/document-policy-oversized-images-edge-cases.html new file mode 100644 index 0000000..b6c16cd6 --- /dev/null +++ b/third_party/blink/web_tests/http/tests/images/document-policy-oversized-images-edge-cases.html
@@ -0,0 +1,6 @@ +<!DOCTYPE html> +<body> + <iframe id="simple" src="resources/frame-with-oversized-images-edge-cases.php" + width="600" height="500"> + </iframe> +</body>
diff --git a/third_party/blink/web_tests/http/tests/images/document-policy-oversized-images-expected.txt b/third_party/blink/web_tests/http/tests/images/document-policy-oversized-images-expected.txt new file mode 100644 index 0000000..ad86967 --- /dev/null +++ b/third_party/blink/web_tests/http/tests/images/document-policy-oversized-images-expected.txt
@@ -0,0 +1,6 @@ +CONSOLE ERROR: Document policy violation: oversized-images is not allowed in this document. +CONSOLE ERROR: Document policy violation: oversized-images is not allowed in this document. +CONSOLE ERROR: Document policy violation: oversized-images is not allowed in this document. +CONSOLE ERROR: Document policy violation: oversized-images is not allowed in this document. +CONSOLE ERROR: Document policy violation: oversized-images is not allowed in this document. +CONSOLE ERROR: Document policy violation: oversized-images is not allowed in this document.
diff --git a/third_party/blink/web_tests/http/tests/images/document-policy-oversized-images-forced-layout-expected.txt b/third_party/blink/web_tests/http/tests/images/document-policy-oversized-images-forced-layout-expected.txt new file mode 100644 index 0000000..6ee8ba3 --- /dev/null +++ b/third_party/blink/web_tests/http/tests/images/document-policy-oversized-images-forced-layout-expected.txt
@@ -0,0 +1,2 @@ +CONSOLE ERROR: Document policy violation: oversized-images is not allowed in this document. +CONSOLE ERROR: Document policy violation: oversized-images is not allowed in this document.
diff --git a/third_party/blink/web_tests/http/tests/images/document-policy-oversized-images-forced-layout.html b/third_party/blink/web_tests/http/tests/images/document-policy-oversized-images-forced-layout.html new file mode 100644 index 0000000..34da9753 --- /dev/null +++ b/third_party/blink/web_tests/http/tests/images/document-policy-oversized-images-forced-layout.html
@@ -0,0 +1,4 @@ +<!DOCTYPE html> +<iframe src="resources/frame-with-oversized-images-forced-layout.php" + frameborder="0"> +</iframe>
diff --git a/third_party/blink/web_tests/http/tests/images/document-policy-oversized-images-resize-expected.txt b/third_party/blink/web_tests/http/tests/images/document-policy-oversized-images-resize-expected.txt new file mode 100644 index 0000000..5e471995 --- /dev/null +++ b/third_party/blink/web_tests/http/tests/images/document-policy-oversized-images-resize-expected.txt
@@ -0,0 +1,4 @@ +CONSOLE ERROR: Document policy violation: oversized-images is not allowed in this document. +CONSOLE ERROR: Document policy violation: oversized-images is not allowed in this document. +CONSOLE ERROR: Document policy violation: oversized-images is not allowed in this document. +CONSOLE ERROR: Document policy violation: oversized-images is not allowed in this document.
diff --git a/third_party/blink/web_tests/http/tests/images/document-policy-oversized-images-resize.html b/third_party/blink/web_tests/http/tests/images/document-policy-oversized-images-resize.html new file mode 100644 index 0000000..686987d2 --- /dev/null +++ b/third_party/blink/web_tests/http/tests/images/document-policy-oversized-images-resize.html
@@ -0,0 +1,6 @@ +<!DOCTYPE html> +<body> + <iframe id="simple" src="resources/frame-with-oversized-images-resize.php" + width="600" height="500"> + </iframe> +</body>
diff --git a/third_party/blink/web_tests/http/tests/images/document-policy-oversized-images-responsive-image-expected.txt b/third_party/blink/web_tests/http/tests/images/document-policy-oversized-images-responsive-image-expected.txt new file mode 100644 index 0000000..6ee8ba3 --- /dev/null +++ b/third_party/blink/web_tests/http/tests/images/document-policy-oversized-images-responsive-image-expected.txt
@@ -0,0 +1,2 @@ +CONSOLE ERROR: Document policy violation: oversized-images is not allowed in this document. +CONSOLE ERROR: Document policy violation: oversized-images is not allowed in this document.
diff --git a/third_party/blink/web_tests/images/feature-policy-oversized-images-responsive-image.html b/third_party/blink/web_tests/http/tests/images/document-policy-oversized-images-responsive-image.html similarity index 61% rename from third_party/blink/web_tests/images/feature-policy-oversized-images-responsive-image.html rename to third_party/blink/web_tests/http/tests/images/document-policy-oversized-images-responsive-image.html index 772e6dd..4197305 100644 --- a/third_party/blink/web_tests/images/feature-policy-oversized-images-responsive-image.html +++ b/third_party/blink/web_tests/http/tests/images/document-policy-oversized-images-responsive-image.html
@@ -1,7 +1,7 @@ <!DOCTYPE html> -<link rel="match" href="feature-policy-oversized-images-responsive-image-expected.html"> +<link rel="match" href="feature-policy-oversized-images-responsive-image-expected.php"> <body> - <iframe id="simple" src="resources/frame-with-oversized-images-responsive-images.html" allow="oversized-images 'none'" width="600" height="500"> + <iframe id="simple" src="resources/frame-with-oversized-images-responsive-images.php" width="600" height="500"> </iframe> </body>
diff --git a/third_party/blink/web_tests/http/tests/images/document-policy-oversized-images-styles-expected.txt b/third_party/blink/web_tests/http/tests/images/document-policy-oversized-images-styles-expected.txt new file mode 100644 index 0000000..7c906c0 --- /dev/null +++ b/third_party/blink/web_tests/http/tests/images/document-policy-oversized-images-styles-expected.txt
@@ -0,0 +1,3 @@ +CONSOLE ERROR: Document policy violation: oversized-images is not allowed in this document. +CONSOLE ERROR: Document policy violation: oversized-images is not allowed in this document. +CONSOLE ERROR: Document policy violation: oversized-images is not allowed in this document.
diff --git a/third_party/blink/web_tests/http/tests/images/document-policy-oversized-images-styles.html b/third_party/blink/web_tests/http/tests/images/document-policy-oversized-images-styles.html new file mode 100644 index 0000000..b7f64f0f --- /dev/null +++ b/third_party/blink/web_tests/http/tests/images/document-policy-oversized-images-styles.html
@@ -0,0 +1,6 @@ +<!DOCTYPE html> +<body> + <iframe id="simple" src="resources/frame-with-oversized-images-styles.php" + width="600" height="500"> + </iframe> +</body>
diff --git a/third_party/blink/web_tests/http/tests/images/document-policy-oversized-images.php b/third_party/blink/web_tests/http/tests/images/document-policy-oversized-images.php new file mode 100644 index 0000000..c9f3dfd --- /dev/null +++ b/third_party/blink/web_tests/http/tests/images/document-policy-oversized-images.php
@@ -0,0 +1,19 @@ +<?php +header("Document-Policy: oversized-images;scale=2.0"); +?> +<!DOCTYPE html> +<head> + <base href="resources/"> +</head> +<body> + <div width="600" height="500"> + <img src="green-256x256.jpg"> + <img src="green-256x256.jpg" width="100" height="256"> + <img src="green-256x256.jpg" style="height: 100px; width: 256px"> + <img src="green-256x256.jpg" width="128" height="128" > + <img src="green-256x256.jpg" width="50" height="50"> + <img src="green-256x256.jpg" style="height: 50px; weight: 50px"> + <img src="green-256x256.jpg" style="height: 1cm; weight: 1cm"> + <img src="green-256x256.jpg" style="height: 1cm; weight: 1cm; border-radius: 5px; border: 1px solid blue;"> + </div> +</body>
diff --git a/third_party/blink/web_tests/http/tests/images/document-policy-unoptimized-images-cached-image-expected.txt b/third_party/blink/web_tests/http/tests/images/document-policy-unoptimized-images-cached-image-expected.txt new file mode 100644 index 0000000..7e5dbf87 --- /dev/null +++ b/third_party/blink/web_tests/http/tests/images/document-policy-unoptimized-images-cached-image-expected.txt
@@ -0,0 +1,3 @@ +CONSOLE ERROR: Document policy violation: unoptimized-lossy-images is not allowed in this document. +CONSOLE ERROR: Document policy violation: unoptimized-lossy-images is not allowed in this document. +CONSOLE ERROR: Document policy violation: unoptimized-lossy-images is not allowed in this document.
diff --git a/third_party/blink/web_tests/http/tests/images/document-policy-unoptimized-images-cached-image.html b/third_party/blink/web_tests/http/tests/images/document-policy-unoptimized-images-cached-image.html new file mode 100644 index 0000000..eb0930f --- /dev/null +++ b/third_party/blink/web_tests/http/tests/images/document-policy-unoptimized-images-cached-image.html
@@ -0,0 +1,11 @@ +<!DOCTYPE html> +<style> +body { + font: 10px Ahem; +} +</style> +<body> + <iframe src="resources/frame-with-few-compression-test-images.php" width="500" height="180"></iframe> + <iframe src="resources/frame-with-few-compression-test-images.php" width="500" height="180"></iframe> + <iframe src="resources/frame-with-few-compression-test-images.php" width="500" height="180"></iframe> +</body>
diff --git a/third_party/blink/web_tests/http/tests/images/document-policy-unoptimized-lossless-images-expected.txt b/third_party/blink/web_tests/http/tests/images/document-policy-unoptimized-lossless-images-expected.txt new file mode 100644 index 0000000..54e6846 --- /dev/null +++ b/third_party/blink/web_tests/http/tests/images/document-policy-unoptimized-lossless-images-expected.txt
@@ -0,0 +1 @@ +CONSOLE ERROR: Document policy violation: unoptimized-lossless-images is not allowed in this document.
diff --git a/third_party/blink/web_tests/http/tests/images/document-policy-unoptimized-lossless-images-strict-expected.txt b/third_party/blink/web_tests/http/tests/images/document-policy-unoptimized-lossless-images-strict-expected.txt new file mode 100644 index 0000000..71d34b5b --- /dev/null +++ b/third_party/blink/web_tests/http/tests/images/document-policy-unoptimized-lossless-images-strict-expected.txt
@@ -0,0 +1,2 @@ +CONSOLE ERROR: Document policy violation: unoptimized-lossless-images-strict is not allowed in this document. +CONSOLE ERROR: Document policy violation: unoptimized-lossless-images-strict is not allowed in this document.
diff --git a/third_party/blink/web_tests/http/tests/images/document-policy-unoptimized-lossless-images-strict.php b/third_party/blink/web_tests/http/tests/images/document-policy-unoptimized-lossless-images-strict.php new file mode 100644 index 0000000..1085c8e --- /dev/null +++ b/third_party/blink/web_tests/http/tests/images/document-policy-unoptimized-lossless-images-strict.php
@@ -0,0 +1,21 @@ +<?php +header("Document-Policy: unoptimized-lossless-images-strict;bpp=1.0"); +?> +<!DOCTYPE html> +<style> +body { + font: 10px Ahem; +} +</style> +<head> + <base href="resources/"> +</head> +<body> + <div width="700" height="500"> + <img src="Fisher-large.jpg" width="200"/> + <img src="Fisher-small.jpg" width="200"/> + <img src="pass-all.png" width="200"/> + <img src="fail-strict.png" width="200"/> + <img src="fail-all.png" width="200"/> + </div> +</body>
diff --git a/third_party/blink/web_tests/http/tests/images/document-policy-unoptimized-lossy-images-expected.txt b/third_party/blink/web_tests/http/tests/images/document-policy-unoptimized-lossy-images-expected.txt new file mode 100644 index 0000000..6c9f3ccb --- /dev/null +++ b/third_party/blink/web_tests/http/tests/images/document-policy-unoptimized-lossy-images-expected.txt
@@ -0,0 +1 @@ +CONSOLE ERROR: Document policy violation: unoptimized-lossy-images is not allowed in this document.
diff --git a/third_party/blink/web_tests/http/tests/images/document-policy-unoptimized-lossy-images.php b/third_party/blink/web_tests/http/tests/images/document-policy-unoptimized-lossy-images.php new file mode 100644 index 0000000..1aa755d --- /dev/null +++ b/third_party/blink/web_tests/http/tests/images/document-policy-unoptimized-lossy-images.php
@@ -0,0 +1,21 @@ +<?php +header("Document-Policy: unoptimized-lossy-images;bpp=0.5"); +?> +<!DOCTYPE html> +<style> +body { + font: 10px Ahem; +} +</style> +<head> + <base href="resources/"> +</head> +<body> + <div width="700" height="500"> + <img src="Fisher-large.jpg" width="200"/> + <img src="Fisher-small.jpg" width="200"/> + <img src="pass-all.png" width="200"/> + <img src="fail-strict.png" width="200"/> + <img src="fail-all.png" width="200"/> + </div> +</body>
diff --git a/third_party/blink/web_tests/http/tests/images/feature-policy-image-policies-with-border-radius-expected.txt b/third_party/blink/web_tests/http/tests/images/feature-policy-image-policies-with-border-radius-expected.txt deleted file mode 100644 index e66cbe1..0000000 --- a/third_party/blink/web_tests/http/tests/images/feature-policy-image-policies-with-border-radius-expected.txt +++ /dev/null
@@ -1 +0,0 @@ -CONSOLE ERROR: Feature policy violation: unoptimized-lossy-images is not allowed in this document.
diff --git a/third_party/blink/web_tests/http/tests/images/feature-policy-image-policies-with-border-radius.html b/third_party/blink/web_tests/http/tests/images/feature-policy-image-policies-with-border-radius.html deleted file mode 100644 index 06c3ced..0000000 --- a/third_party/blink/web_tests/http/tests/images/feature-policy-image-policies-with-border-radius.html +++ /dev/null
@@ -1,7 +0,0 @@ -<!DOCTYPE html> -<style> -body { - font: 10px Ahem; -} -</style> -<body><iframe src="resources/frame-with-images-with-border-radius.html" allow="unoptimized-lossy-images 'none'" width="440" height="180"></iframe></body>
diff --git a/third_party/blink/web_tests/http/tests/images/feature-policy-unoptimized-images-cached-image-expected.txt b/third_party/blink/web_tests/http/tests/images/feature-policy-unoptimized-images-cached-image-expected.txt deleted file mode 100644 index 7c02396b..0000000 --- a/third_party/blink/web_tests/http/tests/images/feature-policy-unoptimized-images-cached-image-expected.txt +++ /dev/null
@@ -1,3 +0,0 @@ -CONSOLE ERROR: Feature policy violation: unoptimized-lossy-images is not allowed in this document. -CONSOLE ERROR: Feature policy violation: unoptimized-lossy-images is not allowed in this document. -CONSOLE ERROR: Feature policy violation: unoptimized-lossy-images is not allowed in this document.
diff --git a/third_party/blink/web_tests/http/tests/images/feature-policy-unoptimized-images-cached-image.html b/third_party/blink/web_tests/http/tests/images/feature-policy-unoptimized-images-cached-image.html deleted file mode 100644 index 54b0a4d..0000000 --- a/third_party/blink/web_tests/http/tests/images/feature-policy-unoptimized-images-cached-image.html +++ /dev/null
@@ -1,11 +0,0 @@ -<!DOCTYPE html> -<style> -body { - font: 10px Ahem; -} -</style> -<body> - <iframe src="resources/frame-with-few-compression-test-images.html" allow="unoptimized-lossy-images 'none'" width="500" height="180"></iframe> - <iframe src="resources/frame-with-few-compression-test-images.html" allow="unoptimized-lossy-images 'none'" width="500" height="180"></iframe> - <iframe src="resources/frame-with-few-compression-test-images.html" allow="unoptimized-lossy-images 'none'" width="500" height="180"></iframe> -</body>
diff --git a/third_party/blink/web_tests/http/tests/images/feature-policy-unoptimized-lossless-images-expected.png b/third_party/blink/web_tests/http/tests/images/feature-policy-unoptimized-lossless-images-expected.png deleted file mode 100644 index a632452..0000000 --- a/third_party/blink/web_tests/http/tests/images/feature-policy-unoptimized-lossless-images-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/http/tests/images/feature-policy-unoptimized-lossless-images-expected.txt b/third_party/blink/web_tests/http/tests/images/feature-policy-unoptimized-lossless-images-expected.txt deleted file mode 100644 index fa5ae9f..0000000 --- a/third_party/blink/web_tests/http/tests/images/feature-policy-unoptimized-lossless-images-expected.txt +++ /dev/null
@@ -1 +0,0 @@ -CONSOLE ERROR: Feature policy violation: unoptimized-lossless-images is not allowed in this document.
diff --git a/third_party/blink/web_tests/http/tests/images/feature-policy-unoptimized-lossless-images-strict-expected.png b/third_party/blink/web_tests/http/tests/images/feature-policy-unoptimized-lossless-images-strict-expected.png deleted file mode 100644 index 4c91e98b..0000000 --- a/third_party/blink/web_tests/http/tests/images/feature-policy-unoptimized-lossless-images-strict-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/http/tests/images/feature-policy-unoptimized-lossless-images-strict-expected.txt b/third_party/blink/web_tests/http/tests/images/feature-policy-unoptimized-lossless-images-strict-expected.txt deleted file mode 100644 index 5f46227..0000000 --- a/third_party/blink/web_tests/http/tests/images/feature-policy-unoptimized-lossless-images-strict-expected.txt +++ /dev/null
@@ -1,2 +0,0 @@ -CONSOLE ERROR: Feature policy violation: unoptimized-lossless-images-strict is not allowed in this document. -CONSOLE ERROR: Feature policy violation: unoptimized-lossless-images-strict is not allowed in this document.
diff --git a/third_party/blink/web_tests/http/tests/images/feature-policy-unoptimized-lossless-images-strict.html b/third_party/blink/web_tests/http/tests/images/feature-policy-unoptimized-lossless-images-strict.html deleted file mode 100644 index d75cd199..0000000 --- a/third_party/blink/web_tests/http/tests/images/feature-policy-unoptimized-lossless-images-strict.html +++ /dev/null
@@ -1,7 +0,0 @@ -<!DOCTYPE html> -<style> -body { - font: 10px Ahem; -} -</style> -<body><iframe src="resources/frame-with-compression-test-images.html" allow="unoptimized-lossless-images-strict 'none'" width="700" height="500"></iframe></body>
diff --git a/third_party/blink/web_tests/http/tests/images/feature-policy-unoptimized-lossless-images.html b/third_party/blink/web_tests/http/tests/images/feature-policy-unoptimized-lossless-images.html deleted file mode 100644 index f42833d..0000000 --- a/third_party/blink/web_tests/http/tests/images/feature-policy-unoptimized-lossless-images.html +++ /dev/null
@@ -1,7 +0,0 @@ -<!DOCTYPE html> -<style> -body { - font: 10px Ahem; -} -</style> -<body><iframe src="resources/frame-with-compression-test-images.html" allow="unoptimized-lossless-images 'none'" width="700" height="500"></iframe></body>
diff --git a/third_party/blink/web_tests/http/tests/images/feature-policy-unoptimized-lossy-images-expected.png b/third_party/blink/web_tests/http/tests/images/feature-policy-unoptimized-lossy-images-expected.png deleted file mode 100644 index ff1a3e7..0000000 --- a/third_party/blink/web_tests/http/tests/images/feature-policy-unoptimized-lossy-images-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/http/tests/images/feature-policy-unoptimized-lossy-images-expected.txt b/third_party/blink/web_tests/http/tests/images/feature-policy-unoptimized-lossy-images-expected.txt deleted file mode 100644 index e66cbe1..0000000 --- a/third_party/blink/web_tests/http/tests/images/feature-policy-unoptimized-lossy-images-expected.txt +++ /dev/null
@@ -1 +0,0 @@ -CONSOLE ERROR: Feature policy violation: unoptimized-lossy-images is not allowed in this document.
diff --git a/third_party/blink/web_tests/http/tests/images/feature-policy-unoptimized-lossy-images.html b/third_party/blink/web_tests/http/tests/images/feature-policy-unoptimized-lossy-images.html deleted file mode 100644 index 00fe16b..0000000 --- a/third_party/blink/web_tests/http/tests/images/feature-policy-unoptimized-lossy-images.html +++ /dev/null
@@ -1,7 +0,0 @@ -<!DOCTYPE html> -<style> -body { - font: 10px Ahem; -} -</style> -<body><iframe src="resources/frame-with-compression-test-images.html" allow="unoptimized-lossy-images 'none'" width="700" height="500"></iframe></body>
diff --git a/third_party/blink/web_tests/http/tests/images/resources/frame-with-compression-test-images.html b/third_party/blink/web_tests/http/tests/images/resources/frame-with-compression-test-images.html deleted file mode 100644 index a83ce65..0000000 --- a/third_party/blink/web_tests/http/tests/images/resources/frame-with-compression-test-images.html +++ /dev/null
@@ -1,13 +0,0 @@ -<!DOCTYPE html> -<style> -body { - font: 10px Ahem; -} -</style> -<body> - <img src="Fisher-large.jpg" width="200"/> - <img src="Fisher-small.jpg" width="200"/> - <img src="pass-all.png" width="200"/> - <img src="fail-strict.png" width="200"/> - <img src="fail-all.png" width="200"/> -</body>
diff --git a/third_party/blink/web_tests/http/tests/images/resources/frame-with-few-compression-test-images.html b/third_party/blink/web_tests/http/tests/images/resources/frame-with-few-compression-test-images.php similarity index 69% rename from third_party/blink/web_tests/http/tests/images/resources/frame-with-few-compression-test-images.html rename to third_party/blink/web_tests/http/tests/images/resources/frame-with-few-compression-test-images.php index 6d39bb7..2414fd0 100644 --- a/third_party/blink/web_tests/http/tests/images/resources/frame-with-few-compression-test-images.html +++ b/third_party/blink/web_tests/http/tests/images/resources/frame-with-few-compression-test-images.php
@@ -1,3 +1,6 @@ +<?php +header("Document-Policy: unoptimized-lossy-images;bpp=0.5"); +?> <!DOCTYPE html> <style> body {
diff --git a/third_party/blink/web_tests/http/tests/images/resources/frame-with-images-with-border-radius.html b/third_party/blink/web_tests/http/tests/images/resources/frame-with-images-with-border-radius.html deleted file mode 100644 index b6b19a70..0000000 --- a/third_party/blink/web_tests/http/tests/images/resources/frame-with-images-with-border-radius.html +++ /dev/null
@@ -1,11 +0,0 @@ -<!DOCTYPE html> -<style> -body { - font: 10px Ahem; -} -img { - border: 1px solid blue; - border-radius: 5px; -} -</style> -<body><img src="Fisher-large.jpg"/><img src="Fisher.bmp"></body>
diff --git a/third_party/blink/web_tests/images/resources/frame-with-oversized-images-edge-cases.html b/third_party/blink/web_tests/http/tests/images/resources/frame-with-oversized-images-edge-cases.php similarity index 77% rename from third_party/blink/web_tests/images/resources/frame-with-oversized-images-edge-cases.html rename to third_party/blink/web_tests/http/tests/images/resources/frame-with-oversized-images-edge-cases.php index b014b99..7882b30 100644 --- a/third_party/blink/web_tests/images/resources/frame-with-oversized-images-edge-cases.html +++ b/third_party/blink/web_tests/http/tests/images/resources/frame-with-oversized-images-edge-cases.php
@@ -1,3 +1,6 @@ +<?php +header("Document-Policy: oversized-images;scale=2.0"); +?> <!DOCTYPE html> <body> <img src="green-256x256.jpg">
diff --git a/third_party/blink/web_tests/images/resources/frame-with-oversized-images-forced-layout.html b/third_party/blink/web_tests/http/tests/images/resources/frame-with-oversized-images-forced-layout.php similarity index 76% rename from third_party/blink/web_tests/images/resources/frame-with-oversized-images-forced-layout.html rename to third_party/blink/web_tests/http/tests/images/resources/frame-with-oversized-images-forced-layout.php index b30800b..ce8d990b 100644 --- a/third_party/blink/web_tests/images/resources/frame-with-oversized-images-forced-layout.html +++ b/third_party/blink/web_tests/http/tests/images/resources/frame-with-oversized-images-forced-layout.php
@@ -1,3 +1,6 @@ +<?php +header("Document-Policy: oversized-images;scale=2.0"); +?> <!DOCTYPE html> <style>body { margin: 0; }</style> <img src="green-256x256.jpg" width="100" height="100">
diff --git a/third_party/blink/web_tests/images/resources/frame-with-oversized-images-resize.html b/third_party/blink/web_tests/http/tests/images/resources/frame-with-oversized-images-resize.php similarity index 90% rename from third_party/blink/web_tests/images/resources/frame-with-oversized-images-resize.html rename to third_party/blink/web_tests/http/tests/images/resources/frame-with-oversized-images-resize.php index eda104a4a..730e08a5 100644 --- a/third_party/blink/web_tests/images/resources/frame-with-oversized-images-resize.html +++ b/third_party/blink/web_tests/http/tests/images/resources/frame-with-oversized-images-resize.php
@@ -1,3 +1,6 @@ +<?php +header("Document-Policy: oversized-images;scale=2.0"); +?> <!DOCTYPE html> <body> <img src="green-256x256.jpg" width="100" height="256">
diff --git a/third_party/blink/web_tests/images/resources/frame-with-oversized-images-responsive-images.html b/third_party/blink/web_tests/http/tests/images/resources/frame-with-oversized-images-responsive-images.php similarity index 83% rename from third_party/blink/web_tests/images/resources/frame-with-oversized-images-responsive-images.html rename to third_party/blink/web_tests/http/tests/images/resources/frame-with-oversized-images-responsive-images.php index 2a9a31d..cdaed08 100644 --- a/third_party/blink/web_tests/images/resources/frame-with-oversized-images-responsive-images.html +++ b/third_party/blink/web_tests/http/tests/images/resources/frame-with-oversized-images-responsive-images.php
@@ -1,3 +1,6 @@ +<?php +header("Document-Policy: oversized-images;scale=2.0"); +?> <!DOCTYPE html> <body> <img src="green-256x256.jpg" intrinsicsize="100 x 100" width="127" height="127">
diff --git a/third_party/blink/web_tests/images/resources/frame-with-oversized-images-styles.html b/third_party/blink/web_tests/http/tests/images/resources/frame-with-oversized-images-styles.php similarity index 85% rename from third_party/blink/web_tests/images/resources/frame-with-oversized-images-styles.html rename to third_party/blink/web_tests/http/tests/images/resources/frame-with-oversized-images-styles.php index cd523dec..814cb37 100644 --- a/third_party/blink/web_tests/images/resources/frame-with-oversized-images-styles.html +++ b/third_party/blink/web_tests/http/tests/images/resources/frame-with-oversized-images-styles.php
@@ -1,3 +1,6 @@ +<?php +header("Document-Policy: oversized-images;scale=2.0"); +?> <!DOCTYPE html> <body> <img src="green-256x256.jpg" width="128" height="128" style="border: 10px solid red;">
diff --git a/third_party/blink/web_tests/external/wpt/feature-policy/reporting/oversized.jpg b/third_party/blink/web_tests/http/tests/images/resources/green-256x256.jpg similarity index 100% copy from third_party/blink/web_tests/external/wpt/feature-policy/reporting/oversized.jpg copy to third_party/blink/web_tests/http/tests/images/resources/green-256x256.jpg Binary files differ
diff --git a/third_party/blink/web_tests/images/feature-policy-oversized-images-edge-cases-expected.txt b/third_party/blink/web_tests/images/feature-policy-oversized-images-edge-cases-expected.txt deleted file mode 100644 index 8ce3e045..0000000 --- a/third_party/blink/web_tests/images/feature-policy-oversized-images-edge-cases-expected.txt +++ /dev/null
@@ -1 +0,0 @@ -CONSOLE ERROR: Feature policy violation: oversized-images is not allowed in this document.
diff --git a/third_party/blink/web_tests/images/feature-policy-oversized-images-edge-cases.html b/third_party/blink/web_tests/images/feature-policy-oversized-images-edge-cases.html deleted file mode 100644 index 46b0bb2..0000000 --- a/third_party/blink/web_tests/images/feature-policy-oversized-images-edge-cases.html +++ /dev/null
@@ -1,6 +0,0 @@ -<!DOCTYPE html> -<body> - <iframe id="simple" src="resources/frame-with-oversized-images-edge-cases.html" - allow="oversized-images 'none'" width="600" height="500"> - </iframe> -</body>
diff --git a/third_party/blink/web_tests/images/feature-policy-oversized-images-expected.txt b/third_party/blink/web_tests/images/feature-policy-oversized-images-expected.txt deleted file mode 100644 index e9416b3..0000000 --- a/third_party/blink/web_tests/images/feature-policy-oversized-images-expected.txt +++ /dev/null
@@ -1,6 +0,0 @@ -CONSOLE ERROR: Feature policy violation: oversized-images is not allowed in this document. -CONSOLE ERROR: Feature policy violation: oversized-images is not allowed in this document. -CONSOLE ERROR: Feature policy violation: oversized-images is not allowed in this document. -CONSOLE ERROR: Feature policy violation: oversized-images is not allowed in this document. -CONSOLE ERROR: Feature policy violation: oversized-images is not allowed in this document. -CONSOLE ERROR: Feature policy violation: oversized-images is not allowed in this document.
diff --git a/third_party/blink/web_tests/images/feature-policy-oversized-images-forced-layout-expected.txt b/third_party/blink/web_tests/images/feature-policy-oversized-images-forced-layout-expected.txt deleted file mode 100644 index bc6ee3552..0000000 --- a/third_party/blink/web_tests/images/feature-policy-oversized-images-forced-layout-expected.txt +++ /dev/null
@@ -1,2 +0,0 @@ -CONSOLE ERROR: Feature policy violation: oversized-images is not allowed in this document. -CONSOLE ERROR: Feature policy violation: oversized-images is not allowed in this document.
diff --git a/third_party/blink/web_tests/images/feature-policy-oversized-images-forced-layout.html b/third_party/blink/web_tests/images/feature-policy-oversized-images-forced-layout.html deleted file mode 100644 index 4ff8c02..0000000 --- a/third_party/blink/web_tests/images/feature-policy-oversized-images-forced-layout.html +++ /dev/null
@@ -1,4 +0,0 @@ -<!DOCTYPE html> -<iframe src="resources/frame-with-oversized-images-forced-layout.html" - allow="oversized-images 'none'" frameborder="0"> -</iframe>
diff --git a/third_party/blink/web_tests/images/feature-policy-oversized-images-resize-expected.txt b/third_party/blink/web_tests/images/feature-policy-oversized-images-resize-expected.txt deleted file mode 100644 index c8ca17d..0000000 --- a/third_party/blink/web_tests/images/feature-policy-oversized-images-resize-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -CONSOLE ERROR: Feature policy violation: oversized-images is not allowed in this document. -CONSOLE ERROR: Feature policy violation: oversized-images is not allowed in this document. -CONSOLE ERROR: Feature policy violation: oversized-images is not allowed in this document. -CONSOLE ERROR: Feature policy violation: oversized-images is not allowed in this document.
diff --git a/third_party/blink/web_tests/images/feature-policy-oversized-images-resize.html b/third_party/blink/web_tests/images/feature-policy-oversized-images-resize.html deleted file mode 100644 index 736adaa3..0000000 --- a/third_party/blink/web_tests/images/feature-policy-oversized-images-resize.html +++ /dev/null
@@ -1,6 +0,0 @@ -<!DOCTYPE html> -<body> - <iframe id="simple" src="resources/frame-with-oversized-images-resize.html" - allow="oversized-images 'none'" width="600" height="500"> - </iframe> -</body>
diff --git a/third_party/blink/web_tests/images/feature-policy-oversized-images-responsive-image-expected.txt b/third_party/blink/web_tests/images/feature-policy-oversized-images-responsive-image-expected.txt deleted file mode 100644 index bc6ee3552..0000000 --- a/third_party/blink/web_tests/images/feature-policy-oversized-images-responsive-image-expected.txt +++ /dev/null
@@ -1,2 +0,0 @@ -CONSOLE ERROR: Feature policy violation: oversized-images is not allowed in this document. -CONSOLE ERROR: Feature policy violation: oversized-images is not allowed in this document.
diff --git a/third_party/blink/web_tests/images/feature-policy-oversized-images-styles-expected.txt b/third_party/blink/web_tests/images/feature-policy-oversized-images-styles-expected.txt deleted file mode 100644 index 40a04856..0000000 --- a/third_party/blink/web_tests/images/feature-policy-oversized-images-styles-expected.txt +++ /dev/null
@@ -1,3 +0,0 @@ -CONSOLE ERROR: Feature policy violation: oversized-images is not allowed in this document. -CONSOLE ERROR: Feature policy violation: oversized-images is not allowed in this document. -CONSOLE ERROR: Feature policy violation: oversized-images is not allowed in this document.
diff --git a/third_party/blink/web_tests/images/feature-policy-oversized-images-styles.html b/third_party/blink/web_tests/images/feature-policy-oversized-images-styles.html deleted file mode 100644 index 687b68b4..0000000 --- a/third_party/blink/web_tests/images/feature-policy-oversized-images-styles.html +++ /dev/null
@@ -1,6 +0,0 @@ -<!DOCTYPE html> -<body> - <iframe id="simple" src="resources/frame-with-oversized-images-styles.html" - allow="oversized-images 'none'" width="600" height="500"> - </iframe> -</body>
diff --git a/third_party/blink/web_tests/images/feature-policy-oversized-images.html b/third_party/blink/web_tests/images/feature-policy-oversized-images.html deleted file mode 100644 index 922b21b3..0000000 --- a/third_party/blink/web_tests/images/feature-policy-oversized-images.html +++ /dev/null
@@ -1,6 +0,0 @@ -<!DOCTYPE html> -<body> - <iframe id="simple" src="resources/frame-with-oversized-images.html" - allow="oversized-images 'none'" width="600" height="500"> - </iframe> -</body>
diff --git a/third_party/blink/web_tests/images/resources/frame-with-oversized-images.html b/third_party/blink/web_tests/images/resources/frame-with-oversized-images.html deleted file mode 100644 index defd40a..0000000 --- a/third_party/blink/web_tests/images/resources/frame-with-oversized-images.html +++ /dev/null
@@ -1,11 +0,0 @@ -<!DOCTYPE html> -<body> -<img src="green-256x256.jpg"> -<img src="green-256x256.jpg" width="100" height="256"> -<img src="green-256x256.jpg" style="height: 100px; width: 256px"> -<img src="green-256x256.jpg" width="128" height="128" > -<img src="green-256x256.jpg" width="50" height="50"> -<img src="green-256x256.jpg" style="height: 50px; weight: 50px"> -<img src="green-256x256.jpg" style="height: 1cm; weight: 1cm"> -<img src="green-256x256.jpg" style="height: 1cm; weight: 1cm; border-radius: 5px; border: 1px solid blue;"> -</body>
diff --git a/third_party/blink/web_tests/platform/linux/http/tests/images/document-policy-image-policies-with-border-radius-expected.png b/third_party/blink/web_tests/platform/linux/http/tests/images/document-policy-image-policies-with-border-radius-expected.png new file mode 100644 index 0000000..09ae93b9 --- /dev/null +++ b/third_party/blink/web_tests/platform/linux/http/tests/images/document-policy-image-policies-with-border-radius-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/images/feature-policy-oversized-images-edge-cases-expected.png b/third_party/blink/web_tests/platform/linux/http/tests/images/document-policy-oversized-images-edge-cases-expected.png similarity index 100% rename from third_party/blink/web_tests/platform/linux/images/feature-policy-oversized-images-edge-cases-expected.png rename to third_party/blink/web_tests/platform/linux/http/tests/images/document-policy-oversized-images-edge-cases-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/http/tests/images/document-policy-oversized-images-expected.png b/third_party/blink/web_tests/platform/linux/http/tests/images/document-policy-oversized-images-expected.png new file mode 100644 index 0000000..2aa45db --- /dev/null +++ b/third_party/blink/web_tests/platform/linux/http/tests/images/document-policy-oversized-images-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/images/feature-policy-oversized-images-forced-layout-expected.png b/third_party/blink/web_tests/platform/linux/http/tests/images/document-policy-oversized-images-forced-layout-expected.png similarity index 100% rename from third_party/blink/web_tests/platform/linux/images/feature-policy-oversized-images-forced-layout-expected.png rename to third_party/blink/web_tests/platform/linux/http/tests/images/document-policy-oversized-images-forced-layout-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/images/feature-policy-oversized-images-responsive-image-expected.png b/third_party/blink/web_tests/platform/linux/http/tests/images/document-policy-oversized-images-responsive-image-expected.png similarity index 100% rename from third_party/blink/web_tests/platform/linux/images/feature-policy-oversized-images-responsive-image-expected.png rename to third_party/blink/web_tests/platform/linux/http/tests/images/document-policy-oversized-images-responsive-image-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/images/feature-policy-oversized-images-styles-expected.png b/third_party/blink/web_tests/platform/linux/http/tests/images/document-policy-oversized-images-styles-expected.png similarity index 100% rename from third_party/blink/web_tests/platform/linux/images/feature-policy-oversized-images-styles-expected.png rename to third_party/blink/web_tests/platform/linux/http/tests/images/document-policy-oversized-images-styles-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/http/tests/images/feature-policy-unoptimized-images-cached-image-expected.png b/third_party/blink/web_tests/platform/linux/http/tests/images/document-policy-unoptimized-images-cached-image-expected.png similarity index 100% rename from third_party/blink/web_tests/platform/linux/http/tests/images/feature-policy-unoptimized-images-cached-image-expected.png rename to third_party/blink/web_tests/platform/linux/http/tests/images/document-policy-unoptimized-images-cached-image-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/http/tests/images/document-policy-unoptimized-lossless-images-strict-expected.png b/third_party/blink/web_tests/platform/linux/http/tests/images/document-policy-unoptimized-lossless-images-strict-expected.png new file mode 100644 index 0000000..b38657d --- /dev/null +++ b/third_party/blink/web_tests/platform/linux/http/tests/images/document-policy-unoptimized-lossless-images-strict-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/http/tests/images/document-policy-unoptimized-lossy-images-expected.png b/third_party/blink/web_tests/platform/linux/http/tests/images/document-policy-unoptimized-lossy-images-expected.png new file mode 100644 index 0000000..ead80647 --- /dev/null +++ b/third_party/blink/web_tests/platform/linux/http/tests/images/document-policy-unoptimized-lossy-images-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/http/tests/images/feature-policy-image-policies-with-border-radius-expected.png b/third_party/blink/web_tests/platform/linux/http/tests/images/feature-policy-image-policies-with-border-radius-expected.png deleted file mode 100644 index 829f099..0000000 --- a/third_party/blink/web_tests/platform/linux/http/tests/images/feature-policy-image-policies-with-border-radius-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/http/tests/images/feature-policy-unoptimized-lossless-images-expected.png b/third_party/blink/web_tests/platform/linux/http/tests/images/feature-policy-unoptimized-lossless-images-expected.png deleted file mode 100644 index a632452..0000000 --- a/third_party/blink/web_tests/platform/linux/http/tests/images/feature-policy-unoptimized-lossless-images-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/http/tests/images/feature-policy-unoptimized-lossy-images-expected.png b/third_party/blink/web_tests/platform/linux/http/tests/images/feature-policy-unoptimized-lossy-images-expected.png deleted file mode 100644 index ff1a3e7..0000000 --- a/third_party/blink/web_tests/platform/linux/http/tests/images/feature-policy-unoptimized-lossy-images-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/images/feature-policy-oversized-images-expected.png b/third_party/blink/web_tests/platform/linux/images/feature-policy-oversized-images-expected.png deleted file mode 100644 index 36b2e05..0000000 --- a/third_party/blink/web_tests/platform/linux/images/feature-policy-oversized-images-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/http/tests/images/document-policy-image-policies-with-border-radius-expected.png b/third_party/blink/web_tests/platform/mac/http/tests/images/document-policy-image-policies-with-border-radius-expected.png new file mode 100644 index 0000000..3303a45 --- /dev/null +++ b/third_party/blink/web_tests/platform/mac/http/tests/images/document-policy-image-policies-with-border-radius-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/images/feature-policy-oversized-images-edge-cases-expected.png b/third_party/blink/web_tests/platform/mac/http/tests/images/document-policy-oversized-images-edge-cases-expected.png similarity index 100% rename from third_party/blink/web_tests/platform/mac/images/feature-policy-oversized-images-edge-cases-expected.png rename to third_party/blink/web_tests/platform/mac/http/tests/images/document-policy-oversized-images-edge-cases-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/http/tests/images/document-policy-oversized-images-expected.png b/third_party/blink/web_tests/platform/mac/http/tests/images/document-policy-oversized-images-expected.png new file mode 100644 index 0000000..9c85490 --- /dev/null +++ b/third_party/blink/web_tests/platform/mac/http/tests/images/document-policy-oversized-images-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/images/feature-policy-oversized-images-forced-layout-expected.png b/third_party/blink/web_tests/platform/mac/http/tests/images/document-policy-oversized-images-forced-layout-expected.png similarity index 100% rename from third_party/blink/web_tests/platform/mac/images/feature-policy-oversized-images-forced-layout-expected.png rename to third_party/blink/web_tests/platform/mac/http/tests/images/document-policy-oversized-images-forced-layout-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/images/feature-policy-oversized-images-resize-expected.png b/third_party/blink/web_tests/platform/mac/http/tests/images/document-policy-oversized-images-resize-expected.png similarity index 100% rename from third_party/blink/web_tests/platform/mac/images/feature-policy-oversized-images-resize-expected.png rename to third_party/blink/web_tests/platform/mac/http/tests/images/document-policy-oversized-images-resize-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/images/feature-policy-oversized-images-responsive-image-expected.png b/third_party/blink/web_tests/platform/mac/http/tests/images/document-policy-oversized-images-responsive-image-expected.png similarity index 100% rename from third_party/blink/web_tests/platform/mac/images/feature-policy-oversized-images-responsive-image-expected.png rename to third_party/blink/web_tests/platform/mac/http/tests/images/document-policy-oversized-images-responsive-image-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/images/feature-policy-oversized-images-styles-expected.png b/third_party/blink/web_tests/platform/mac/http/tests/images/document-policy-oversized-images-styles-expected.png similarity index 100% rename from third_party/blink/web_tests/platform/mac/images/feature-policy-oversized-images-styles-expected.png rename to third_party/blink/web_tests/platform/mac/http/tests/images/document-policy-oversized-images-styles-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/http/tests/images/feature-policy-unoptimized-images-cached-image-expected.png b/third_party/blink/web_tests/platform/mac/http/tests/images/document-policy-unoptimized-images-cached-image-expected.png similarity index 100% rename from third_party/blink/web_tests/platform/mac/http/tests/images/feature-policy-unoptimized-images-cached-image-expected.png rename to third_party/blink/web_tests/platform/mac/http/tests/images/document-policy-unoptimized-images-cached-image-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/http/tests/images/document-policy-unoptimized-lossless-images-strict-expected.png b/third_party/blink/web_tests/platform/mac/http/tests/images/document-policy-unoptimized-lossless-images-strict-expected.png new file mode 100644 index 0000000..280dede4 --- /dev/null +++ b/third_party/blink/web_tests/platform/mac/http/tests/images/document-policy-unoptimized-lossless-images-strict-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/http/tests/images/document-policy-unoptimized-lossy-images-expected.png b/third_party/blink/web_tests/platform/mac/http/tests/images/document-policy-unoptimized-lossy-images-expected.png new file mode 100644 index 0000000..ada6f89 --- /dev/null +++ b/third_party/blink/web_tests/platform/mac/http/tests/images/document-policy-unoptimized-lossy-images-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/http/tests/images/feature-policy-image-policies-with-border-radius-expected.png b/third_party/blink/web_tests/platform/mac/http/tests/images/feature-policy-image-policies-with-border-radius-expected.png deleted file mode 100644 index 2ef4b66..0000000 --- a/third_party/blink/web_tests/platform/mac/http/tests/images/feature-policy-image-policies-with-border-radius-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/http/tests/images/feature-policy-unoptimized-lossless-images-expected.png b/third_party/blink/web_tests/platform/mac/http/tests/images/feature-policy-unoptimized-lossless-images-expected.png deleted file mode 100644 index c119fc3..0000000 --- a/third_party/blink/web_tests/platform/mac/http/tests/images/feature-policy-unoptimized-lossless-images-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/http/tests/images/feature-policy-unoptimized-lossy-images-expected.png b/third_party/blink/web_tests/platform/mac/http/tests/images/feature-policy-unoptimized-lossy-images-expected.png deleted file mode 100644 index 7431641..0000000 --- a/third_party/blink/web_tests/platform/mac/http/tests/images/feature-policy-unoptimized-lossy-images-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/images/feature-policy-oversized-images-expected.png b/third_party/blink/web_tests/platform/mac/images/feature-policy-oversized-images-expected.png deleted file mode 100644 index fa820b6..0000000 --- a/third_party/blink/web_tests/platform/mac/images/feature-policy-oversized-images-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/http/tests/images/document-policy-image-policies-with-border-radius-expected.png b/third_party/blink/web_tests/platform/win/http/tests/images/document-policy-image-policies-with-border-radius-expected.png new file mode 100644 index 0000000..81b2eac --- /dev/null +++ b/third_party/blink/web_tests/platform/win/http/tests/images/document-policy-image-policies-with-border-radius-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/images/feature-policy-oversized-images-edge-cases-expected.png b/third_party/blink/web_tests/platform/win/http/tests/images/document-policy-oversized-images-edge-cases-expected.png similarity index 100% rename from third_party/blink/web_tests/platform/win/images/feature-policy-oversized-images-edge-cases-expected.png rename to third_party/blink/web_tests/platform/win/http/tests/images/document-policy-oversized-images-edge-cases-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/http/tests/images/document-policy-oversized-images-expected.png b/third_party/blink/web_tests/platform/win/http/tests/images/document-policy-oversized-images-expected.png new file mode 100644 index 0000000..cd12803 --- /dev/null +++ b/third_party/blink/web_tests/platform/win/http/tests/images/document-policy-oversized-images-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/images/feature-policy-oversized-images-forced-layout-expected.png b/third_party/blink/web_tests/platform/win/http/tests/images/document-policy-oversized-images-forced-layout-expected.png similarity index 100% rename from third_party/blink/web_tests/platform/win/images/feature-policy-oversized-images-forced-layout-expected.png rename to third_party/blink/web_tests/platform/win/http/tests/images/document-policy-oversized-images-forced-layout-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/images/feature-policy-oversized-images-resize-expected.png b/third_party/blink/web_tests/platform/win/http/tests/images/document-policy-oversized-images-resize-expected.png similarity index 100% rename from third_party/blink/web_tests/platform/win/images/feature-policy-oversized-images-resize-expected.png rename to third_party/blink/web_tests/platform/win/http/tests/images/document-policy-oversized-images-resize-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/images/feature-policy-oversized-images-responsive-image-expected.png b/third_party/blink/web_tests/platform/win/http/tests/images/document-policy-oversized-images-responsive-image-expected.png similarity index 100% rename from third_party/blink/web_tests/platform/win/images/feature-policy-oversized-images-responsive-image-expected.png rename to third_party/blink/web_tests/platform/win/http/tests/images/document-policy-oversized-images-responsive-image-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/images/feature-policy-oversized-images-styles-expected.png b/third_party/blink/web_tests/platform/win/http/tests/images/document-policy-oversized-images-styles-expected.png similarity index 100% rename from third_party/blink/web_tests/platform/win/images/feature-policy-oversized-images-styles-expected.png rename to third_party/blink/web_tests/platform/win/http/tests/images/document-policy-oversized-images-styles-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/http/tests/images/feature-policy-unoptimized-images-cached-image-expected.png b/third_party/blink/web_tests/platform/win/http/tests/images/document-policy-unoptimized-images-cached-image-expected.png similarity index 100% rename from third_party/blink/web_tests/platform/win/http/tests/images/feature-policy-unoptimized-images-cached-image-expected.png rename to third_party/blink/web_tests/platform/win/http/tests/images/document-policy-unoptimized-images-cached-image-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/http/tests/images/document-policy-unoptimized-lossless-images-strict-expected.png b/third_party/blink/web_tests/platform/win/http/tests/images/document-policy-unoptimized-lossless-images-strict-expected.png new file mode 100644 index 0000000..3ff44ee --- /dev/null +++ b/third_party/blink/web_tests/platform/win/http/tests/images/document-policy-unoptimized-lossless-images-strict-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/http/tests/images/document-policy-unoptimized-lossy-images-expected.png b/third_party/blink/web_tests/platform/win/http/tests/images/document-policy-unoptimized-lossy-images-expected.png new file mode 100644 index 0000000..599c10a --- /dev/null +++ b/third_party/blink/web_tests/platform/win/http/tests/images/document-policy-unoptimized-lossy-images-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/http/tests/images/feature-policy-image-policies-with-border-radius-expected.png b/third_party/blink/web_tests/platform/win/http/tests/images/feature-policy-image-policies-with-border-radius-expected.png deleted file mode 100644 index f1a77c75..0000000 --- a/third_party/blink/web_tests/platform/win/http/tests/images/feature-policy-image-policies-with-border-radius-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/http/tests/images/feature-policy-unoptimized-lossless-images-expected.png b/third_party/blink/web_tests/platform/win/http/tests/images/feature-policy-unoptimized-lossless-images-expected.png deleted file mode 100644 index 0243b0e..0000000 --- a/third_party/blink/web_tests/platform/win/http/tests/images/feature-policy-unoptimized-lossless-images-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/http/tests/images/feature-policy-unoptimized-lossy-images-expected.png b/third_party/blink/web_tests/platform/win/http/tests/images/feature-policy-unoptimized-lossy-images-expected.png deleted file mode 100644 index 8eca7b87..0000000 --- a/third_party/blink/web_tests/platform/win/http/tests/images/feature-policy-unoptimized-lossy-images-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/images/feature-policy-oversized-images-expected.png b/third_party/blink/web_tests/platform/win/images/feature-policy-oversized-images-expected.png deleted file mode 100644 index f05919a..0000000 --- a/third_party/blink/web_tests/platform/win/images/feature-policy-oversized-images-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/webexposed/feature-policy-features-expected.txt b/third_party/blink/web_tests/webexposed/feature-policy-features-expected.txt index 13fe291..fd3ee816 100644 --- a/third_party/blink/web_tests/webexposed/feature-policy-features-expected.txt +++ b/third_party/blink/web_tests/webexposed/feature-policy-features-expected.txt
@@ -39,7 +39,6 @@ midi modals orientation-lock -oversized-images payment picture-in-picture pointer-lock @@ -50,9 +49,6 @@ sync-script sync-xhr top-navigation -unoptimized-lossless-images -unoptimized-lossless-images-strict -unoptimized-lossy-images unsized-media usb vertical-scroll
diff --git a/tools/ipc_fuzzer/fuzzer/DEPS b/tools/ipc_fuzzer/fuzzer/DEPS index 48e88750..859f0a2 100644 --- a/tools/ipc_fuzzer/fuzzer/DEPS +++ b/tools/ipc_fuzzer/fuzzer/DEPS
@@ -1,2 +1,6 @@ include_rules = [ + "+third_party/skia/include", + "+ui/base/cursor", + "+ui/base/mojom", + "+ui/gfx/geometry", ]
diff --git a/tools/ipc_fuzzer/fuzzer/fuzzer.cc b/tools/ipc_fuzzer/fuzzer/fuzzer.cc index f588b9b..9c9c8c1 100644 --- a/tools/ipc_fuzzer/fuzzer/fuzzer.cc +++ b/tools/ipc_fuzzer/fuzzer/fuzzer.cc
@@ -21,10 +21,14 @@ #include "ipc/ipc_message_utils.h" #include "ipc/ipc_sync_channel.h" #include "ipc/ipc_sync_message.h" +#include "third_party/skia/include/core/SkBitmap.h" #include "tools/ipc_fuzzer/fuzzer/fuzzer.h" #include "tools/ipc_fuzzer/fuzzer/rand_util.h" #include "tools/ipc_fuzzer/message_lib/message_cracker.h" #include "tools/ipc_fuzzer/message_lib/message_file.h" +#include "ui/base/cursor/cursor.h" +#include "ui/base/mojom/cursor_type.mojom-shared.h" +#include "ui/gfx/geometry/point.h" #if defined(OS_POSIX) #include <unistd.h> @@ -736,26 +740,27 @@ template <> struct FuzzTraits<content::WebCursor> { static bool Fuzz(content::WebCursor* p, Fuzzer* fuzzer) { - content::CursorInfo info = p->info(); - // |type| enum is not validated on de-serialization, so pick random value. - if (!FuzzParam(reinterpret_cast<int*>(&info.type), fuzzer)) + ui::mojom::CursorType type; + gfx::Point hotspot; + float image_scale_factor; + SkBitmap bitmap; + if (!FuzzParam(reinterpret_cast<int*>(&type), fuzzer) || + !FuzzParam(&hotspot, fuzzer) || + !FuzzParam(&image_scale_factor, fuzzer) || !FuzzParam(&bitmap, fuzzer)) return false; - if (!FuzzParam(&info.hotspot, fuzzer)) - return false; - if (!FuzzParam(&info.image_scale_factor, fuzzer)) - return false; - if (!FuzzParam(&info.custom_image, fuzzer)) - return false; - // Omitting |externalHandle| since it is not serialized. + ui::Cursor cursor(type); + cursor.set_custom_hotspot(hotspot); + cursor.set_custom_bitmap(bitmap); // Scale factor is expected to be greater than 0, otherwise we hit // a check failure. - info.image_scale_factor = fabs(info.image_scale_factor); - if (!(info.image_scale_factor > 0.0)) - info.image_scale_factor = 1; + image_scale_factor = fabs(image_scale_factor); + if (image_scale_factor <= 0.0) + image_scale_factor = 1; + cursor.set_image_scale_factor(fabs(image_scale_factor)); - *p = content::WebCursor(info); + *p = content::WebCursor(cursor); return true; } };
diff --git a/tools/metrics/actions/actions.xml b/tools/metrics/actions/actions.xml index a3d30b2..40cf6a0 100644 --- a/tools/metrics/actions/actions.xml +++ b/tools/metrics/actions/actions.xml
@@ -13023,6 +13023,18 @@ </description> </action> +<action name="MobileMessagesOverflowBadgeShown" not_user_triggered="true"> + <owner>sczs@chromium.org</owner> + <owner>thegreenfrog@chromium.org</owner> + <description>An Infobar Message overflow badge is shown.</description> +</action> + +<action name="MobileMessagesOverflowBadgeTapped"> + <owner>sczs@chromium.org</owner> + <owner>thegreenfrog@chromium.org</owner> + <description>User tapped on an Infobar Message overflow badge.</description> +</action> + <action name="MobileMWSession"> <owner>Please list the metric's owners. Add more owner tags as needed.</owner> <description>Please enter the description of this user action.</description> @@ -19273,6 +19285,14 @@ </description> </action> +<action name="SharingHubAndroid.BottomRowScrolled"> + <owner>src/components/send_tab_to_self/OWNERS</owner> + <description> + The bottom row was horizontally scrolled. Recorded only once per open share + sheet. + </description> +</action> + <action name="SharingHubAndroid.CopyURLSelected"> <owner>src/components/send_tab_to_self/OWNERS</owner> <description> @@ -19301,6 +19321,27 @@ </description> </action> +<action name="SharingHubAndroid.SendTabToSelf.ChromeSettingsClicked"> + <owner>src/components/send_tab_to_self/OWNERS</owner> + <description> + The user tapped the Chrome Settings button in the STTS dialog. + </description> +</action> + +<action name="SharingHubAndroid.SendTabToSelf.NoTargetDevices"> + <owner>src/components/send_tab_to_self/OWNERS</owner> + <description> + The user tapped STTS in the sharing hub with no target devices available. + </description> +</action> + +<action name="SharingHubAndroid.SendTabToSelf.NotSyncing"> + <owner>src/components/send_tab_to_self/OWNERS</owner> + <description> + The user tapped STTS in the sharing hub with sync disabled. + </description> +</action> + <action name="SharingHubAndroid.SendTabToSelfSelected"> <owner>src/components/send_tab_to_self/OWNERS</owner> <description> @@ -19315,6 +19356,14 @@ </description> </action> +<action name="SharingHubAndroid.TopRowScrolled"> + <owner>src/components/send_tab_to_self/OWNERS</owner> + <description> + The top row was horizontally scrolled. Recorded only once per open share + sheet. + </description> +</action> + <action name="Shelf_AlignmentSetBottom"> <owner>Please list the metric's owners. Add more owner tags as needed.</owner> <description>Please enter the description of this user action.</description>
diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml index c667159..c63f56768 100644 --- a/tools/metrics/histograms/enums.xml +++ b/tools/metrics/histograms/enums.xml
@@ -14714,7 +14714,7 @@ <int value="2" label="Desk-switch keyboard shortcut"/> <int value="3" label="Mini_view button press"/> <int value="4" label="Window on desk activated"/> - <int value="5" label="Desk-switch 3-finger touchpad swipe"/> + <int value="5" label="Desk-switch 4-finger touchpad swipe"/> <int value="6" label="User switch in a multi-profile session"/> </enum> @@ -26698,8 +26698,8 @@ <int value="3118" label="LongTaskBufferFull"/> <int value="3119" label="HTMLMetaElementMonetization"/> <int value="3120" label="HTMLLinkElementMonetization"/> - <int value="3121" label="InputTypeCheckboxRenderedNonSquare"/> - <int value="3122" label="InputTypeRadioRenderedNonSquare"/> + <int value="3121" label="InputTypeCheckboxRenderedNonSquare_Obsolete"/> + <int value="3122" label="InputTypeRadioRenderedNonSquare_Obsolete"/> <int value="3123" label="WebkitBoxPackJustifyDoesSomething"/> <int value="3124" label="WebkitBoxPackCenterDoesSomething"/> <int value="3125" label="WebkitBoxPackEndDoesSomething"/> @@ -43710,6 +43710,14 @@ <int value="2" label="Dismissed"/> </enum> +<enum name="MobileMessagesInfobarType"> + <int value="0" label="Confirm"/> + <int value="1" label="Save Password"/> + <int value="2" label="Update Password"/> + <int value="3" label="Save Card"/> + <int value="4" label="Translate"/> +</enum> + <enum name="MobileMessagesModalEvent"> <int value="0" label="Accepted"/> <int value="1" label="Canceled"/> @@ -59248,6 +59256,20 @@ <int value="3" label="Error dialog"/> </enum> +<enum name="SharingHubBottomRowIndex"> + <summary> + Index of a third party app in the bottom row of the sharing hub on Android. + </summary> + <int value="0"/> + <int value="1"/> + <int value="2"/> + <int value="3"/> + <int value="4"/> + <int value="5"/> + <int value="6"/> + <int value="7"/> +</enum> + <enum name="SharingMajorVersionComparison"> <int value="0" label="Unknown"/> <int value="1" label="Sender version is lower"/> @@ -60837,7 +60859,7 @@ <int value="1" label="From prompt in Settings"/> </enum> -<enum name="SoftwareReporterExperimentError"> +<enum name="SoftwareReporterConfigurationError"> <int value="0" label="Bad tag"/> <int value="1" label="Bad parameters"/> <int value="2" label="Missing parameters"/> @@ -66063,6 +66085,7 @@ <int value="1746181704" label="proxy_resolver.mojom.ProxyResolverFactory"/> <int value="1803540096" label="tap_visualizer_app"/> <int value="1882216268" label="patch.mojom.FilePatcher"/> + <int value="1893208764" label="chrome.mojom.UtilWin"/> <int value="1937572987" label="shortcut_viewer_app"/> <int value="1967189975" label="util_win"/> <int value="1968783712" label="quick_launch_app"/> @@ -68494,11 +68517,13 @@ <int value="-1569772500" label="/manageAccessibility/tts"/> <int value="-1555301506" label="/content/notifications"/> <int value="-1484929503" label="/manageAccessibility/switchAccess"/> + <int value="-1381133263" label="/passwords/check"/> <int value="-1312744606" label="/knownNetworks"/> <int value="-1299234352" label="/pluginVm/details"/> <int value="-1297176639" label="/fonts"/> <int value="-1283080115" label="/content/backgroundSync"/> <int value="-1279337432" label="/power"/> + <int value="-1231761426" label="/content/ar"/> <int value="-1227595649" label="/all"/> <int value="-1204780990" label="/dateTime/timeZone"/> <int value="-1167413307" label="/inputMethods"/> @@ -68543,16 +68568,20 @@ <int value="-146134264" label="/content/protectedContent"/> <int value="-59332819" label="/accountManager"/> <int value="-44267040" label="/bluetoothDevices"/> + <int value="-23311755" label="/content/vr"/> <int value="-14666765" label="/accounts"/> <int value="8030578" label="/crostini/sharedUsbDevices"/> <int value="8530592" label="/syncSetup/advanced"/> <int value="16287984" label="/languages/details"/> <int value="60238454" label="/content/ads"/> + <int value="104900992" label="/content/insecureContent"/> <int value="223791833" label="/help/about"/> + <int value="254445609" label="/content/filesystem"/> <int value="273561147" label="/autofill"/> <int value="297583680" label="/device"/> <int value="334469894" label="/people"/> <int value="338873252" label="/passwords"/> + <int value="350639838" label="/cookies"/> <int value="408074355" label="/onStartup"/> <int value="463749620" label="/content/flash"/> <int value="537677705" label="/cookies/detail"/> @@ -68562,6 +68591,8 @@ <int value="682420978" label="/content/bluetoothScanning"/> <int value="683177973" label="/cupsPrinters"/> <int value="754547746" label="/help/details"/> + <int value="805959528" label="/security"/> + <int value="838443004" label="/safetyCheck"/> <int value="856943564" label="/content/siteDetails"/> <int value="868952532" label="/pointer-overlay"/> <int value="872535792" label="/parentalControls"/>
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml index 7a79c1b..3087033 100644 --- a/tools/metrics/histograms/histograms.xml +++ b/tools/metrics/histograms/histograms.xml
@@ -2758,7 +2758,7 @@ </histogram> <histogram name="Android.DownloadManager.OtherExtensions.InitialCount" - enum="AndroidDownloadExtensionType" expires_after="2020-07-06"> + enum="AndroidDownloadExtensionType" expires_after="2020-09-06"> <owner>twellington@chromium.org</owner> <owner>clank-downloads@google.com</owner> <summary> @@ -2788,7 +2788,7 @@ </histogram> <histogram name="Android.DownloadManager.OtherExtensions.Share" - enum="AndroidDownloadExtensionType" expires_after="2020-07-06"> + enum="AndroidDownloadExtensionType" expires_after="2020-09-06"> <owner>twellington@chromium.org</owner> <owner>clank-downloads@google.com</owner> <summary> @@ -3238,7 +3238,7 @@ </histogram> <histogram name="Android.Language.WrongLanguageAfterResume" enum="Boolean" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>tiborg@chromium.org</owner> <owner>heamy@chromium.org</owner> <summary> @@ -4124,7 +4124,7 @@ </histogram> <histogram name="Android.SeccompStatus.RendererSandbox" - enum="AndroidSeccompSandboxStatus" expires_after="2020-07-06"> + enum="AndroidSeccompSandboxStatus" expires_after="2020-09-06"> <owner>rsesek@chromium.org</owner> <summary> Reports the status of the seccomp-bpf sandbox in renderer processes. @@ -6352,8 +6352,9 @@ </histogram> <histogram name="Apps.AppListPeekingToFullscreenSource" - enum="AppListPeekingToFullscreenSource" expires_after="M82"> + enum="AppListPeekingToFullscreenSource" expires_after="2021-03-14"> <owner>newcomer@chromium.org</owner> + <owner>mmourgos@chromium.org</owner> <summary> The source which transitions the app list from Peeking to Fullscreen. This is logged when the transition method is used. @@ -6589,7 +6590,7 @@ </histogram> <histogram name="Apps.AppListShowSource" enum="AppListShowSource" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>newcomer@chromium.org</owner> <summary> The number of times the different sources for showing the app list are used. @@ -6601,15 +6602,15 @@ </histogram> <histogram name="Apps.AppListStateTransitionSource" - enum="AppListStateTransitionSource" expires_after="2020-03-01"> + enum="AppListStateTransitionSource" expires_after="2021-03-01"> <owner>newcomer@chromium.org</owner> + <owner>mmourgos@chromium.org</owner> <summary> The number of transitions from the different AppListStates. This is gathered each time the launcher transitions from various states in AppListView::SetState (Peeking, Half, Fullscreen All Apps, Fullscreen Search, and Closed). Not all state transitions are collected because they - are not meaningful in measuring user activity. This metric is only recorded - when the Fullscreen App List feature is enabled. + are not meaningful in measuring user activity. </summary> </histogram> @@ -7401,7 +7402,7 @@ </histogram> <histogram base="true" name="Arc.CpuRestrictionDisabled" units="ms" - expires_after="2020-03-09"> + expires_after="2020-09-09"> <owner>wvk@google.com</owner> <owner>khmel@google.com</owner> <summary> @@ -7579,7 +7580,7 @@ </histogram> <histogram name="Arc.FirstAppLaunchDelay.TimeDelta" units="ms" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>yusukes@google.com</owner> <owner>khmel@google.com</owner> <summary> @@ -7736,7 +7737,7 @@ </histogram> <histogram name="Arc.NativeBridge" enum="ArcNativeBridgeType" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>elijahtaylor@google.com</owner> <owner>levarum@google.com</owner> <summary> @@ -8119,7 +8120,7 @@ </histogram> <histogram name="Arc.StateByUserType" enum="ArcEnableState" - expires_after="2020-06-21"> + expires_after="2020-09-06"> <!-- Name completed by histogram_suffixes name="ArcUserTypes" --> <owner>elijahtaylor@google.com</owner> @@ -8546,7 +8547,7 @@ </histogram> <histogram name="Ash.Display.PrimaryDisplayZoomAtStartup" units="%" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>jamescook@chromium.org</owner> <owner>jessejames@chromium.org</owner> <owner>cros-system-services@google.com</owner> @@ -9687,7 +9688,7 @@ </histogram> <histogram name="Ash.TouchView.TouchViewInactive" units="ms" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>girard@chromium.org</owner> <summary>The length of time between TouchView activations.</summary> </histogram> @@ -14959,7 +14960,7 @@ </histogram> <histogram name="AutoScreenBrightness.DailyUserAdjustment.Eve" units="count" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>jiameng@chromium.org</owner> <summary> Number of times that a user has made brightness adjustments on an Eve device @@ -16044,7 +16045,7 @@ </histogram> <histogram name="BackgroundSync.Registration.OneShot.CouldFire" - enum="BooleanCouldFireImmediately" expires_after="2020-04-19"> + enum="BooleanCouldFireImmediately" expires_after="2020-11-30"> <owner>nator@chromium.org</owner> <owner>rayankans@chromium.org</owner> <summary> @@ -16296,7 +16297,7 @@ </histogram> <histogram name="Blink.Animate.UpdateTime" units="microseconds" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <!-- Name completed by histogram_suffixes name="BlinkUpdateTimePreFCPSuffixes" --> <!-- Name completed by histogram_suffixes name="BlinkUpdateTimePostFCPSuffixes" --> @@ -17619,7 +17620,7 @@ </histogram> <histogram name="Blink.ForcedStyleAndLayout.UpdateTime" units="microseconds" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <!-- Name completed by histogram_suffixes name="BlinkUpdateTimeAggregatedSuffixes" --> <owner>schenney@chromium.org</owner> @@ -17884,7 +17885,7 @@ </histogram> <histogram name="Blink.IntersectionObservation.UpdateTime" units="microseconds" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <!-- Name completed by histogram_suffixes name="BlinkUpdateTimeAggregatedSuffixes" --> <owner>schenney@chromium.org</owner> @@ -17958,7 +17959,7 @@ </histogram> <histogram base="true" name="Blink.MainFrame.AnimateRatio" units="%" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>schenney@chromium.org</owner> <owner>paint-dev@chromium.org</owner> <!-- Name completed by histogram_suffixes name="BlinkMainFrameUpdateTimeSuffixes" --> @@ -17970,7 +17971,7 @@ </histogram> <histogram base="true" name="Blink.MainFrame.CompositingCommitRatio" units="%" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>schenney@chromium.org</owner> <owner>paint-dev@chromium.org</owner> <!-- Name completed by histogram_suffixes name="BlinkMainFrameUpdateTimeSuffixes" --> @@ -17982,7 +17983,7 @@ </histogram> <histogram base="true" name="Blink.MainFrame.CompositingRatio" units="%" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>schenney@chromium.org</owner> <owner>paint-dev@chromium.org</owner> <!-- Name completed by histogram_suffixes name="BlinkMainFrameUpdateTimeSuffixes" --> @@ -17994,7 +17995,7 @@ </histogram> <histogram base="true" name="Blink.MainFrame.ForcedStyleAndLayoutRatio" - units="%" expires_after="2020-07-06"> + units="%" expires_after="2020-09-06"> <owner>schenney@chromium.org</owner> <owner>paint-dev@chromium.org</owner> <!-- Name completed by histogram_suffixes name="BlinkMainFrameUpdateTimeSuffixes" --> @@ -18007,7 +18008,7 @@ </histogram> <histogram base="true" name="Blink.MainFrame.HandleInputEventsRatio" units="%" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>schenney@chromium.org</owner> <owner>paint-dev@chromium.org</owner> <!-- Name completed by histogram_suffixes name="BlinkMainFrameUpdateTimeSuffixes" --> @@ -18019,7 +18020,7 @@ </histogram> <histogram base="true" name="Blink.MainFrame.HitTestDocumentUpdateRatio" - units="%" expires_after="2020-07-06"> + units="%" expires_after="2020-09-06"> <owner>schenney@chromium.org</owner> <owner>paint-dev@chromium.org</owner> <!-- Name completed by histogram_suffixes name="BlinkMainFrameUpdateTimeSuffixes" --> @@ -18031,7 +18032,7 @@ </histogram> <histogram base="true" name="Blink.MainFrame.ImplCompositorCommitRatio" - units="%" expires_after="2020-07-06"> + units="%" expires_after="2020-09-06"> <owner>schenney@chromium.org</owner> <owner>paint-dev@chromium.org</owner> <!-- Name completed by histogram_suffixes name="BlinkMainFrameUpdateTimeSuffixes" --> @@ -18044,7 +18045,7 @@ </histogram> <histogram base="true" name="Blink.MainFrame.IntersectionObservationRatio" - units="%" expires_after="2020-07-06"> + units="%" expires_after="2020-09-06"> <owner>schenney@chromium.org</owner> <owner>paint-dev@chromium.org</owner> <!-- Name completed by histogram_suffixes name="BlinkMainFrameUpdateTimeSuffixes" --> @@ -18056,7 +18057,7 @@ </histogram> <histogram base="true" name="Blink.MainFrame.LayoutRatio" units="%" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>schenney@chromium.org</owner> <owner>paint-dev@chromium.org</owner> <!-- Name completed by histogram_suffixes name="BlinkMainFrameUpdateTimeSuffixes" --> @@ -18068,7 +18069,7 @@ </histogram> <histogram base="true" name="Blink.MainFrame.PaintRatio" units="%" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>schenney@chromium.org</owner> <owner>paint-dev@chromium.org</owner> <!-- Name completed by histogram_suffixes name="BlinkMainFrameUpdateTimeSuffixes" --> @@ -18080,7 +18081,7 @@ </histogram> <histogram base="true" name="Blink.MainFrame.PrePaintRatio" units="%" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>schenney@chromium.org</owner> <owner>paint-dev@chromium.org</owner> <!-- Name completed by histogram_suffixes name="BlinkMainFrameUpdateTimeSuffixes" --> @@ -18092,7 +18093,7 @@ </histogram> <histogram base="true" name="Blink.MainFrame.ProxyCommitRatio" units="%" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>schenney@chromium.org</owner> <owner>paint-dev@chromium.org</owner> <!-- Name completed by histogram_suffixes name="BlinkMainFrameUpdateTimeSuffixes" --> @@ -18106,7 +18107,7 @@ </histogram> <histogram base="true" name="Blink.MainFrame.ScrollingCoordinatorRatio" - units="%" expires_after="2020-07-06"> + units="%" expires_after="2020-09-06"> <owner>schenney@chromium.org</owner> <owner>paint-dev@chromium.org</owner> <!-- Name completed by histogram_suffixes name="BlinkMainFrameUpdateTimeSuffixes" --> @@ -18134,7 +18135,7 @@ </histogram> <histogram base="true" name="Blink.MainFrame.StyleRatio" units="%" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>schenney@chromium.org</owner> <owner>paint-dev@chromium.org</owner> <!-- Name completed by histogram_suffixes name="BlinkMainFrameUpdateTimeSuffixes" --> @@ -18146,7 +18147,7 @@ </histogram> <histogram base="true" name="Blink.MainFrame.UpdateLayersRatio" units="%" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>schenney@chromium.org</owner> <owner>paint-dev@chromium.org</owner> <!-- Name completed by histogram_suffixes name="BlinkMainFrameUpdateTimeSuffixes" --> @@ -18176,7 +18177,7 @@ </histogram> <histogram name="Blink.MainFrame.WaitForCommitRatio" units="%" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>schenney@chromium.org</owner> <owner>paint-dev@chromium.org</owner> <!-- Name completed by histogram_suffixes name="BlinkMainFrameUpdateTimeSuffixes" --> @@ -18429,7 +18430,7 @@ </histogram> <histogram name="Blink.ProxyCommit.UpdateTime" units="microseconds" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <!-- Name completed by histogram_suffixes name="BlinkUpdateTimePreFCPSuffixes" --> <!-- Name completed by histogram_suffixes name="BlinkUpdateTimePostFCPSuffixes" --> @@ -18739,7 +18740,7 @@ </histogram> <histogram name="Blink.ScrollingCoordinator.UpdateTime" units="microseconds" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <!-- Name completed by histogram_suffixes name="BlinkUpdateTimePreFCPSuffixes" --> <!-- Name completed by histogram_suffixes name="BlinkUpdateTimePostFCPSuffixes" --> @@ -18925,7 +18926,7 @@ </histogram> <histogram name="Blink.Style.UpdateTime" units="microseconds" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <!-- Name completed by histogram_suffixes name="BlinkUpdateTimePreFCPSuffixes" --> <!-- Name completed by histogram_suffixes name="BlinkUpdateTimePostFCPSuffixes" --> @@ -19108,7 +19109,7 @@ </histogram> <histogram name="Blink.UseCounter.FeaturePolicy.Header" - enum="FeaturePolicyFeature" expires_after="2020-07-06"> + enum="FeaturePolicyFeature" expires_after="2020-09-06"> <owner>iclelland@chromium.org</owner> <summary> Counts the use of a specific feature policy via the @@ -19303,7 +19304,7 @@ </histogram> <histogram name="Blink.UseCounter.File.Features" enum="FeatureObserver" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>yhirano@chromium.org</owner> <owner>mkwst@chromium.org</owner> <summary> @@ -20140,7 +20141,7 @@ </histogram> <histogram name="Bluetooth.ConnectedDeviceCount" units="devices" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>adlr@chromium.org</owner> <summary> Counts the number of simulataneously connected Bluetooth devices. Used to @@ -20203,7 +20204,7 @@ </histogram> <histogram name="Bluetooth.PairingMethod" enum="BluetoothPairingMethod" - expires_after="2020-05-03"> + expires_after="2020-09-06"> <owner>adlr@chromium.org</owner> <summary> Records the method used to pair each Bluetooth Device. Used to direct our @@ -20330,7 +20331,7 @@ </histogram> <histogram name="Bluetooth.Web.ConnectGATT.Outcome" - enum="WebBluetoothConnectGATTOutcome" expires_after="2020-07-06"> + enum="WebBluetoothConnectGATTOutcome" expires_after="2020-09-06"> <owner>odejesush@chromium.org</owner> <owner>ortuno@chromium.org</owner> <owner>reillyg@chromium.org</owner> @@ -20706,7 +20707,7 @@ </summary> </histogram> -<histogram name="BlueZ.AdapterLost" units="seconds" expires_after="2020-07-06"> +<histogram name="BlueZ.AdapterLost" units="seconds" expires_after="2020-09-06"> <owner>mcchou@chromium.org</owner> <summary> This is specific to Chrome OS. Records a duration of a Bluetooth adapter @@ -20749,7 +20750,7 @@ </histogram> <histogram name="BlueZ.ReasonOfDisconnection" enum="BlueZReasonOfDisconnection" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>mcchou@chromium.org</owner> <summary> This is specific to Chrome OS. Records the reason of Bluetooth disconnection @@ -20769,7 +20770,7 @@ </histogram> <histogram name="BlueZ.ResultOfConnection" enum="BlueZResultOfConnection" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>mcchou@chromium.org</owner> <summary> This is specific to Chrome OS. Records the outcomes of connection requests @@ -21360,7 +21361,7 @@ </histogram> <histogram base="true" name="Browser.Tabs.TotalIncompleteSwitchDuration" - units="ms" expires_after="2020-06-28"> + units="ms" expires_after="2020-09-06"> <!-- Name completed by histogram_suffixes name="TabSwitchingType" --> <owner>fdoray@chromium.org</owner> @@ -21480,7 +21481,7 @@ </histogram> <histogram name="BrowserRenderProcessHost.ChildCrashes" enum="RendererType" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>wfh@chromium.org</owner> <summary>Count of renderer process crashes grouped by type.</summary> </histogram> @@ -22332,7 +22333,7 @@ </histogram> <histogram name="CaptivePortal.DetectResult" enum="CaptivePortalDetectResult" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>meacer@chromium.org</owner> <summary>Records the result of a captive portal probe.</summary> </histogram> @@ -22666,7 +22667,7 @@ </histogram> <histogram name="Cast.Sender.VideoEncodeAcceleratorInitializeSuccess" - enum="BooleanSuccess" expires_after="2020-07-06"> + enum="BooleanSuccess" expires_after="2020-09-06"> <owner>posciak@chromium.org</owner> <summary> Indicates whether initialization of a video encode accelerator for Cast @@ -23071,7 +23072,7 @@ </histogram> <histogram name="ChildProcess.Killed2.OOM" enum="ProcessType2" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>oshima@chromium.org</owner> <summary> Out of ChildProcess.Killled, number of kills due to SIGKILL, which is a @@ -23461,7 +23462,7 @@ </histogram> <histogram name="ChromeColors.ColorOnLoad" enum="ChromeColorsInfo" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>gayane@chromium.org</owner> <owner>yyushkina@chromium.org</owner> <summary> @@ -25335,7 +25336,7 @@ </histogram> <histogram name="Compositing.DirectRenderer.Software.DrawFrameUs" - units="microseconds" expires_after="2020-07-06"> + units="microseconds" expires_after="2020-09-06"> <owner>weiliangc@chromium.org</owner> <summary> Time spent drawing of composited layers by SoftwareRenderer, in @@ -25441,7 +25442,7 @@ </histogram> <histogram name="Compositing.Display.DrawToSwapUs" units="microseconds" - expires_after="2020-07-02"> + expires_after="2020-09-06"> <owner>backer@chromium.org</owner> <owner>rjkroege@chromium.org</owner> <summary> @@ -25477,7 +25478,7 @@ </histogram> <histogram name="Compositing.Display.FlattenedRenderPassCount" units="units" - expires_after="2020-07-02"> + expires_after="2020-09-06"> <owner>backer@chromium.org</owner> <owner>rjkroege@chromium.org</owner> <summary> @@ -26787,7 +26788,7 @@ </histogram> <histogram name="ContentSettings.DefaultNotificationsSetting" - enum="ContentSetting" expires_after="2020-07-06"> + enum="ContentSetting" expires_after="2020-09-06"> <owner>toyoshim@chromium.org</owner> <summary>The default notification setting at profile open.</summary> </histogram> @@ -26823,7 +26824,7 @@ </histogram> <histogram name="ContentSettings.DefaultSubresourceFilterSetting" - enum="ContentSetting" expires_after="2020-07-06"> + enum="ContentSetting" expires_after="2020-09-06"> <owner>csharrison@chromium.org</owner> <summary>The default subresource filter setting at profile open</summary> </histogram> @@ -30160,7 +30161,7 @@ </histogram> <histogram name="CrosDisksClient.MountCompletedError" - enum="CrosDisksClientMountError" expires_after="2020-07-06"> + enum="CrosDisksClientMountError" expires_after="2020-09-06"> <owner>amistry@chromium.org</owner> <summary> The error code of disk mount signals received from the Chrome OS cros-disks @@ -30178,7 +30179,7 @@ </histogram> <histogram name="CrosDisksClient.MountTime" units="ms" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>amistry@chromium.org</owner> <summary> Time taken by the Chrome OS cros-disks daemon to perform a Mount operation. @@ -30195,7 +30196,7 @@ </histogram> <histogram name="CrosDisksClient.UnmountTime" units="ms" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>amistry@chromium.org</owner> <summary> Time taken by the Chrome OS cros-disks daemon to perform an Unmount @@ -31259,6 +31260,77 @@ </summary> </histogram> +<histogram name="CryptAuth.DeviceSyncV2.RemoteDeviceProvider.NumV1Devices" + units="count" expires_after="2021-02-02"> + <owner>nohle@chromium.org</owner> + <owner>better-together-dev@google.com</owner> + <summary> + Records the number of devices returned by a v1 DeviceSync. Only recorded + when v1 and v2 DeviceSync are running in parallel. Only recorded if a v1 and + v2 DeviceSync has ever previously occurred. Emitted when v1 and v2 devices + are merged together, which occurs after either a v1 or v2 DeviceSync. + </summary> +</histogram> + +<histogram name="CryptAuth.DeviceSyncV2.RemoteDeviceProvider.NumV2Devices" + units="count" expires_after="2021-02-02"> + <owner>nohle@chromium.org</owner> + <owner>better-together-dev@google.com</owner> + <summary> + Records the number of devices returned by a v2 DeviceSync. Only recorded + when v1 and v2 DeviceSync are running in parallel. Only recorded if a v1 and + v2 DeviceSync has ever previously occurred. Emitted when v1 and v2 devices + are merged together, which occurs after either a v1 or v2 DeviceSync. + </summary> +</histogram> + +<histogram + name="CryptAuth.DeviceSyncV2.RemoteDeviceProvider.PercentageOfV1DevicesReplacedByV2Devices" + units="%" expires_after="2021-02-02"> + <owner>nohle@chromium.org</owner> + <owner>better-together-dev@google.com</owner> + <summary> + Records the percentage of devices returned by a v2 DeviceSync that replace + their v1 counterparts. This will only occur if the v2 device has a decrypted + public key that matches a v1 device. Only recorded when v1 and v2 DeviceSync + are running in parallel. Only recorded if a v1 and v2 DeviceSync has ever + previously occurred. Emitted when v1 and v2 devices are merged together, + which occurs after either a v1 or v2 DeviceSync. + </summary> +</histogram> + +<histogram + name="CryptAuth.DeviceSyncV2.RemoteDeviceProvider.PercentageOfV2DevicesWithDecryptedPublicKey" + units="%" expires_after="2021-02-02"> + <owner>nohle@chromium.org</owner> + <owner>better-together-dev@google.com</owner> + <summary> + Records the percentage of devices returned by a v2 DeviceSync that have a + decrypted user public key. Only recorded when v1 and v2 DeviceSync are + running in parallel. Only recorded if a v1 and v2 DeviceSync has ever + previously occurred. Emitted when v1 and v2 devices are merged together, + which occurs after either a v1 or v2 DeviceSync. + </summary> +</histogram> + +<histogram + name="CryptAuth.DeviceSyncV2.RemoteDeviceProvider.RatioOfV2ToV1Devices" + units="%" expires_after="2021-02-02"> + <owner>nohle@chromium.org</owner> + <owner>better-together-dev@google.com</owner> + <summary> + Records the ratio of the number of devices returned by a v2 DeviceSync to + the number returned by a v1 DeviceSync. Devices returned by a v2 DeviceSync + should be a subset of the devices returned by a v1 DeviceSync, barring any + race conditions. This ratio should be greater than or equal to + PercentageOfV1DevicesReplacedByV2Devices because a v2 device can only + replace its v1 counterpart if it has a decrypted public key. Only recorded + when v1 and v2 DeviceSync are running in parallel. Only recorded if a v1 and + v2 DeviceSync has ever previously occurred. Emitted when v1 and v2 devices + are merged together, which occurs after either a v1 or v2 DeviceSync. + </summary> +</histogram> + <histogram name="CryptAuth.DeviceSyncV2.Result.DidDeviceRegistryChange" enum="BooleanChanged" expires_after="2021-02-02"> <owner>nohle@chromium.org</owner> @@ -41953,7 +42025,7 @@ </histogram> <histogram name="Download.Service.Files.FreeDiskSpace" units="%" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>xingliu@chromium.org</owner> <summary> The percentage of free disk space to total disk space. Recorded during @@ -42020,7 +42092,7 @@ </histogram> <histogram name="Download.Service.Finish.Type" - enum="Download.Service.CompletionType" expires_after="2020-07-06"> + enum="Download.Service.CompletionType" expires_after="2020-09-06"> <owner>xingliu@chromium.org</owner> <summary>The completion type for downloads in download service.</summary> </histogram> @@ -42277,7 +42349,7 @@ </histogram> <histogram name="Download.Start.ContentType.InsecureChain" - enum="DownloadContentType" expires_after="2020-07-06"> + enum="DownloadContentType" expires_after="2020-09-06"> <owner>cthomp@chromium.org</owner> <owner>estark@chromium.org</owner> <summary> @@ -46015,7 +46087,7 @@ </histogram> <histogram name="Event.Latency.BlockingTime.TouchStartDefaultAllowed" - units="ms" expires_after="2020-05-31"> + units="ms" expires_after="2020-09-06"> <owner>tdresser@chromium.org</owner> <summary> Time between the renderer main thread receiving a touchstart event and @@ -46624,7 +46696,7 @@ </histogram> <histogram name="Event.Latency.EndToEnd.Mouse" units="microseconds" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>input-dev@chromium.org</owner> <summary> Time between the OS receiving a mouse event and the resulting GPU frame @@ -59949,7 +60021,7 @@ </histogram> <histogram name="GPU.GPUProcessExitCode" enum="GPUProcessExitCode" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>jbauman@chromium.org</owner> <summary> Counts for the exit codes returned by the GPU process when it terminated. @@ -60811,7 +60883,7 @@ </histogram> <histogram name="GPU.WatchdogThread.Timeout" enum="GpuWatchdogTimeoutEvent" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <!-- Name completed by histogram_suffixes name="GPU.WatchdogStage" --> <owner>magchen@chromium.org</owner> @@ -60832,7 +60904,7 @@ </histogram> <histogram name="GPU.WatchdogThread.V1.Timeout" enum="GpuWatchdogTimeoutEvent" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>magchen@chromium.org</owner> <owner>zmo@chromium.org</owner> <summary> @@ -60851,7 +60923,7 @@ </histogram> <histogram name="GPU.WatchdogThread.WaitTime" units="ms" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <!-- Name completed by histogram_suffixes name="GPU.WatchdogStage" --> <owner>magchen@chromium.org</owner> @@ -62937,7 +63009,7 @@ </summary> </histogram> -<histogram name="HttpCache.BeforeSend" units="ms" expires_after="2020-07-06"> +<histogram name="HttpCache.BeforeSend" units="ms" expires_after="2020-09-06"> <owner>morlovich@chromium.org</owner> <summary> For http cache transactions in which a network request was sent, the time @@ -79684,6 +79756,13 @@ <summary>Records generic Infobar Modal events.</summary> </histogram> +<histogram base="true" name="Mobile.Messages.OverflowRow.Tapped" + enum="MobileMessagesInfobarType" expires_after="2020-08-01"> + <owner>sczs@chromium.org</owner> + <owner>thegreenfrog@chromium.org</owner> + <summary>Records a tap on an Infobar overflow menu row.</summary> +</histogram> + <histogram base="true" name="Mobile.Messages.Passwords.Modal.Dismiss" enum="MobileMessagesPasswordsModalDismiss" expires_after="2022-05-01"> <!-- Name completed by histogram_suffixes name="Mobile.Messages.Password.Type" --> @@ -81454,6 +81533,20 @@ </summary> </histogram> +<histogram name="MultiDevice.Setup.HostVerifier.DoesHostHaveCryptoData" + enum="Boolean" expires_after="2021-02-02"> + <owner>nohle@chromium.org</owner> + <owner>better-together-dev@google.com</owner> + <summary> + Records if a multi-device host device has all of the crypto data necessary + for secure communication via Bluetooth. This will be false if v2 DeviceSync + data is not yet decrypted, for instance. Emitted when checking if a host is + verified. This occurs only if there is an existing host, and the check + occurs during start-up, when the host changes, or when new devices are + synced from CryptAuth. + </summary> +</histogram> + <histogram name="MultiDevice.VerifyButtonClicked" enum="MultiDevice_VerifyAndForgetHostConfirmationState" expires_after="2021-02-02"> @@ -121930,7 +122023,7 @@ </histogram> <histogram name="Plugin.PpapiBrokerLoadErrorCode" enum="WinGetLastError" - expires_after="M81"> + expires_after="M87"> <owner>xhwang@chromium.org</owner> <summary> The error code of a PPAPI broker load failure. Only reported on Windows. @@ -121938,12 +122031,12 @@ </histogram> <histogram name="Plugin.PpapiBrokerLoadResult" enum="PluginLoadResult" - expires_after="M81"> + expires_after="M87"> <owner>xhwang@chromium.org</owner> <summary>The result from an attempt to load a PPAPI broker.</summary> </histogram> -<histogram name="Plugin.PpapiBrokerLoadTime" units="ms" expires_after="M81"> +<histogram name="Plugin.PpapiBrokerLoadTime" units="ms" expires_after="M87"> <owner>xhwang@chromium.org</owner> <summary>The time spent to load a PPAPI broker.</summary> </histogram> @@ -126431,7 +126524,7 @@ </histogram> <histogram name="Privacy.DoNotTrackSetting" enum="BooleanEnabled" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>mkwst@chromium.org</owner> <owner>msramek@chromium.org</owner> <summary> @@ -126540,7 +126633,7 @@ </histogram> <histogram name="Profile.AddNewUser" enum="ProfileAddNewUser" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>rogerta@chromium.org</owner> <summary>The frequency of ways that new user profiles are added.</summary> </histogram> @@ -126958,7 +127051,7 @@ </histogram> <histogram name="Profile.NumberOfNamedProfiles" units="count" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>feuunk@chromium.org</owner> <owner>msarda@chromium.org</owner> <summary> @@ -139377,6 +139470,10 @@ <histogram name="Scheduling.BeginMainFrameStartToCommitDuration2" units="microseconds" expires_after="M85"> + <obsolete> + Replaced by SendBeginMainFrameToCommit of CompositorLatency metrics as of + 02/2020. + </obsolete> <owner>vmiura@chromium.org</owner> <owner>sadrul@chromium.org</owner> <summary> @@ -143140,6 +143237,9 @@ <histogram name="Sensors.Windows.ISensor.Activation.Result" enum="Hresult" expires_after="M82"> + <obsolete> + Removed in M82 after the WinRT backend experiment concluded. + </obsolete> <owner>reillyg@chromium.org</owner> <owner>wensh@microsoft.com</owner> <summary> @@ -143151,6 +143251,9 @@ <histogram name="Sensors.Windows.ISensor.Start.Result" enum="Hresult" expires_after="M82"> + <obsolete> + Removed in M82 after the WinRT backend experiment concluded. + </obsolete> <owner>reillyg@chromium.org</owner> <owner>wensh@microsoft.com</owner> <summary> @@ -143162,6 +143265,9 @@ <histogram name="Sensors.Windows.ISensor.Stop.Result" enum="Hresult" expires_after="M82"> + <obsolete> + Removed in M82 after the WinRT backend experiment concluded. + </obsolete> <owner>reillyg@chromium.org</owner> <owner>wensh@microsoft.com</owner> <summary> @@ -143173,6 +143279,9 @@ <histogram name="Sensors.Windows.WinRT.Activation.Result" enum="Hresult" expires_after="M82"> + <obsolete> + Removed in M82 after the WinRT backend experiment concluded. + </obsolete> <owner>reillyg@chromium.org</owner> <owner>wensh@microsoft.com</owner> <summary> @@ -143184,6 +143293,9 @@ <histogram name="Sensors.Windows.WinRT.Start.Result" enum="Hresult" expires_after="M82"> + <obsolete> + Removed in M82 after the WinRT backend experiment concluded. + </obsolete> <owner>reillyg@chromium.org</owner> <owner>wensh@microsoft.com</owner> <summary> @@ -143195,6 +143307,9 @@ <histogram name="Sensors.Windows.WinRT.Stop.Result" enum="Hresult" expires_after="M82"> + <obsolete> + Removed in M82 after the WinRT backend experiment concluded. + </obsolete> <owner>reillyg@chromium.org</owner> <owner>wensh@microsoft.com</owner> <summary> @@ -148135,6 +148250,16 @@ </summary> </histogram> +<histogram name="Sharing.SharingHubAndroid.ThirdPartyAppUsage" + enum="SharingHubBottomRowIndex" expires_after="M85"> + <owner>kmilka@chromium.org</owner> + <owner>src/components/send_tab_to_self/OWNERS</owner> + <summary> + Records the index of the third party app selected from the bottom row of the + sharing hub. + </summary> +</histogram> + <histogram name="Sharing.SharingHubAndroid.TimeToShowShareSheet" units="ms" expires_after="M85"> <owner>kmilka@chromium.org</owner> @@ -152926,8 +153051,22 @@ </summary> </histogram> +<histogram name="SoftwareReporter.ConfigurationErrors" + enum="SoftwareReporterConfigurationError" expires_after="M85"> + <owner>bdea@google.com</owner> + <owner>chrome-safebrowsing-alerts@google.com</owner> + <summary> + Whether a configuration error prevented the experimental Software Reporter + from running. + </summary> +</histogram> + <histogram name="SoftwareReporter.ExperimentErrors" - enum="SoftwareReporterExperimentError" expires_after="M85"> + enum="SoftwareReporterConfigurationError" expires_after="M82"> + <obsolete> + Deprecate in M82 as the histogram is renamed to + SoftwareReporter.ConfigurationErrors. + </obsolete> <owner>joenotcharles@google.com</owner> <summary> Whether a configuration error prevented the experimental Software Reporter @@ -155114,7 +155253,7 @@ </histogram> <histogram name="Startup.BrowserWindow.FirstPaint" units="ms" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>mblsha@yandex-team.ru</owner> <summary> Time from browser startup to the time the first Browser window has finished @@ -156076,7 +156215,7 @@ </histogram> <histogram name="Storage.Blob.FileReaderLoader.FailureType" - enum="FileReaderLoaderFailureType" expires_after="2020-07-06"> + enum="FileReaderLoaderFailureType" expires_after="2020-09-06"> <owner>dmurph@chromium.org</owner> <summary> Recorded when an error occurs in the FileReaderLoader, which is used to load @@ -156089,7 +156228,7 @@ </histogram> <histogram name="Storage.Blob.FileReaderLoader.ReadError" enum="NetErrorCodes" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>dmurph@chromium.org</owner> <summary> The error code reported by the blob system while trying to read a blob in @@ -167528,7 +167667,7 @@ </histogram> <histogram name="UMA.TruncatedEvents.UserAction" units="events" - expires_after="2020-08-30"> + expires_after="2020-09-06"> <owner>rkaplow@chromium.org</owner> <owner>src/base/metrics/OWNERS</owner> <summary> @@ -173709,7 +173848,7 @@ </histogram> <histogram name="WebController.ExternalURLRequestBlocking" - enum="IOSExternalURLRequestStatus" expires_after="2020-07-01"> + enum="IOSExternalURLRequestStatus" expires_after="2020-09-06"> <owner>mrefaat@chromium.org</owner> <summary> [iOS] Measures the proportion of external URL requests that originate from a @@ -174204,7 +174343,7 @@ </histogram> <histogram name="WebCore.IndexedDB.LevelDBOpenErrors.Corruption" - enum="LevelDBCorruptionTypes" expires_after="2020-07-06"> + enum="LevelDBCorruptionTypes" expires_after="2020-09-06"> <owner>dgrogan@chromium.org</owner> <summary> Types of corruption that LevelDB encounters when opening a database. @@ -174864,7 +175003,7 @@ </histogram> <histogram name="WebCore.IndexedDB.TransactionAbortReason" enum="IDBException" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>dmurph@chromium.org</owner> <summary> Recorded on the browser side (back end) when an IndexedDB transaction is @@ -175185,7 +175324,7 @@ </histogram> <histogram name="WebCore.WebSocket.MessageSize.Receive" units="bytes" - expires_after="2020-06-28"> + expires_after="2020-09-06"> <owner>yhirano@chromium.org</owner> <owner>ricea@chromium.org</owner> <summary> @@ -175447,7 +175586,7 @@ </histogram> <histogram base="true" name="WebFont.HttpCacheStatus" enum="HttpCachePattern" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>yaoxia@chromium.org</owner> <owner>shivanisha@chromium.org</owner> <summary> @@ -177514,7 +177653,7 @@ </histogram> <histogram name="WebRTC.PeerConnection.TimeToConnect" units="ms" - expires_after="2020-07-06"> + expires_after="2020-09-06"> <owner>qingsi@google.com</owner> <owner>jeroendb@google.com</owner> <summary>Time to setup a peer to peer call with PeerConnection.</summary>
diff --git a/tools/polymer/polymer.gni b/tools/polymer/polymer.gni index 6770095..a4983f5 100644 --- a/tools/polymer/polymer.gni +++ b/tools/polymer/polymer.gni
@@ -15,6 +15,7 @@ "ui/webui/resources/html/cr/ui/focus_without_ink.html|focusWithoutInk", "ui/webui/resources/html/find_shortcut_behavior.html|FindShortcutBehavior", "ui/webui/resources/html/i18n_behavior.html|I18nBehavior", + "ui/webui/resources/html/list_property_update_behavior.html|ListPropertyUpdateBehavior", "ui/webui/resources/html/load_time_data.html|loadTimeData", "ui/webui/resources/html/parse_html_subset.html|parseHtmlSubset", "ui/webui/resources/html/polymer.html|Polymer,html",
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn index d93480c..33b8a3b 100644 --- a/ui/base/BUILD.gn +++ b/ui/base/BUILD.gn
@@ -116,9 +116,6 @@ "l10n/time_format.h", "layout.cc", "layout.h", - "material_design/material_design_controller.cc", - "material_design/material_design_controller.h", - "material_design/material_design_controller_observer.h", "models/button_menu_item_model.cc", "models/button_menu_item_model.h", "models/combobox_model.cc", @@ -147,6 +144,8 @@ "nine_image_painter_factory.h", "page_transition_types.cc", "page_transition_types.h", + "pointer/touch_ui_controller.cc", + "pointer/touch_ui_controller.h", "resource/resource_bundle.cc", "resource/resource_bundle.h", "resource/whitelist.h", @@ -873,9 +872,9 @@ "l10n/l10n_util_unittest.cc", "l10n/time_format_unittest.cc", "layout_unittest.cc", - "material_design/material_design_controller_unittest.cc", "models/simple_menu_model_unittest.cc", "models/tree_node_iterator_unittest.cc", + "pointer/touch_ui_controller_unittest.cc", "resource/data_pack_literal.cc", "resource/data_pack_literal.h", "resource/data_pack_unittest.cc",
diff --git a/ui/base/cocoa/menu_controller.h b/ui/base/cocoa/menu_controller.h index 72f990a8..d6dd4f0c 100644 --- a/ui/base/cocoa/menu_controller.h +++ b/ui/base/cocoa/menu_controller.h
@@ -25,12 +25,6 @@ @interface MenuControllerCocoa : NSObject<NSMenuDelegate, NSUserInterfaceValidations> -// Whether to activate selected menu items via a posted task. This may allow the -// selection to be handled earlier, whilst the menu is fading out. If the posted -// task wasn't processed by the time the action is normally sent, it will be -// sent synchronously at that stage. -@property(nonatomic, assign) BOOL postItemSelectedAsTask; - // Note that changing this will have no effect if you use // |-initWithModel:useWithPopUpButtonCell:| or after the first call to |-menu|. @property(nonatomic, assign) BOOL useWithPopUpButtonCell;
diff --git a/ui/base/cocoa/menu_controller.mm b/ui/base/cocoa/menu_controller.mm index c93a708..d50bbf6 100644 --- a/ui/base/cocoa/menu_controller.mm +++ b/ui/base/cocoa/menu_controller.mm
@@ -5,11 +5,9 @@ #import "ui/base/cocoa/menu_controller.h" #include "base/bind.h" -#include "base/cancelable_callback.h" #include "base/logging.h" #include "base/mac/foundation_util.h" #include "base/strings/sys_string_conversions.h" -#include "base/threading/thread_task_runner_handle.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/accelerators/platform_accelerator_cocoa.h" #include "ui/base/l10n/l10n_util_mac.h" @@ -103,17 +101,9 @@ // other method below does. - (void)addSeparatorToMenu:(NSMenu*)menu atIndex:(int)index; -// Called via a private API hook shortly after the event that selects a menu -// item arrives. -- (void)itemWillBeSelected:(NSMenuItem*)sender; - // Called when the user chooses a particular menu item. AppKit sends this only // after the menu has fully faded out. |sender| is the menu item chosen. - (void)itemSelected:(id)sender; - -// Called by the posted task to selected an item during menu fade out. -// |uiEventFlags| are the ui::EventFlags captured from the triggering NSEvent. -- (void)itemSelected:(id)sender uiEventFlags:(int)uiEventFlags; @end @interface ResponsiveNSMenuItem : NSMenuItem @@ -124,12 +114,9 @@ base::scoped_nsobject<NSMenu> _menu; BOOL _useWithPopUpButtonCell; // If YES, 0th item is blank BOOL _isMenuOpen; - BOOL _postItemSelectedAsTask; - std::unique_ptr<base::CancelableClosure> _postedItemSelectedTask; } @synthesize useWithPopUpButtonCell = _useWithPopUpButtonCell; -@synthesize postItemSelectedAsTask = _postItemSelectedAsTask; - (ui::MenuModel*)model { return _model.get(); @@ -198,7 +185,7 @@ atIndex:(NSInteger)index fromModel:(ui::MenuModel*)model { NSString* label = l10n_util::FixUpWindowsStyleLabel(model->GetLabelAt(index)); - base::scoped_nsobject<NSMenuItem> item([[ResponsiveNSMenuItem alloc] + base::scoped_nsobject<NSMenuItem> item([[NSMenuItem alloc] initWithTitle:label action:@selector(itemSelected:) keyEquivalent:@""]); @@ -292,65 +279,14 @@ return model->IsEnabledAt(modelIndex); } -- (void)itemWillBeSelected:(NSMenuItem*)sender { - if (_postItemSelectedAsTask && [sender action] == @selector(itemSelected:) && - [[sender target] - respondsToSelector:@selector(itemSelected:uiEventFlags:)]) { - const int uiEventFlags = ui::EventFlagsFromNative([NSApp currentEvent]); - - // Take care here to retain |menu_| in the block, but not |self|. Since the - // block may run before -menuDidClose:, a release of the MenuControllerCocoa - // will think the menu is open, and invoke -cancel. So if the delegate is - // bad (see below), and decides to release the MenuControllerCocoa in its - // menu action, ensure the -dealloc happens there. To do otherwise risks - // |model_| being deleted when it is used in -cancel, whereas that is less - // likely if the -cancel happens in the delegate method. - NSMenu* menu = _menu; - - _postedItemSelectedTask = std::make_unique<base::CancelableClosure>( - base::BindRepeating(base::RetainBlock(^{ - id target = [sender target]; - if ([target respondsToSelector:@selector(itemSelected:uiEventFlags:)]) - [target itemSelected:sender uiEventFlags:uiEventFlags]; - else - NOTREACHED(); - - // Ensure consumers that use -postItemSelectedAsTask:YES have not - // destroyed the MenuControllerCocoa in the menu action. AppKit will - // still send messages to [item target] (the MenuControllerCocoa), and - // the target can not be set to nil here since that prevents re-use of - // the menu for well-behaved consumers. - CHECK([menu delegate]); // Note: set to nil in -dealloc. - }))); - base::ThreadTaskRunnerHandle::Get()->PostTask( - FROM_HERE, _postedItemSelectedTask->callback()); - } -} - - (void)itemSelected:(id)sender { - // A task created in -itemWillBeSelected: may or may not have run. If not, put - // it on the stack before running it, in case it destroys |self|. - if (auto pendingTask = std::move(_postedItemSelectedTask)) { - if (!pendingTask->IsCancelled()) - pendingTask->callback().Run(); - } else { - [self itemSelected:sender - uiEventFlags:ui::EventFlagsFromNative([NSApp currentEvent])]; - } -} - -- (void)itemSelected:(id)sender uiEventFlags:(int)uiEventFlags { - // Cancel any posted task, but don't reset it, so that the correct path is - // taken in -itemSelected:. - if (_postedItemSelectedTask) - _postedItemSelectedTask->Cancel(); - NSInteger modelIndex = [sender tag]; ui::MenuModel* model = [WeakPtrToMenuModelAsNSObject getFrom:[sender representedObject]]; DCHECK(model); if (model) - model->ActivatedAt(modelIndex, uiEventFlags); + model->ActivatedAt(modelIndex, + ui::EventFlagsFromNative([NSApp currentEvent])); // Note: |self| may be destroyed by the call to ActivatedAt(). } @@ -391,17 +327,3 @@ @end -@interface NSMenuItem (Private) -// Private method which is invoked very soon after the event that activates a -// menu item is received. AppKit then spends 300ms or so flashing the menu item, -// and fading out the menu, in private run loop modes. -- (void)_sendItemSelectedNote; -@end - -@implementation ResponsiveNSMenuItem -- (void)_sendItemSelectedNote { - if ([[self target] respondsToSelector:@selector(itemWillBeSelected:)]) - [[self target] itemWillBeSelected:self]; - [super _sendItemSelectedNote]; -} -@end
diff --git a/ui/base/cocoa/menu_controller_unittest.mm b/ui/base/cocoa/menu_controller_unittest.mm index 2deb103..6578019 100644 --- a/ui/base/cocoa/menu_controller_unittest.mm +++ b/ui/base/cocoa/menu_controller_unittest.mm
@@ -4,7 +4,6 @@ #import <Cocoa/Cocoa.h> -#include "base/mac/mac_util.h" #include "base/run_loop.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" @@ -23,28 +22,6 @@ using base::ASCIIToUTF16; -@interface MenuControllerCocoa (TestingAPI) -- (void)itemWillBeSelected:(NSMenuItem*)sender; -- (void)itemSelected:(id)sender; -@end - -@interface TestResponsiveMenuController : MenuControllerCocoa -@property(assign, nonatomic) BOOL sawItemEarly; -@end - -@implementation TestResponsiveMenuController { - BOOL _sawItemEarly; -} - -@synthesize sawItemEarly = _sawItemEarly; - -- (void)itemWillBeSelected:(NSMenuItem*)sender { - _sawItemEarly = YES; - [super itemWillBeSelected:sender]; -} - -@end - @interface WatchedLifetimeMenuController : MenuControllerCocoa @property(assign, nonatomic) BOOL* deallocCalled; @end @@ -62,11 +39,6 @@ @end -@interface NSMenuItem (Private) -// Exposed to simulate in testing. -- (void)_sendItemSelectedNote; -@end - namespace ui { namespace { @@ -664,130 +636,6 @@ EXPECT_TRUE(delegate.did_close_); } -// Verify that the private API used by MenuControllerCocoa's -// ResponsiveNSMenuItem exists in the runtime. It's not a disaster if it -// disappears, (or AppKit stops invoking it) but consumers will stop receiving -// opportunities to -processItemSelectedEarly:. -TEST_F(MenuControllerTest, SendItemSelectedNoteExists) { - // -_sendItemSelectedNote doesn't exist on 10.9 or 10.10. NSPopUpButton menus - // on 10.9 don't animate out, and always suffer from the brief "flash" of the - // old selection when the menu disappears. - // TODO(tapted): Find a hook on 10.10 if we deem it necessary. - if (base::mac::IsAtMostOS10_10()) - return; - - EXPECT_TRUE( - [NSMenuItem instancesRespondToSelector:@selector(_sendItemSelectedNote)]); -} - -// Emulate the flow for -[MenuControllerCocoa itemWillBeSelected:] and -// processing the action via posted task during menu fade out. -TEST_F(MenuControllerTest, EmulateItemSelectedEarly) { - if (![NSMenuItem instancesRespondToSelector:@selector(_sendItemSelectedNote)]) - return; - - base::test::SingleThreadTaskEnvironment task_environment( - base::test::SingleThreadTaskEnvironment::MainThreadType::UI); - - Delegate delegate; - delegate.auto_close_ = false; - - SimpleMenuModel model(&delegate); - model.AddItem(1, ASCIIToUTF16("foo")); - - base::scoped_nsobject<TestResponsiveMenuController> controller( - [[TestResponsiveMenuController alloc] initWithModel:&model - useWithPopUpButtonCell:NO]); - - auto ResetWithPostTask = [&](BOOL post) { - // Flush calls to OnMenuClosed() Posted by SimpleMenuModel. - base::RunLoop().RunUntilIdle(); - - [controller setPostItemSelectedAsTask:post]; - [controller setSawItemEarly:NO]; - delegate.execute_count_ = 0; - delegate.did_show_ = delegate.did_close_ = false; - }; - - ResetWithPostTask(YES); - NSMenuItem* item = [[controller menu] itemAtIndex:0]; - EXPECT_TRUE(item); - - [controller menuWillOpen:[controller menu]]; - - // Pretend the first item got clicked. AppKit sends _sendItemSelectedNote to - // the menu item, then performs its action. - EXPECT_FALSE([controller sawItemEarly]); - EXPECT_EQ(0, delegate.execute_count_); - [item _sendItemSelectedNote]; - - EXPECT_TRUE([controller sawItemEarly]); - - // Task is posted at this point, but not executed. - EXPECT_EQ(0, delegate.execute_count_); - - // Pretend the menu is fading out, which spins a RunLoop. - base::RunLoop().RunUntilIdle(); - - // Item gets executed early. - EXPECT_EQ(1, delegate.execute_count_); - - // Simulate dismissal. This happens before the action. - [controller menuDidClose:[controller menu]]; - - // Perform the action normally. Shouldn't get executed again. - [[item target] performSelector:[item action] withObject:item]; - EXPECT_EQ(1, delegate.execute_count_); - - // Repeat, simulating the condition where the private API hook fails. - ResetWithPostTask(YES); - [controller menuWillOpen:[controller menu]]; - [controller menuDidClose:[controller menu]]; - base::RunLoop().RunUntilIdle(); - EXPECT_FALSE([controller sawItemEarly]); - EXPECT_EQ(0, delegate.execute_count_); - [[item target] performSelector:[item action] withObject:item]; - EXPECT_FALSE([controller sawItemEarly]); - EXPECT_EQ(1, delegate.execute_count_); - - // Repeat, simulating the condition where events do not pump during fade out. - ResetWithPostTask(YES); - [controller menuWillOpen:[controller menu]]; - EXPECT_FALSE([controller sawItemEarly]); - EXPECT_EQ(0, delegate.execute_count_); - [item _sendItemSelectedNote]; - EXPECT_TRUE([controller sawItemEarly]); - EXPECT_EQ(0, delegate.execute_count_); - // No pump. - [controller menuDidClose:[controller menu]]; - EXPECT_EQ(0, delegate.execute_count_); - [[item target] performSelector:[item action] withObject:item]; - EXPECT_TRUE([controller sawItemEarly]); - EXPECT_EQ(1, delegate.execute_count_); - base::RunLoop().RunUntilIdle(); // Back the main loop. - EXPECT_EQ(1, delegate.execute_count_); - - // Repeat, without processing early. - ResetWithPostTask(NO); - - [controller menuWillOpen:[controller menu]]; - [item _sendItemSelectedNote]; - - // Saw it, but didn't execute. - EXPECT_TRUE([controller sawItemEarly]); - EXPECT_EQ(0, delegate.execute_count_); - - // Even after spinning a RunLoop. - base::RunLoop().RunUntilIdle(); - EXPECT_EQ(0, delegate.execute_count_); - - [controller menuDidClose:[controller menu]]; - - // Perform the action normally. Now executes. - [[item target] performSelector:[item action] withObject:item]; - EXPECT_EQ(1, delegate.execute_count_); -} - // Tests invoking a menu action on a delegate that immediately releases the // MenuControllerCocoa and destroys itself. Note this usually needs asan to // actually crash (before it was fixed).
diff --git a/ui/base/cursor/cursor.h b/ui/base/cursor/cursor.h index 1625acf4..15bd7a90 100644 --- a/ui/base/cursor/cursor.h +++ b/ui/base/cursor/cursor.h
@@ -75,7 +75,7 @@ PlatformCursor platform_cursor_ = 0; // The scale factor for the cursor bitmap. - float image_scale_factor_ = 0.0f; + float image_scale_factor_ = 1.0f; // The hotspot for the cursor. This is only used for the custom cursor type. gfx::Point custom_hotspot_;
diff --git a/ui/base/material_design/OWNERS b/ui/base/material_design/OWNERS deleted file mode 100644 index 645c186..0000000 --- a/ui/base/material_design/OWNERS +++ /dev/null
@@ -1,2 +0,0 @@ -kylixrd@chromium.org -robliao@chromium.org
diff --git a/ui/base/material_design/material_design_controller.cc b/ui/base/material_design/material_design_controller.cc deleted file mode 100644 index c83bfcf..0000000 --- a/ui/base/material_design/material_design_controller.cc +++ /dev/null
@@ -1,115 +0,0 @@ -// Copyright 2015 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "ui/base/material_design/material_design_controller.h" - -#include <string> - -#include "base/bind.h" -#include "base/command_line.h" -#include "base/logging.h" -#include "base/message_loop/message_loop_current.h" -#include "base/no_destructor.h" -#include "base/observer_list.h" -#include "build/buildflag.h" -#include "ui/base/buildflags.h" -#include "ui/base/material_design/material_design_controller_observer.h" -#include "ui/base/ui_base_switches.h" - -#if defined(OS_WIN) -#include "base/win/win_util.h" -#include "base/win/windows_version.h" -#include "ui/base/win/hidden_window.h" -#include "ui/gfx/win/singleton_hwnd.h" -#include "ui/gfx/win/singleton_hwnd_observer.h" -#endif - -namespace ui { - -#if defined(OS_WIN) -namespace { - -bool IsTabletMode() { - return base::win::IsWindows10TabletMode( - gfx::SingletonHwnd::GetInstance()->hwnd()); -} - -} // namespace -#endif // defined(OS_WIN) - -MaterialDesignController::TouchUiScoperForTesting::TouchUiScoperForTesting( - bool enabled, - MaterialDesignController* controller) - : controller_(controller), - old_state_(controller_->SetTouchUiState( - enabled ? TouchUiState::kEnabled : TouchUiState::kDisabled)) {} - -MaterialDesignController::TouchUiScoperForTesting::~TouchUiScoperForTesting() { - controller_->SetTouchUiState(old_state_); -} - -// static -MaterialDesignController* MaterialDesignController::GetInstance() { - static base::NoDestructor<MaterialDesignController> instance([] { - const std::string switch_value = - base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( - switches::kTopChromeTouchUi); - if (switch_value == switches::kTopChromeTouchUiDisabled) - return TouchUiState::kDisabled; - const bool enabled = switch_value == switches::kTopChromeTouchUiEnabled; - return enabled ? TouchUiState::kEnabled : TouchUiState::kAuto; - }()); - return instance.get(); -} - -MaterialDesignController::MaterialDesignController(TouchUiState touch_ui_state) - : touch_ui_state_(touch_ui_state) { -#if defined(OS_WIN) - if (base::MessageLoopCurrentForUI::IsSet() && - (base::win::GetVersion() >= base::win::Version::WIN10)) { - singleton_hwnd_observer_ = - std::make_unique<gfx::SingletonHwndObserver>(base::BindRepeating( - [](HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) { - if (message == WM_SETTINGCHANGE) - GetInstance()->OnTabletModeToggled(IsTabletMode()); - })); - tablet_mode_ = IsTabletMode(); - } -#endif -} - -MaterialDesignController::~MaterialDesignController() = default; - -void MaterialDesignController::OnTabletModeToggled(bool enabled) { - const bool was_touch_ui = touch_ui(); - tablet_mode_ = enabled; - if (touch_ui() != was_touch_ui) - NotifyObservers(); -} - -void MaterialDesignController::AddObserver( - MaterialDesignControllerObserver* observer) { - observers_.AddObserver(observer); -} - -void MaterialDesignController::RemoveObserver( - MaterialDesignControllerObserver* observer) { - observers_.RemoveObserver(observer); -} - -MaterialDesignController::TouchUiState -MaterialDesignController::SetTouchUiState(TouchUiState touch_ui_state) { - const bool was_touch_ui = touch_ui(); - const TouchUiState old_state = std::exchange(touch_ui_state_, touch_ui_state); - if (touch_ui() != was_touch_ui) - NotifyObservers(); - return old_state; -} - -void MaterialDesignController::NotifyObservers() const { - for (auto& observer : observers_) - observer.OnTouchUiChanged(); -} - -} // namespace ui
diff --git a/ui/base/material_design/material_design_controller.h b/ui/base/material_design/material_design_controller.h deleted file mode 100644 index 262ef3c..0000000 --- a/ui/base/material_design/material_design_controller.h +++ /dev/null
@@ -1,82 +0,0 @@ -// Copyright 2015 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef UI_BASE_MATERIAL_DESIGN_MATERIAL_DESIGN_CONTROLLER_H_ -#define UI_BASE_MATERIAL_DESIGN_MATERIAL_DESIGN_CONTROLLER_H_ - -#include <string> - -#include "base/observer_list.h" -#include "base/optional.h" -#include "build/build_config.h" -#include "ui/base/ui_base_export.h" - -#if defined(OS_WIN) -namespace gfx { -class SingletonHwndObserver; -} -#endif - -namespace ui { - -class MaterialDesignControllerObserver; - -// Central controller to handle material design modes. -class UI_BASE_EXPORT MaterialDesignController { - public: - enum class TouchUiState { - kDisabled, - kAuto, - kEnabled, - }; - - class UI_BASE_EXPORT TouchUiScoperForTesting { - public: - explicit TouchUiScoperForTesting( - bool enabled, - MaterialDesignController* controller = GetInstance()); - TouchUiScoperForTesting(const TouchUiScoperForTesting&) = delete; - TouchUiScoperForTesting& operator=(const TouchUiScoperForTesting&) = delete; - ~TouchUiScoperForTesting(); - - private: - MaterialDesignController* const controller_; - const TouchUiState old_state_; - }; - - static MaterialDesignController* GetInstance(); - - explicit MaterialDesignController( - TouchUiState touch_ui_state = TouchUiState::kAuto); - MaterialDesignController(const MaterialDesignController&) = delete; - MaterialDesignController& operator=(const MaterialDesignController&) = delete; - ~MaterialDesignController(); - - bool touch_ui() const { - return (touch_ui_state_ == TouchUiState::kEnabled) || - ((touch_ui_state_ == TouchUiState::kAuto) && tablet_mode_); - } - - void OnTabletModeToggled(bool enabled); - - void AddObserver(MaterialDesignControllerObserver* observer); - void RemoveObserver(MaterialDesignControllerObserver* observer); - - private: - TouchUiState SetTouchUiState(TouchUiState touch_ui_state); - void NotifyObservers() const; - - bool tablet_mode_ = false; - TouchUiState touch_ui_state_; - -#if defined(OS_WIN) - std::unique_ptr<gfx::SingletonHwndObserver> singleton_hwnd_observer_; -#endif - - base::ObserverList<MaterialDesignControllerObserver> observers_; -}; - -} // namespace ui - -#endif // UI_BASE_MATERIAL_DESIGN_MATERIAL_DESIGN_CONTROLLER_H_
diff --git a/ui/base/material_design/material_design_controller_observer.h b/ui/base/material_design/material_design_controller_observer.h deleted file mode 100644 index 0cde0d2..0000000 --- a/ui/base/material_design/material_design_controller_observer.h +++ /dev/null
@@ -1,24 +0,0 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef UI_BASE_MATERIAL_DESIGN_MATERIAL_DESIGN_CONTROLLER_OBSERVER_H_ -#define UI_BASE_MATERIAL_DESIGN_MATERIAL_DESIGN_CONTROLLER_OBSERVER_H_ - -#include "base/observer_list_types.h" -#include "ui/base/ui_base_export.h" - -namespace ui { - -class UI_BASE_EXPORT MaterialDesignControllerObserver - : public base::CheckedObserver { - public: - virtual void OnTouchUiChanged() = 0; - - protected: - ~MaterialDesignControllerObserver() override {} -}; - -} // namespace ui - -#endif // UI_BASE_MATERIAL_DESIGN_MATERIAL_DESIGN_CONTROLLER_OBSERVER_H_
diff --git a/ui/base/material_design/material_design_controller_unittest.cc b/ui/base/material_design/material_design_controller_unittest.cc deleted file mode 100644 index 7c876ff2..0000000 --- a/ui/base/material_design/material_design_controller_unittest.cc +++ /dev/null
@@ -1,96 +0,0 @@ -// Copyright 2015 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include <string> - -#include "base/macros.h" -#include "base/scoped_observer.h" -#include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/material_design/material_design_controller.h" -#include "ui/base/material_design/material_design_controller_observer.h" - -namespace ui { - -namespace { - -class TestObserver : public MaterialDesignControllerObserver { - public: - explicit TestObserver(MaterialDesignController* controller) { - observer_.Add(controller); - } - ~TestObserver() override = default; - - int touch_ui_changes() const { return touch_ui_changes_; } - - private: - // MaterialDesignControllerObserver: - void OnTouchUiChanged() override { ++touch_ui_changes_; } - - int touch_ui_changes_ = 0; - ScopedObserver<MaterialDesignController, MaterialDesignControllerObserver> - observer_{this}; -}; - -} // namespace - -// Verifies that non-touch is the default. -TEST(MaterialDesignControllerTest, DefaultIsNonTouch) { - MaterialDesignController controller; - EXPECT_FALSE(controller.touch_ui()); -} - -// Verifies that kDisabled maps to non-touch. -TEST(MaterialDesignControllerTest, DisabledIsNonTouch) { - MaterialDesignController controller( - MaterialDesignController::TouchUiState::kDisabled); - EXPECT_FALSE(controller.touch_ui()); -} - -// Verifies that kAuto maps to non-touch (the default). -TEST(MaterialDesignControllerTest, AutoIsNonTouch) { - MaterialDesignController controller( - MaterialDesignController::TouchUiState::kAuto); - EXPECT_FALSE(controller.touch_ui()); -} - -// Verifies that kEnabled maps to touch. -TEST(MaterialDesignControllerTest, EnabledIsNonTouch) { - MaterialDesignController controller( - MaterialDesignController::TouchUiState::kEnabled); - EXPECT_TRUE(controller.touch_ui()); -} - -// Verifies that when the mode is set to non-touch and the tablet mode toggles, -// the touch UI state does not change. -TEST(MaterialDesignControllerTest, TabletToggledOnTouchUiDisabled) { - MaterialDesignController controller( - MaterialDesignController::TouchUiState::kDisabled); - TestObserver observer(&controller); - - controller.OnTabletModeToggled(true); - EXPECT_FALSE(controller.touch_ui()); - EXPECT_EQ(0, observer.touch_ui_changes()); - - controller.OnTabletModeToggled(false); - EXPECT_FALSE(controller.touch_ui()); - EXPECT_EQ(0, observer.touch_ui_changes()); -} - -// Verifies that when the mode is set to auto and the tablet mode toggles, the -// touch UI state changes and the observer gets called back. -TEST(MaterialDesignControllerTest, TabletToggledOnTouchUiAuto) { - MaterialDesignController controller( - MaterialDesignController::TouchUiState::kAuto); - TestObserver observer(&controller); - - controller.OnTabletModeToggled(true); - EXPECT_TRUE(controller.touch_ui()); - EXPECT_EQ(1, observer.touch_ui_changes()); - - controller.OnTabletModeToggled(false); - EXPECT_FALSE(controller.touch_ui()); - EXPECT_EQ(2, observer.touch_ui_changes()); -} - -} // namespace ui
diff --git a/ui/base/pointer/OWNERS b/ui/base/pointer/OWNERS index 9ff5995..c55b9d29 100644 --- a/ui/base/pointer/OWNERS +++ b/ui/base/pointer/OWNERS
@@ -1,2 +1,6 @@ sadrul@chromium.org + +per-file touch_ui_controller*=kylixrd@chromium.org +per-file touch_ui_controller*=robliao@chromium.org + # COMPONENT: Internal>Input
diff --git a/ui/base/pointer/touch_ui_controller.cc b/ui/base/pointer/touch_ui_controller.cc new file mode 100644 index 0000000..2726e03 --- /dev/null +++ b/ui/base/pointer/touch_ui_controller.cc
@@ -0,0 +1,99 @@ +// Copyright 2015 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "ui/base/pointer/touch_ui_controller.h" + +#include <string> + +#include "base/bind.h" +#include "base/command_line.h" +#include "base/message_loop/message_loop_current.h" +#include "base/no_destructor.h" +#include "ui/base/ui_base_switches.h" + +#if defined(OS_WIN) +#include "base/win/win_util.h" +#include "base/win/windows_version.h" +#include "ui/gfx/win/singleton_hwnd.h" +#include "ui/gfx/win/singleton_hwnd_observer.h" +#endif + +namespace ui { + +#if defined(OS_WIN) +namespace { + +bool IsTabletMode() { + return base::win::IsWindows10TabletMode( + gfx::SingletonHwnd::GetInstance()->hwnd()); +} + +} // namespace +#endif // defined(OS_WIN) + +TouchUiController::TouchUiScoperForTesting::TouchUiScoperForTesting( + bool enabled, + TouchUiController* controller) + : controller_(controller), + old_state_(controller_->SetTouchUiState( + enabled ? TouchUiState::kEnabled : TouchUiState::kDisabled)) {} + +TouchUiController::TouchUiScoperForTesting::~TouchUiScoperForTesting() { + controller_->SetTouchUiState(old_state_); +} + +// static +TouchUiController* TouchUiController::Get() { + static base::NoDestructor<TouchUiController> instance([] { + const std::string switch_value = + base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( + switches::kTopChromeTouchUi); + if (switch_value == switches::kTopChromeTouchUiDisabled) + return TouchUiState::kDisabled; + const bool enabled = switch_value == switches::kTopChromeTouchUiEnabled; + return enabled ? TouchUiState::kEnabled : TouchUiState::kAuto; + }()); + return instance.get(); +} + +TouchUiController::TouchUiController(TouchUiState touch_ui_state) + : touch_ui_state_(touch_ui_state) { +#if defined(OS_WIN) + if (base::MessageLoopCurrentForUI::IsSet() && + (base::win::GetVersion() >= base::win::Version::WIN10)) { + singleton_hwnd_observer_ = + std::make_unique<gfx::SingletonHwndObserver>(base::BindRepeating( + [](HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) { + if (message == WM_SETTINGCHANGE) + Get()->OnTabletModeToggled(IsTabletMode()); + })); + tablet_mode_ = IsTabletMode(); + } +#endif +} + +TouchUiController::~TouchUiController() = default; + +void TouchUiController::OnTabletModeToggled(bool enabled) { + const bool was_touch_ui = touch_ui(); + tablet_mode_ = enabled; + if (touch_ui() != was_touch_ui) + callback_list_.Notify(); +} + +std::unique_ptr<TouchUiController::Subscription> +TouchUiController::RegisterCallback(const base::RepeatingClosure& closure) { + return callback_list_.Add(closure); +} + +TouchUiController::TouchUiState TouchUiController::SetTouchUiState( + TouchUiState touch_ui_state) { + const bool was_touch_ui = touch_ui(); + const TouchUiState old_state = std::exchange(touch_ui_state_, touch_ui_state); + if (touch_ui() != was_touch_ui) + callback_list_.Notify(); + return old_state; +} + +} // namespace ui
diff --git a/ui/base/pointer/touch_ui_controller.h b/ui/base/pointer/touch_ui_controller.h new file mode 100644 index 0000000..cecd4ddc --- /dev/null +++ b/ui/base/pointer/touch_ui_controller.h
@@ -0,0 +1,79 @@ +// Copyright 2015 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef UI_BASE_POINTER_TOUCH_UI_CONTROLLER_H_ +#define UI_BASE_POINTER_TOUCH_UI_CONTROLLER_H_ + +#include <string> + +#include "base/callback_list.h" +#include "build/build_config.h" +#include "ui/base/ui_base_export.h" + +#if defined(OS_WIN) +namespace gfx { +class SingletonHwndObserver; +} +#endif + +namespace ui { + +// Central controller to handle touch UI modes. +class UI_BASE_EXPORT TouchUiController { + public: + using CallbackList = base::CallbackList<void()>; + using Subscription = CallbackList::Subscription; + + enum class TouchUiState { + kDisabled, + kAuto, + kEnabled, + }; + + class UI_BASE_EXPORT TouchUiScoperForTesting { + public: + explicit TouchUiScoperForTesting(bool enabled, + TouchUiController* controller = Get()); + TouchUiScoperForTesting(const TouchUiScoperForTesting&) = delete; + TouchUiScoperForTesting& operator=(const TouchUiScoperForTesting&) = delete; + ~TouchUiScoperForTesting(); + + private: + TouchUiController* const controller_; + const TouchUiState old_state_; + }; + + static TouchUiController* Get(); + + explicit TouchUiController(TouchUiState touch_ui_state = TouchUiState::kAuto); + TouchUiController(const TouchUiController&) = delete; + TouchUiController& operator=(const TouchUiController&) = delete; + ~TouchUiController(); + + bool touch_ui() const { + return (touch_ui_state_ == TouchUiState::kEnabled) || + ((touch_ui_state_ == TouchUiState::kAuto) && tablet_mode_); + } + + std::unique_ptr<Subscription> RegisterCallback( + const base::RepeatingClosure& closure); + + void OnTabletModeToggled(bool enabled); + + private: + TouchUiState SetTouchUiState(TouchUiState touch_ui_state); + + bool tablet_mode_ = false; + TouchUiState touch_ui_state_; + +#if defined(OS_WIN) + std::unique_ptr<gfx::SingletonHwndObserver> singleton_hwnd_observer_; +#endif + + CallbackList callback_list_; +}; + +} // namespace ui + +#endif // UI_BASE_POINTER_TOUCH_UI_CONTROLLER_H_
diff --git a/ui/base/pointer/touch_ui_controller_unittest.cc b/ui/base/pointer/touch_ui_controller_unittest.cc new file mode 100644 index 0000000..1cfa4b8 --- /dev/null +++ b/ui/base/pointer/touch_ui_controller_unittest.cc
@@ -0,0 +1,87 @@ +// Copyright 2015 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include <string> + +#include "base/macros.h" +#include "base/scoped_observer.h" +#include "base/test/bind_test_util.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/pointer/touch_ui_controller.h" + +namespace ui { + +namespace { + +class TestObserver { + public: + explicit TestObserver(TouchUiController* controller) + : subscription_(controller->RegisterCallback( + base::BindLambdaForTesting([this]() { ++touch_ui_changes_; }))) {} + ~TestObserver() = default; + + int touch_ui_changes() const { return touch_ui_changes_; } + + private: + int touch_ui_changes_ = 0; + std::unique_ptr<ui::TouchUiController::Subscription> subscription_; +}; + +} // namespace + +// Verifies that non-touch is the default. +TEST(TouchUiControllerTest, DefaultIsNonTouch) { + TouchUiController controller; + EXPECT_FALSE(controller.touch_ui()); +} + +// Verifies that kDisabled maps to non-touch. +TEST(TouchUiControllerTest, DisabledIsNonTouch) { + TouchUiController controller(TouchUiController::TouchUiState::kDisabled); + EXPECT_FALSE(controller.touch_ui()); +} + +// Verifies that kAuto maps to non-touch (the default). +TEST(TouchUiControllerTest, AutoIsNonTouch) { + TouchUiController controller(TouchUiController::TouchUiState::kAuto); + EXPECT_FALSE(controller.touch_ui()); +} + +// Verifies that kEnabled maps to touch. +TEST(TouchUiControllerTest, EnabledIsNonTouch) { + TouchUiController controller(TouchUiController::TouchUiState::kEnabled); + EXPECT_TRUE(controller.touch_ui()); +} + +// Verifies that when the mode is set to non-touch and the tablet mode toggles, +// the touch UI state does not change. +TEST(TouchUiControllerTest, TabletToggledOnTouchUiDisabled) { + TouchUiController controller(TouchUiController::TouchUiState::kDisabled); + TestObserver observer(&controller); + + controller.OnTabletModeToggled(true); + EXPECT_FALSE(controller.touch_ui()); + EXPECT_EQ(0, observer.touch_ui_changes()); + + controller.OnTabletModeToggled(false); + EXPECT_FALSE(controller.touch_ui()); + EXPECT_EQ(0, observer.touch_ui_changes()); +} + +// Verifies that when the mode is set to auto and the tablet mode toggles, the +// touch UI state changes and the observer gets called back. +TEST(TouchUiControllerTest, TabletToggledOnTouchUiAuto) { + TouchUiController controller(TouchUiController::TouchUiState::kAuto); + TestObserver observer(&controller); + + controller.OnTabletModeToggled(true); + EXPECT_TRUE(controller.touch_ui()); + EXPECT_EQ(1, observer.touch_ui_changes()); + + controller.OnTabletModeToggled(false); + EXPECT_FALSE(controller.touch_ui()); + EXPECT_EQ(2, observer.touch_ui_changes()); +} + +} // namespace ui
diff --git a/ui/chromeos/file_manager_strings.grdp b/ui/chromeos/file_manager_strings.grdp index 74ce683..26728d1 100644 --- a/ui/chromeos/file_manager_strings.grdp +++ b/ui/chromeos/file_manager_strings.grdp
@@ -1405,6 +1405,9 @@ <message name="IDS_FILE_BROWSER_GRID_VIEW_FILES_TITLE" desc="Title dislayed in Grid View above the files."> Files </message> + <message name="IDS_FILE_BROWSER_LOCATION_BREADCRUMB_ELIDER_BUTTON_LABEL" desc="Label for the breadcrumb sub-folder elider button in the Files app folder location line."> + More sub-folders... + </message> <!-- Common for Audio player and Media player --> <message name="IDS_MEDIA_PLAYER_PLAY_BUTTON_LABEL" desc="Label for the Play button of media players (audio player / video player).">
diff --git a/ui/chromeos/file_manager_strings_grdp/IDS_FILE_BROWSER_LOCATION_BREADCRUMB_ELIDER_BUTTON_LABEL.png.sha1 b/ui/chromeos/file_manager_strings_grdp/IDS_FILE_BROWSER_LOCATION_BREADCRUMB_ELIDER_BUTTON_LABEL.png.sha1 new file mode 100644 index 0000000..b2a5762 --- /dev/null +++ b/ui/chromeos/file_manager_strings_grdp/IDS_FILE_BROWSER_LOCATION_BREADCRUMB_ELIDER_BUTTON_LABEL.png.sha1
@@ -0,0 +1 @@ +e9365c70d882e8106aa7ce8199588c4b42b1a1ba \ No newline at end of file
diff --git a/ui/compositor/overscroll/scroll_input_handler.cc b/ui/compositor/overscroll/scroll_input_handler.cc index f1965d2..f6c9067d 100644 --- a/ui/compositor/overscroll/scroll_input_handler.cc +++ b/ui/compositor/overscroll/scroll_input_handler.cc
@@ -4,6 +4,7 @@ #include "ui/compositor/overscroll/scroll_input_handler.h" +#include "cc/input/scroll_input_type.h" #include "ui/compositor/layer.h" #include "ui/events/event.h" @@ -65,7 +66,7 @@ // Note: the WHEEL type covers both actual wheels as well as trackpad // scrolling. input_handler_weak_ptr_->ScrollBegin(&scroll_state_begin, - cc::InputHandler::WHEEL); + cc::ScrollInputType::kWheel); cc::ScrollState scroll_state = CreateScrollState(event, false); input_handler_weak_ptr_->ScrollUpdate(&scroll_state, base::TimeDelta());
diff --git a/ui/events/blink/DEPS b/ui/events/blink/DEPS index 0a508d0..c993feb 100644 --- a/ui/events/blink/DEPS +++ b/ui/events/blink/DEPS
@@ -3,6 +3,7 @@ "+cc/input/main_thread_scrolling_reason.h", "+cc/input/overscroll_behavior.h", "+cc/input/scroll_elasticity_helper.h", + "+cc/input/scroll_input_type.h", "+cc/input/snap_fling_controller.h", "+cc/trees/swap_promise_monitor.h",
diff --git a/ui/events/blink/input_handler_proxy.cc b/ui/events/blink/input_handler_proxy.cc index 0ba5c5b1..6c624e5 100644 --- a/ui/events/blink/input_handler_proxy.cc +++ b/ui/events/blink/input_handler_proxy.cc
@@ -22,6 +22,7 @@ #include "base/trace_event/trace_event.h" #include "build/build_config.h" #include "cc/input/main_thread_scrolling_reason.h" +#include "cc/input/scroll_input_type.h" #include "services/tracing/public/cpp/perfetto/flow_event_utils.h" #include "services/tracing/public/cpp/perfetto/macros.h" #include "third_party/blink/public/common/input/web_input_event.h" @@ -101,22 +102,21 @@ return cc::ScrollState(scroll_state_data); } -cc::InputHandler::ScrollInputType GestureScrollInputType( - blink::WebGestureDevice device) { +cc::ScrollInputType GestureScrollInputType(blink::WebGestureDevice device) { switch (device) { case blink::WebGestureDevice::kTouchpad: - return cc::InputHandler::WHEEL; + return cc::ScrollInputType::kWheel; case blink::WebGestureDevice::kTouchscreen: - return cc::InputHandler::TOUCHSCREEN; + return cc::ScrollInputType::kTouchscreen; case blink::WebGestureDevice::kSyntheticAutoscroll: - return cc::InputHandler::AUTOSCROLL; + return cc::ScrollInputType::kAutoscroll; case blink::WebGestureDevice::kScrollbar: - return cc::InputHandler::SCROLLBAR; + return cc::ScrollInputType::kScrollbar; case blink::WebGestureDevice::kUninitialized: break; } NOTREACHED(); - return cc::InputHandler::SCROLL_INPUT_UNKNOWN; + return cc::ScrollInputType::kUnknown; } cc::SnapFlingController::GestureScrollType GestureScrollEventType(
diff --git a/ui/events/blink/input_handler_proxy_unittest.cc b/ui/events/blink/input_handler_proxy_unittest.cc index c0f1958e1..670f8c9b 100644 --- a/ui/events/blink/input_handler_proxy_unittest.cc +++ b/ui/events/blink/input_handler_proxy_unittest.cc
@@ -18,6 +18,7 @@ #include "base/test/trace_event_analyzer.h" #include "build/build_config.h" #include "cc/input/main_thread_scrolling_reason.h" +#include "cc/input/scroll_input_type.h" #include "cc/trees/swap_promise_monitor.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -111,11 +112,9 @@ MOCK_METHOD0(SetNeedsAnimateInput, void()); MOCK_METHOD2(ScrollBegin, - ScrollStatus(cc::ScrollState*, - cc::InputHandler::ScrollInputType type)); + ScrollStatus(cc::ScrollState*, cc::ScrollInputType type)); MOCK_METHOD2(RootScrollBegin, - ScrollStatus(cc::ScrollState*, - cc::InputHandler::ScrollInputType type)); + ScrollStatus(cc::ScrollState*, cc::ScrollInputType type)); MOCK_METHOD2(ScrollUpdate, cc::InputHandlerScrollResult(cc::ScrollState*, base::TimeDelta)); MOCK_METHOD1(ScrollEnd, void(bool));
diff --git a/ui/file_manager/file_manager/foreground/js/ui/banners.js b/ui/file_manager/file_manager/foreground/js/ui/banners.js index d83d020..f5214fa0 100644 --- a/ui/file_manager/file_manager/foreground/js/ui/banners.js +++ b/ui/file_manager/file_manager/foreground/js/ui/banners.js
@@ -216,7 +216,7 @@ const close = util.createChild(wrapper, 'banner-close', 'button'); close.setAttribute('aria-label', str('DRIVE_WELCOME_DISMISS')); close.id = 'welcome-dismiss'; - close.tabIndex = 22; + close.tabIndex = 0; close.addEventListener('click', this.closeWelcomeBanner_.bind(this)); const message = util.createChild(wrapper, 'drive-welcome-message'); @@ -232,7 +232,7 @@ const more = util.createChild(links, 'plain-link', 'a'); more.textContent = str('DRIVE_LEARN_MORE'); more.href = str('GOOGLE_DRIVE_OVERVIEW_URL'); - more.tabIndex = 21; // See: go/filesapp-tabindex. + more.tabIndex = 0; more.id = 'drive-welcome-link'; more.target = '_blank';
diff --git a/ui/file_manager/file_manager/foreground/js/ui/breadcrumb.js b/ui/file_manager/file_manager/foreground/js/ui/breadcrumb.js index 038c59a..b40ed34 100644 --- a/ui/file_manager/file_manager/foreground/js/ui/breadcrumb.js +++ b/ui/file_manager/file_manager/foreground/js/ui/breadcrumb.js
@@ -142,7 +142,8 @@ <button id='first'></button> <span class='caret' hidden></span> - <button elider aria-haspopup='menu' aria-expanded='false'> + <button elider aria-haspopup='menu' aria-expanded='false' + aria-label='$i18n{LOCATION_BREADCRUMB_ELIDER_BUTTON_LABEL}'> <span elider></span> </button> <span class='caret' hidden></span> @@ -392,7 +393,8 @@ // Show drop-down below the elider button. const menu = this.shadowRoot.querySelector('cr-action-menu'); - menu.showAt(elider, {top: elider.offsetTop + elider.offsetHeight}); + const top = elider.offsetTop + elider.offsetHeight + 4; + menu.showAt(elider, {top: top}); // Style drop-down and horizontal position. const dialog = menu.getDialog();
diff --git a/ui/file_manager/file_manager/foreground/js/ui/file_table.js b/ui/file_manager/file_manager/foreground/js/ui/file_table.js index bd93767..c9e5d08 100644 --- a/ui/file_manager/file_manager/foreground/js/ui/file_table.js +++ b/ui/file_manager/file_manager/foreground/js/ui/file_table.js
@@ -16,7 +16,7 @@ this.snapshot_ = null; if (util.isFilesNg()) { - FileTableColumnModel.MIN_WIDTH_ = 24; + FileTableColumnModel.MIN_WIDTH_ = 40; } }
diff --git a/ui/file_manager/file_manager/foreground/js/ui/search_box.js b/ui/file_manager/file_manager/foreground/js/ui/search_box.js index d074f02..5bad824 100644 --- a/ui/file_manager/file_manager/foreground/js/ui/search_box.js +++ b/ui/file_manager/file_manager/foreground/js/ui/search_box.js
@@ -211,9 +211,9 @@ this.element.classList.toggle('has-text', hasText); const hasFocusOnInput = this.element.classList.contains('has-cursor'); - // See go/filesapp-tabindex for tabindexes. - this.inputElement.tabIndex = (hasText || hasFocusOnInput) ? 14 : -1; - this.searchButton.tabIndex = (hasText || hasFocusOnInput) ? -1 : 13; + // Focus either the search button or the input. + this.inputElement.tabIndex = (hasText || hasFocusOnInput) ? 0 : -1; + this.searchButton.tabIndex = (hasText || hasFocusOnInput) ? -1 : 0; } /**
diff --git a/ui/file_manager/file_manager/main.html b/ui/file_manager/file_manager/main.html index 53006def..3741a7cff 100644 --- a/ui/file_manager/file_manager/main.html +++ b/ui/file_manager/file_manager/main.html
@@ -344,7 +344,7 @@ <span id="read-only-label">$i18n{READ_ONLY_LABEL}</span> </div> <div id="cancel-selection-button-wrapper"> - <cr-button id="cancel-selection-button" class="menu-button" tabindex="8" + <cr-button id="cancel-selection-button" class="menu-button" tabindex="0" aria-label="$i18n{CANCEL_SELECTION_BUTTON_LABEL}" has-tooltip> <span class="icon-arrow-back"></span> <span id="cancel-selection-label">$i18n{CANCEL_SELECTION_BUTTON_LABEL}</span> @@ -354,10 +354,10 @@ <div class="spacer"></div> <div id="action-bar"> <cr-button id="tasks" class="combobutton menu-button" menu="#tasks-menu" - tabindex="10" hidden + tabindex="0" hidden aria-label="$i18n{TASKS_BUTTON_LABEL}"> </cr-button> - <cr-button id="share-menu-button" class="icon-button menu-button" tabindex="11" hidden + <cr-button id="share-menu-button" class="icon-button menu-button" tabindex="0" hidden menu="#share-menu" aria-label="$i18n{SHARE_BUTTON_TOOLTIP}" aria-activedescendant="share-menu" @@ -365,7 +365,7 @@ <files-toggle-ripple></files-toggle-ripple> <div class="icon"></div> </cr-button> - <cr-button id="delete-button" class="icon-button menu-button" tabindex="12" hidden + <cr-button id="delete-button" class="icon-button menu-button" tabindex="0" hidden aria-label="$i18n{DELETE_BUTTON_LABEL}" visibleif="full-page" has-tooltip> @@ -373,23 +373,23 @@ <div class="icon"></div> </cr-button> <div id="search-wrapper"> - <cr-button id="search-button" class="icon-button menu-button" tabindex="13" + <cr-button id="search-button" class="icon-button menu-button" tabindex="0" aria-label="$i18n{SEARCH_TEXT_LABEL}" has-tooltip> <files-toggle-ripple></files-toggle-ripple> <div class="icon"></div> </cr-button> <div id="search-box"> - <cr-input type="search" tabindex="14" disabled + <cr-input type="search" tabindex="0" disabled aria-label="$i18n{SEARCH_TEXT_LABEL}" placeholder="$i18n{SEARCH_TEXT_LABEL}"> - <cr-button class="clear" slot="suffix" tabindex="14" + <cr-button class="clear" slot="suffix" tabindex="0" aria-label="$i18n{SEARCH_CLEAR_LABEL}" has-tooltip> <div class="icon"></div> </cr-button> </cr-input> </div> </div> - <cr-button id="refresh-button" class="icon-button menu-button" tabindex="15" hidden + <cr-button id="refresh-button" class="icon-button menu-button" tabindex="0" hidden aria-label="$i18n{REFRESH_BUTTON_LABEL}" command="#refresh" has-tooltip> <files-ripple></files-ripple> @@ -401,14 +401,14 @@ <div class="buttons"> <cr-button id="cloud-import-button" class="icon-button menu-button" - tabindex="16" + tabindex="0" aria-label="$i18n{CLOUD_IMPORT_COMMAND}" has-tooltip> <iron-icon icon="files:cloud-queue"></iron-icon> </cr-button> <cr-button id="cloud-import-details-button" class="icon-button menu-button" - tabindex="16" + tabindex="0" aria-label="$i18n{CLOUD_IMPORT_SHOW_DETAILS}" has-tooltip> <iron-icon icon="files:arrow-drop-down"></iron-icon> @@ -419,13 +419,13 @@ <files-toggle-ripple></files-toggle-ripple> </div> </div> - <cr-button id="view-button" class="icon-button menu-button" tabindex="17" + <cr-button id="view-button" class="icon-button menu-button" tabindex="0" aria-label="$i18n{CHANGE_TO_THUMBNAILVIEW_BUTTON_LABEL}" has-tooltip> <files-ripple></files-ripple> <div class="icon"></div> </cr-button> - <cr-button id="sort-button" class="icon-button menu-button" tabindex="18" + <cr-button id="sort-button" class="icon-button menu-button" tabindex="0" menu="#sort-menu" aria-haspopup="true" aria-label="$i18n{SORT_BUTTON_TOOLTIP}" @@ -434,7 +434,7 @@ <files-toggle-ripple></files-toggle-ripple> <div class="icon"></div> </cr-button> - <cr-button id="gear-button" class="icon-button menu-button" tabindex="19" + <cr-button id="gear-button" class="icon-button menu-button" tabindex="0" menu="#gear-menu" aria-label="$i18n{GEAR_BUTTON_TOOLTIP}" aria-haspopup="true" @@ -443,7 +443,7 @@ <files-toggle-ripple></files-toggle-ripple> <div class="icon"></div> </cr-button> - <cr-button id="selection-menu-button" class="icon-button menu-button" tabindex="19" + <cr-button id="selection-menu-button" class="icon-button menu-button" tabindex="0" menu="#file-context-menu" aria-label="$i18n{SELECTION_MENU_BUTTON_TOOLTIP}" aria-activedescendant="file-context-menu" @@ -465,10 +465,10 @@ <div class="content"></div> </div> <div class="progress"><div class="value"></div></div> - <cr-button class="import" tabindex="16"> + <cr-button class="import" tabindex="0"> <span>$i18n{CLOUD_IMPORT_COMMAND}</span> </cr-button> - <cr-button class="cancel" tabindex="16"> + <cr-button class="cancel" tabindex="0"> <span>$i18n{CLOUD_IMPORT_CANCEL_COMMAND}</span> </cr-button> </div> @@ -477,7 +477,7 @@ <div class="dialog-container"> <div class="dialog-navigation-list"> <div class="dialog-navigation-list-contents" role="navigation"> - <tree id="directory-tree" role="tree" tabindex="21" files-ng></tree> + <tree id="directory-tree" role="tree" tabindex="0" files-ng></tree> </div> <div class="dialog-navigation-list-footer" hidden> <div id="progress-center" hidden> @@ -527,9 +527,9 @@ <div class="image"></div> <span id="empty-folder-label" class="label">$i18n{EMPTY_FOLDER}</span> </div> - <div class="detail-table" id="detail-table" tabindex="1"> + <div class="detail-table" id="detail-table" tabindex="0"> </div> - <grid class="thumbnail-grid" tabindex="2" hidden></grid> + <grid class="thumbnail-grid" tabindex="0" hidden></grid> <paper-progress class="loading-indicator" indeterminate hidden></paper-progress> <div class="drive-welcome page"></div> </div> @@ -553,13 +553,13 @@ <div class="left"> <!-- TODO(fukino): Turn this button into paper-button when the CommandButton supports paper-button. --> <button id="new-folder-button" class="primary" - visibleif="saveas-file folder" tabindex="3" disabled> + visibleif="saveas-file folder" tabindex="0" disabled> <paper-ripple fit></paper-ripple> <span>$i18n{NEW_FOLDER_BUTTON_LABEL}</span> </button> - <select class="file-type" hidden tabindex="4"></select> + <select class="file-type" hidden tabindex="0"></select> <div id="filename-input-box" visibleif="saveas-file"> - <cr-input id="filename-input-textbox" tabindex="5" class="entry-name" + <cr-input id="filename-input-textbox" tabindex="0" class="entry-name" type="text" spellcheck="false" placeholder="$i18n{FILENAME_LABEL}"></cr-input> </div> @@ -567,11 +567,11 @@ <div class="progress-bar"><div class="progress-track"></div></div> </div> <div class="right buttonbar"> - <button id="cancel-button" class="cancel secondary" tabindex="6"> + <button id="cancel-button" class="cancel secondary" tabindex="0"> <paper-ripple fit></paper-ripple> <span>$i18n{CANCEL_LABEL}</span> </button> - <button id="ok-button" class="ok primary" disabled tabindex="7"> + <button id="ok-button" class="ok primary" disabled tabindex="0"> <paper-ripple fit></paper-ripple> <span></span> </button>
diff --git a/ui/file_manager/integration_tests/file_manager/tab_index.js b/ui/file_manager/integration_tests/file_manager/tab_index.js index 3a8a40915..fae2c2f 100644 --- a/ui/file_manager/integration_tests/file_manager/tab_index.js +++ b/ui/file_manager/integration_tests/file_manager/tab_index.js
@@ -26,9 +26,9 @@ 'fakeKeyDown', appId, ['#search-box cr-input', 'Escape', false, false, false])); - // Check that the file list has the focus. + // Check that the focus moves to the next button: #view-button. chrome.test.assertTrue( - await remoteCall.checkNextTabFocus(appId, 'file-list')); + await remoteCall.checkNextTabFocus(appId, 'view-button')); }; /** @@ -46,22 +46,41 @@ chrome.test.assertEq('list', element.attributes['class']); // Send Tab key events to cycle through the tabable elements. - chrome.test.assertTrue( - await remoteCall.checkNextTabFocus(appId, 'search-button')); - chrome.test.assertTrue( - await remoteCall.checkNextTabFocus(appId, 'view-button')); - chrome.test.assertTrue( - await remoteCall.checkNextTabFocus(appId, 'sort-button')); - chrome.test.assertTrue( - await remoteCall.checkNextTabFocus(appId, 'gear-button')); - chrome.test.assertTrue( - await remoteCall.checkNextTabFocus(appId, 'directory-tree')); - chrome.test.assertTrue( - await remoteCall.checkNextTabFocus(appId, 'drive-welcome-link')); - chrome.test.assertTrue( - await remoteCall.checkNextTabFocus(appId, 'welcome-dismiss')); - chrome.test.assertTrue( - await remoteCall.checkNextTabFocus(appId, 'file-list')); + if (await isFilesNg(appId)) { + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'directory-tree')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'search-button')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'view-button')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'sort-button')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'gear-button')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'welcome-dismiss')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'drive-welcome-link')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'file-list')); + } else { + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'search-button')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'view-button')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'sort-button')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'gear-button')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'directory-tree')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'welcome-dismiss')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'drive-welcome-link')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'file-list')); + } }; /** @@ -79,20 +98,37 @@ chrome.test.assertEq('list', element.attributes['class']); // Send Tab key events to cycle through the tabable elements. - chrome.test.assertTrue( - await remoteCall.checkNextTabFocus(appId, 'breadcrumb-path-0')); - chrome.test.assertTrue( - await remoteCall.checkNextTabFocus(appId, 'search-button')); - chrome.test.assertTrue( - await remoteCall.checkNextTabFocus(appId, 'view-button')); - chrome.test.assertTrue( - await remoteCall.checkNextTabFocus(appId, 'sort-button')); - chrome.test.assertTrue( - await remoteCall.checkNextTabFocus(appId, 'gear-button')); - chrome.test.assertTrue( - await remoteCall.checkNextTabFocus(appId, 'directory-tree')); - chrome.test.assertTrue( - await remoteCall.checkNextTabFocus(appId, 'file-list')); + if (await isFilesNg(appId)) { + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'directory-tree')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'breadcrumbs')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'search-button')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'view-button')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'sort-button')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'gear-button')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'file-list')); + } else { + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'breadcrumb-path-0')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'search-button')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'view-button')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'sort-button')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'gear-button')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'directory-tree')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'file-list')); + } }; /** @@ -148,26 +184,49 @@ ]); // Send Tab key events to cycle through the tabable elements. - chrome.test.assertTrue( - await remoteCall.checkNextTabFocus(appId, 'share-menu-button')); - chrome.test.assertTrue( - await remoteCall.checkNextTabFocus(appId, 'delete-button')); - chrome.test.assertTrue( - await remoteCall.checkNextTabFocus(appId, 'search-button')); - chrome.test.assertTrue( - await remoteCall.checkNextTabFocus(appId, 'view-button')); - chrome.test.assertTrue( - await remoteCall.checkNextTabFocus(appId, 'sort-button')); - chrome.test.assertTrue( - await remoteCall.checkNextTabFocus(appId, 'gear-button')); - chrome.test.assertTrue( - await remoteCall.checkNextTabFocus(appId, 'directory-tree')); - chrome.test.assertTrue( - await remoteCall.checkNextTabFocus(appId, 'drive-welcome-link')); - chrome.test.assertTrue( - await remoteCall.checkNextTabFocus(appId, 'welcome-dismiss')); - chrome.test.assertTrue( - await remoteCall.checkNextTabFocus(appId, 'file-list')); + if (await isFilesNg(appId)) { + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'directory-tree')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'share-menu-button')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'delete-button')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'search-button')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'view-button')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'sort-button')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'gear-button')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'welcome-dismiss')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'drive-welcome-link')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'file-list')); + } else { + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'share-menu-button')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'delete-button')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'search-button')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'view-button')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'sort-button')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'gear-button')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'directory-tree')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'welcome-dismiss')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'drive-welcome-link')); + chrome.test.assertTrue( + await remoteCall.checkNextTabFocus(appId, 'file-list')); + } }; /** @@ -203,6 +262,9 @@ await remoteCall.waitForElement(appId, ['#file-list:focus']); } + // Wait for Files app to finish loading. + await remoteCall.waitFor('isFileManagerLoaded', appId, true); + if (initialize) { await initialize(appId); } @@ -229,6 +291,22 @@ /** * Tests the tab focus behavior of Open Dialog (Downloads). */ +testcase.tabindexOpenDialogDownloadsFilesNg = async () => { + return tabindexFocus( + {type: 'openFile'}, 'downloads', BASIC_LOCAL_ENTRY_SET, + async (appId) => { + await remoteCall.callRemoteTestUtil('selectFile', appId, ['hello.txt']); + }, + ['#ok-button:not([disabled])'], [ + 'cancel-button', 'ok-button', 'directory-tree', + /* first breadcrumb */ 'first', 'search-button', 'view-button', + 'sort-button', 'gear-button', 'file-list' + ]); +}; + +/** + * Tests the tab focus behavior of Open Dialog (Downloads). + */ testcase.tabindexOpenDialogDownloads = async () => { return tabindexFocus( {type: 'openFile'}, 'downloads', BASIC_LOCAL_ENTRY_SET, @@ -260,6 +338,24 @@ /** * Tests the tab focus behavior of Save File Dialog (Downloads). */ +testcase.tabindexSaveFileDialogDownloadsFilesNg = async () => { + return tabindexFocus( + { + type: 'saveFile', + suggestedName: 'hoge.txt' // Prevent showing a override prompt + }, + 'downloads', BASIC_LOCAL_ENTRY_SET, null, ['#ok-button:not([disabled])'], + [ + 'cancel-button', 'ok-button', 'directory-tree', + /* first breadcrumb */ 'first', 'search-button', 'view-button', + 'sort-button', 'gear-button', 'file-list', 'new-folder-button', + 'filename-input-textbox' + ]); +}; + +/** + * Tests the tab focus behavior of Save File Dialog (Downloads). + */ testcase.tabindexSaveFileDialogDownloads = async () => { return tabindexFocus( { @@ -277,6 +373,22 @@ /** * Tests the tab focus behavior of Save File Dialog (Drive). */ +testcase.tabindexSaveFileDialogDriveFilesNg = async () => { + return tabindexFocus( + { + type: 'saveFile', + suggestedName: 'hoge.txt' // Prevent showing a override prompt + }, + 'drive', BASIC_DRIVE_ENTRY_SET, null, ['#ok-button:not([disabled])'], [ + 'cancel-button', 'ok-button', 'directory-tree', 'search-button', + 'view-button', 'sort-button', 'gear-button', 'file-list', + 'new-folder-button', 'filename-input-textbox' + ]); +}; + +/** + * Tests the tab focus behavior of Save File Dialog (Drive). + */ testcase.tabindexSaveFileDialogDrive = async () => { return tabindexFocus( {
diff --git a/ui/file_manager/integration_tests/remote_call.js b/ui/file_manager/integration_tests/remote_call.js index 056a27f..8644a7d1 100644 --- a/ui/file_manager/integration_tests/remote_call.js +++ b/ui/file_manager/integration_tests/remote_call.js
@@ -503,11 +503,17 @@ const caller = getCaller(); return repeatUntil(async () => { - const element = + let element = await this.callRemoteTestUtil('getActiveElement', appId, []); if (element && element.attributes['id'] === elementId) { return true; } + // Try to check the shadow root. + element = + await this.callRemoteTestUtil('deepGetActiveElement', appId, []); + if (element && element.attributes['id'] === elementId) { + return true; + } return pending( caller, 'Waiting for active element with id: "' + elementId +
diff --git a/ui/views/bubble/bubble_dialog_delegate_view.cc b/ui/views/bubble/bubble_dialog_delegate_view.cc index 528ca9d..191066e2 100644 --- a/ui/views/bubble/bubble_dialog_delegate_view.cc +++ b/ui/views/bubble/bubble_dialog_delegate_view.cc
@@ -437,6 +437,7 @@ } void BubbleDialogDelegateView::OnThemeChanged() { + DialogDelegateView::OnThemeChanged(); UpdateColorsFromTheme(); }
diff --git a/ui/views/bubble/bubble_frame_view.cc b/ui/views/bubble/bubble_frame_view.cc index 70145cfe..2809978 100644 --- a/ui/views/bubble/bubble_frame_view.cc +++ b/ui/views/bubble/bubble_frame_view.cc
@@ -413,6 +413,7 @@ } void BubbleFrameView::OnThemeChanged() { + NonClientFrameView::OnThemeChanged(); UpdateWindowTitle(); ResetWindowControls(); UpdateWindowIcon();
diff --git a/ui/views/controls/button/label_button.cc b/ui/views/controls/button/label_button.cc index c394a883..76864b9 100644 --- a/ui/views/controls/button/label_button.cc +++ b/ui/views/controls/button/label_button.cc
@@ -468,6 +468,7 @@ } void LabelButton::OnThemeChanged() { + Button::OnThemeChanged(); ResetColorsFromNativeTheme(); UpdateThemedBorder(); ResetLabelEnabledColor();
diff --git a/ui/views/controls/button/toggle_button.cc b/ui/views/controls/button/toggle_button.cc index 39620c62..2189d20f 100644 --- a/ui/views/controls/button/toggle_button.cc +++ b/ui/views/controls/button/toggle_button.cc
@@ -252,6 +252,7 @@ } void ToggleButton::OnThemeChanged() { + Button::OnThemeChanged(); SchedulePaint(); }
diff --git a/ui/views/controls/combobox/combobox.cc b/ui/views/controls/combobox/combobox.cc index fc6c2cf..99617cf 100644 --- a/ui/views/controls/combobox/combobox.cc +++ b/ui/views/controls/combobox/combobox.cc
@@ -305,6 +305,7 @@ } void Combobox::OnThemeChanged() { + View::OnThemeChanged(); SetBackground( CreateBackgroundFromPainter(Painter::CreateSolidRoundRectPainter( GetNativeTheme()->GetSystemColor(
diff --git a/ui/views/controls/editable_combobox/editable_combobox.cc b/ui/views/controls/editable_combobox/editable_combobox.cc index 20c78c3..8a0fef0 100644 --- a/ui/views/controls/editable_combobox/editable_combobox.cc +++ b/ui/views/controls/editable_combobox/editable_combobox.cc
@@ -410,6 +410,7 @@ } void EditableCombobox::OnThemeChanged() { + View::OnThemeChanged(); textfield_->OnThemeChanged(); }
diff --git a/ui/views/controls/label.cc b/ui/views/controls/label.cc index 59639cba0..c15c27a 100644 --- a/ui/views/controls/label.cc +++ b/ui/views/controls/label.cc
@@ -650,6 +650,7 @@ } void Label::OnThemeChanged() { + View::OnThemeChanged(); UpdateColorsFromTheme(); }
diff --git a/ui/views/controls/menu/menu_runner_impl_cocoa.mm b/ui/views/controls/menu/menu_runner_impl_cocoa.mm index 6fd7ab74..29c6ad4 100644 --- a/ui/views/controls/menu/menu_runner_impl_cocoa.mm +++ b/ui/views/controls/menu/menu_runner_impl_cocoa.mm
@@ -141,7 +141,6 @@ on_menu_closed_callback_(std::move(on_menu_closed_callback)) { menu_controller_.reset([[MenuControllerCocoa alloc] initWithModel:menu useWithPopUpButtonCell:NO]); - [menu_controller_ setPostItemSelectedAsTask:YES]; } bool MenuRunnerImplCocoa::IsRunning() const {
diff --git a/ui/views/controls/menu/menu_scroll_view_container.cc b/ui/views/controls/menu/menu_scroll_view_container.cc index f58524f..a1d302f 100644 --- a/ui/views/controls/menu/menu_scroll_view_container.cc +++ b/ui/views/controls/menu/menu_scroll_view_container.cc
@@ -221,6 +221,7 @@ } void MenuScrollViewContainer::OnThemeChanged() { + View::OnThemeChanged(); if (!HasBubbleBorder()) CreateDefaultBorder(); }
diff --git a/ui/views/controls/scroll_view.cc b/ui/views/controls/scroll_view.cc index 1c477e2..b9f7baf2 100644 --- a/ui/views/controls/scroll_view.cc +++ b/ui/views/controls/scroll_view.cc
@@ -633,6 +633,7 @@ } void ScrollView::OnThemeChanged() { + View::OnThemeChanged(); UpdateBorder(); if (background_color_id_) UpdateBackground();
diff --git a/ui/views/controls/table/table_header.cc b/ui/views/controls/table/table_header.cc index e7b2471..cc72fdb 100644 --- a/ui/views/controls/table/table_header.cc +++ b/ui/views/controls/table/table_header.cc
@@ -228,6 +228,7 @@ } void TableHeader::OnThemeChanged() { + View::OnThemeChanged(); SetBackground(CreateSolidBackground(GetNativeTheme()->GetSystemColor( ui::NativeTheme::kColorId_TableHeaderBackground))); }
diff --git a/ui/views/controls/textfield/textfield.cc b/ui/views/controls/textfield/textfield.cc index 18dcbebd..a240889 100644 --- a/ui/views/controls/textfield/textfield.cc +++ b/ui/views/controls/textfield/textfield.cc
@@ -1192,6 +1192,7 @@ } void Textfield::OnThemeChanged() { + View::OnThemeChanged(); gfx::RenderText* render_text = GetRenderText(); SetColor(GetTextColor()); UpdateBackgroundColor();
diff --git a/ui/views/layout/layout_provider.cc b/ui/views/layout/layout_provider.cc index 0f149250..712aa76c 100644 --- a/ui/views/layout/layout_provider.cc +++ b/ui/views/layout/layout_provider.cc
@@ -5,7 +5,7 @@ #include "ui/views/layout/layout_provider.h" #include "base/logging.h" -#include "ui/base/material_design/material_design_controller.h" +#include "ui/base/pointer/touch_ui_controller.h" #include "ui/gfx/font_list.h" #include "ui/views/style/typography.h" #include "ui/views/views_delegate.h"
diff --git a/ui/views/view.cc b/ui/views/view.cc index 6f225875..4cb98c1 100644 --- a/ui/views/view.cc +++ b/ui/views/view.cc
@@ -1993,6 +1993,14 @@ } } +// System events --------------------------------------------------------------- + +void View::OnThemeChanged() { +#if DCHECK_IS_ON() + on_theme_changed_called_ = true; +#endif +} + // Tooltips -------------------------------------------------------------------- void View::TooltipTextChanged() { @@ -2881,6 +2889,15 @@ child->PropagateThemeChanged(); } OnThemeChanged(); +#if DCHECK_IS_ON() + DCHECK(on_theme_changed_called_) + << "views::View::OnThemeChanged() has not been called. This means that " + "some class in the hierarchy is not calling their direct parent's " + "OnThemeChanged(). Please fix this by adding the missing call. Do not " + "call views::View::OnThemeChanged() directly unless views::View is " + "the direct parent class."; + on_theme_changed_called_ = false; +#endif for (ViewObserver& observer : observers_) observer.OnViewThemeChanged(this); }
diff --git a/ui/views/view.h b/ui/views/view.h index e418821c..b1dfe17e 100644 --- a/ui/views/view.h +++ b/ui/views/view.h
@@ -1546,7 +1546,7 @@ // allows individual Views to do special cleanup and processing (such as // dropping resource caches). To dispatch a theme changed notification, call // Widget::ThemeChanged(). - virtual void OnThemeChanged() {} + virtual void OnThemeChanged(); // Tooltips ------------------------------------------------------------------ @@ -2037,6 +2037,12 @@ std::unique_ptr<ViewTargeter> targeter_; + // System events ------------------------------------------------------------- + +#if DCHECK_IS_ON() + bool on_theme_changed_called_ = false; +#endif + // Accessibility ------------------------------------------------------------- // Manages the accessibility interface for this View.
diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc index 751d631..448da62 100644 --- a/ui/views/view_unittest.cc +++ b/ui/views/view_unittest.cc
@@ -5070,6 +5070,7 @@ //////////////////////////////////////////////////////////////////////////////// void TestView::OnThemeChanged() { + View::OnThemeChanged(); native_theme_ = GetNativeTheme(); } @@ -5183,6 +5184,7 @@ // View: void OnThemeChanged() override { + View::OnThemeChanged(); on_native_theme_changed_called_ = true; GetWidget()->GetRootView()->AddChildView(std::make_unique<View>()); }
diff --git a/ui/views/window/caption_button_layout_constants.cc b/ui/views/window/caption_button_layout_constants.cc index 126dced..f674109 100644 --- a/ui/views/window/caption_button_layout_constants.cc +++ b/ui/views/window/caption_button_layout_constants.cc
@@ -5,7 +5,7 @@ #include "ui/views/window/caption_button_layout_constants.h" #include "base/logging.h" -#include "ui/base/material_design/material_design_controller.h" +#include "ui/base/pointer/touch_ui_controller.h" #include "ui/gfx/geometry/size.h" namespace views { @@ -17,8 +17,7 @@ // |kBrowserMaximizedCaptionButtonHeight| should be kept in sync with those // for TAB_HEIGHT in // chrome/browser/ui/layout_constants.cc. // TODO: Ideally these values should be obtained from a common location. - int height = - ui::MaterialDesignController::GetInstance()->touch_ui() ? 41 : 34; + int height = ui::TouchUiController::Get()->touch_ui() ? 41 : 34; if (size == CaptionButtonLayoutSize::kBrowserCaptionRestored) height += 8; // Restored window titlebars are 8 DIP taller than maximized. return gfx::Size(kCaptionButtonWidth, height);
diff --git a/ui/views/window/dialog_client_view.cc b/ui/views/window/dialog_client_view.cc index 0f34750..70f3613 100644 --- a/ui/views/window/dialog_client_view.cc +++ b/ui/views/window/dialog_client_view.cc
@@ -184,6 +184,7 @@ } void DialogClientView::OnThemeChanged() { + ClientView::OnThemeChanged(); // The old dialog style needs an explicit background color, while the new // dialog style simply inherits the bubble's frame view color. const DialogDelegate* dialog = GetDialogDelegate();
diff --git a/ui/views/window/non_client_view.cc b/ui/views/window/non_client_view.cc index 8801f15..dddc821 100644 --- a/ui/views/window/non_client_view.cc +++ b/ui/views/window/non_client_view.cc
@@ -112,6 +112,7 @@ } void NonClientFrameView::OnThemeChanged() { + View::OnThemeChanged(); SchedulePaint(); }
diff --git a/ui/webui/resources/cr_components/BUILD.gn b/ui/webui/resources/cr_components/BUILD.gn index 1f97246..63837cb 100644 --- a/ui/webui/resources/cr_components/BUILD.gn +++ b/ui/webui/resources/cr_components/BUILD.gn
@@ -9,6 +9,7 @@ "certificate_manager:closure_compile", "managed_footnote:closure_compile", "managed_footnote:closure_compile_module", + "omnibox:closure_compile", ] if (is_chromeos) { @@ -20,6 +21,7 @@ public_deps = [ "certificate_manager:polymer3_elements", "managed_footnote:managed_footnote_module", + "omnibox:omnibox_modules", ] if (is_chromeos) { public_deps += [ "chromeos:polymer3_elements" ]
diff --git a/ui/webui/resources/cr_components/cr_components_resources_v3.grdp b/ui/webui/resources/cr_components/cr_components_resources_v3.grdp index 4cf101aa..11b15e7 100644 --- a/ui/webui/resources/cr_components/cr_components_resources_v3.grdp +++ b/ui/webui/resources/cr_components/cr_components_resources_v3.grdp
@@ -6,6 +6,11 @@ type="BINDATA" preprocess="true" compress="gzip" /> + <include name="IDR_WEBUI_CR_COMPONENTS_OMNIBOX_CR_AUTOCOMPLETE_MATCH_LIST_JS" + file="${root_gen_dir}/ui/webui/resources/cr_components/omnibox/cr_autocomplete_match_list.js" + use_base_dir="false" + type="BINDATA" + compress="gzip" /> <if expr="chromeos"> <include name="IDR_WEBUI_CHROMEOS_SMB_SHARES_ADD_SMB_SHARE_DIALOG_M_JS" file="${root_gen_dir}/ui/webui/resources/cr_components/chromeos/smb_shares/add_smb_share_dialog.m.js"
diff --git a/ui/webui/resources/cr_components/omnibox/BUILD.gn b/ui/webui/resources/cr_components/omnibox/BUILD.gn new file mode 100644 index 0000000..94b6ed48 --- /dev/null +++ b/ui/webui/resources/cr_components/omnibox/BUILD.gn
@@ -0,0 +1,23 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//third_party/closure_compiler/compile_js.gni") +import("//tools/polymer/polymer.gni") + +js_type_check("closure_compile") { + uses_js_modules = true + deps = [ ":cr_autocomplete_match_list" ] +} + +js_library("cr_autocomplete_match_list") { +} + +polymer_modulizer("cr_autocomplete_match_list") { + js_file = "cr_autocomplete_match_list.js" + html_file = "cr_autocomplete_match_list.html" + html_type = "v3-ready" +} +group("omnibox_modules") { + public_deps = [ ":cr_autocomplete_match_list_module" ] +}
diff --git a/ui/webui/resources/cr_components/omnibox/OWNERS b/ui/webui/resources/cr_components/omnibox/OWNERS new file mode 100644 index 0000000..90b1b756 --- /dev/null +++ b/ui/webui/resources/cr_components/omnibox/OWNERS
@@ -0,0 +1,3 @@ +file://components/omnibox/OWNERS + +# COMPONENT: UI>Browser>Omnibox
diff --git a/ui/webui/resources/cr_components/omnibox/cr_autocomplete_match_list.html b/ui/webui/resources/cr_components/omnibox/cr_autocomplete_match_list.html new file mode 100644 index 0000000..0ba6e3d2 --- /dev/null +++ b/ui/webui/resources/cr_components/omnibox/cr_autocomplete_match_list.html
@@ -0,0 +1,3 @@ +<div> + <span id="contents"></span> - <span id="description"></span> +</div>
diff --git a/ui/webui/resources/cr_components/omnibox/cr_autocomplete_match_list.js b/ui/webui/resources/cr_components/omnibox/cr_autocomplete_match_list.js new file mode 100644 index 0000000..c5e4871 --- /dev/null +++ b/ui/webui/resources/cr_components/omnibox/cr_autocomplete_match_list.js
@@ -0,0 +1,58 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +/** + * @fileoverview Custom element for the omnibox popup used in the + * WebUI NTP realbox and (experimentally) in the top chrome omnibox. + */ + +/** + * TODO(tommycli): Coalesce this with the Mojo AutocompleteMatch. + * @typedef {{ + * contents: string, + * description: string, + * }} + */ +let AutocompleteMatch; + +class AutocompleteMatchElement extends HTMLElement { + constructor() { + super(); + this.attachShadow({mode: 'open'}); + this.shadowRoot.innerHTML = `{__html_template__}`; + } + + /** @param {!AutocompleteMatch} match */ + updateMatch(match) { + const shadowRoot = this.shadowRoot; + shadowRoot.getElementById('contents').textContent = match.contents; + shadowRoot.getElementById('description').textContent = match.description; + } +} + +customElements.define('cr-autocomplete-match', AutocompleteMatchElement); + +export class AutocompleteMatchListElement extends HTMLElement { + constructor() { + super(); + const shadowRoot = this.attachShadow({mode: 'open'}); + + // TODO(tommycli): Get this from the browser via loadTimeData. + const maxAutocompleteElements = 8; + for (let i = 0; i < maxAutocompleteElements; i++) { + shadowRoot.appendChild(document.createElement('cr-autocomplete-match')); + } + } + + /** @param {!Array<!AutocompleteMatch>} matches */ + updateMatches(matches) { + for (let i = 0; i < matches.length; i++) { + const shadowRoot = /** @type {!ParentNode} */ (this.shadowRoot); + shadowRoot.children[i].updateMatch(matches[i]); + } + } +} + +customElements.define( + 'cr-autocomplete-match-list', AutocompleteMatchListElement);
diff --git a/weblayer/browser/browser_impl.h b/weblayer/browser/browser_impl.h index 364a076c..c4b2523 100644 --- a/weblayer/browser/browser_impl.h +++ b/weblayer/browser/browser_impl.h
@@ -91,7 +91,8 @@ // Used by tests to specify a callback to listen to changes to visible // security state. - void SetVisibleSecurityStateChangedCallback(base::OnceClosure closure) { + void set_visible_security_state_callback_for_tests( + base::OnceClosure closure) { visible_security_state_changed_callback_for_tests_ = std::move(closure); }
diff --git a/weblayer/browser/url_bar/url_bar_browsertest.cc b/weblayer/browser/url_bar/url_bar_browsertest.cc index 21d7610..ad3e6cd 100644 --- a/weblayer/browser/url_bar/url_bar_browsertest.cc +++ b/weblayer/browser/url_bar/url_bar_browsertest.cc
@@ -38,7 +38,8 @@ GURL abort_url() { return embedded_test_server()->GetURL("/nocontent"); } void SetVisibleSecurityStateChangedCallback(base::OnceClosure closure) { - browser_impl()->SetVisibleSecurityStateChangedCallback(std::move(closure)); + browser_impl()->set_visible_security_state_callback_for_tests( + std::move(closure)); } protected:
