FairyWorld · pull · Dec 14, 2021 · Dec 14, 2021 · Dec 14, 2021 · Dec 14, 2021
diff --git a/DEPS b/DEPS
@@ -239,7 +239,7 @@ vars = {
   # 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': '33c28b9fa98634d36dbb5f404a3be33decc35463',
+  'skia_revision': 'd26057a2c0e1e35a2f3a498769a27d8f8b6b1e62',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling V8
   # and whatever else without interference from each other.
@@ -314,7 +314,7 @@ vars = {
   # 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': 'ebad3a4739fd8170cf9b8b91496cf8b866972d0a',
+  'devtools_frontend_revision': 'a84185e6b5be9c88f8aad0fa589ab7c213d77e5d',
   # 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.
@@ -354,7 +354,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling feed
   # and whatever else without interference from each other.
-  'dawn_revision': 'b7e2f3654264515c50b10308afb70626ef22bce1',
+  'dawn_revision': '4682ae0034e7929dbea9b064ff39f6953eec406b',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling feed
   # and whatever else without interference from each other.
@@ -1700,7 +1700,7 @@ deps = {
     Var('chromium_git') + '/v8/v8.git' + '@' +  Var('v8_revision'),
 
   'src-internal': {
-    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@df7c46c625a3bb971a83b1469c8e82f7db00eeca',
+    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@d49909553bd8838195664ca9df5b36229c2582da',
     'condition': 'checkout_src_internal',
   },
 

diff --git a/android_webview/browser/permission/media_access_permission_request_unittest.cc b/android_webview/browser/permission/media_access_permission_request_unittest.cc
@@ -59,7 +59,8 @@ class MediaAccessPermissionRequestTest : public testing::Test {
         video_id, blink::mojom::MediaStreamType::DEVICE_AUDIO_CAPTURE,
         blink::mojom::MediaStreamType::DEVICE_VIDEO_CAPTURE,
         false /* disable_local_echo */,
-        false /* request_pan_tilt_zoom_permission */);
+        false /* request_pan_tilt_zoom_permission */,
+        false /* region_capture_capable */);
 
     std::unique_ptr<TestMediaAccessPermissionRequest> permission_request;
     permission_request = std::make_unique<TestMediaAccessPermissionRequest>(

diff --git a/android_webview/tools/remove_preinstalled_webview.py b/android_webview/tools/remove_preinstalled_webview.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env vpython
+#!/usr/bin/env vpython3
 #
 # Copyright 2018 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be

diff --git a/ash/app_list/BUILD.gn b/ash/app_list/BUILD.gn
@@ -182,6 +182,7 @@ source_set("app_list") {
     "//components/prefs",
     "//components/services/app_service/public/cpp:app_update",
     "//components/sync",
+    "//components/vector_icons",
     "//extensions/common:common_constants",
     "//mojo/public/cpp/bindings",
     "//skia",

diff --git a/ash/app_list/views/search_box_view.cc b/ash/app_list/views/search_box_view.cc
@@ -34,6 +34,7 @@
 #include "base/metrics/user_metrics.h"
 #include "base/notreached.h"
 #include "chromeos/ui/vector_icons/vector_icons.h"
+#include "components/vector_icons/vector_icons.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/ime/composition_text.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -209,8 +210,9 @@ void SearchBoxView::UpdateModel(bool initiated_by_user) {
 void SearchBoxView::UpdateSearchIcon() {
   const bool search_engine_is_google =
       AppListModelProvider::Get()->search_model()->search_engine_is_google();
-  const gfx::VectorIcon& google_icon =
-      is_search_box_active() ? kGoogleColorIcon : kGoogleBlackIcon;
+  const gfx::VectorIcon& google_icon = is_search_box_active()
+                                           ? vector_icons::kGoogleColorIcon
+                                           : kGoogleBlackIcon;
   const gfx::VectorIcon& icon =
       search_engine_is_google ? google_icon : kSearchEngineNotGoogleIcon;
   SetSearchIconImage(

diff --git a/ash/app_list/views/search_box_view_unittest.cc b/ash/app_list/views/search_box_view_unittest.cc
@@ -34,6 +34,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/metrics/user_action_tester.h"
 #include "base/test/scoped_feature_list.h"
+#include "components/vector_icons/vector_icons.h"
 #include "ui/base/ime/composition_text.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/compositor/layer.h"
@@ -284,8 +285,9 @@ TEST_F(SearchBoxViewTest, SearchBoxInactiveSearchBoxGoogle) {
 TEST_F(SearchBoxViewTest, SearchBoxActiveSearchEngineGoogle) {
   SetSearchEngineIsGoogle(true);
   SetSearchBoxActive(true, ui::ET_MOUSE_PRESSED);
-  const gfx::ImageSkia expected_icon = gfx::CreateVectorIcon(
-      kGoogleColorIcon, kSearchBoxIconSize, kDefaultSearchboxColor);
+  const gfx::ImageSkia expected_icon =
+      gfx::CreateVectorIcon(vector_icons::kGoogleColorIcon, kSearchBoxIconSize,
+                            kDefaultSearchboxColor);
 
   const gfx::ImageSkia actual_icon = view()->search_icon()->GetImage();
 

diff --git a/ash/public/cpp/app_list/vector_icons/BUILD.gn b/ash/public/cpp/app_list/vector_icons/BUILD.gn
@@ -18,7 +18,6 @@ aggregate_vector_icons("app_list_vector_icons") {
     "bookmark.icon",
     "equal.icon",
     "google_black.icon",
-    "google_color.icon",
     "history.icon",
     "mic_black.icon",
     "omnibox_generic.icon",

diff --git a/ash/resources/vector_icons/BUILD.gn b/ash/resources/vector_icons/BUILD.gn
@@ -73,7 +73,6 @@ aggregate_vector_icons("ash_vector_icons") {
     "dictation_on.icon",
     "dictation_on_newui.icon",
     "do_not_disturb_disabled.icon",
-    "dogfood.icon",
     "eight_files.icon",
     "files_app.icon",
     "five_files.icon",
@@ -408,7 +407,6 @@ aggregate_vector_icons("ash_vector_icons") {
     "unified_menu_rotation_lock_auto.icon",
     "unified_menu_rotation_lock_landscape.icon",
     "unified_menu_rotation_lock_portrait.icon",
-    "unified_menu_settings.icon",
     "unified_menu_volume_high.icon",
     "unified_menu_volume_low.icon",
     "unified_menu_volume_medium.icon",

diff --git a/ash/system/time/calendar_event_list_item_view.cc b/ash/system/time/calendar_event_list_item_view.cc
@@ -98,7 +98,6 @@ CalendarEventListItemView::CalendarEventListItemView(
       time_range_(new views::Label()) {
   SetLayoutManager(std::make_unique<views::FillLayout>());
   GetViewAccessibility().OverrideName(GetClassName());
-  SetFocusBehavior(FocusBehavior::ALWAYS);
 
   summary_->SetText(base::UTF8ToUTF16(event.summary()));
   SetUpLabel(summary_);

diff --git a/ash/system/time/calendar_event_list_view.h b/ash/system/time/calendar_event_list_view.h
@@ -34,7 +34,6 @@ class ASH_EXPORT CalendarEventListView
 
  private:
   friend class CalendarViewEventListViewTest;
-  friend class CalendarViewTest;
 
   // Updates the event list entries.
   void UpdateListItems();

diff --git a/ash/system/time/calendar_view.cc b/ash/system/time/calendar_view.cc
@@ -306,8 +306,6 @@ CalendarView::CalendarView(DetailedViewDelegate* delegate,
   scroll_view_->SetDrawOverflowIndicator(false);
   scroll_view_->SetVerticalScrollBarMode(
       views::ScrollView::ScrollBarMode::kHiddenButEnabled);
-  scroll_view_->GetViewAccessibility().OverrideName(GetClassName());
-  scroll_view_->SetFocusBehavior(FocusBehavior::ALWAYS);
   on_contents_scrolled_subscription_ =
       scroll_view_->AddContentsScrolledCallback(base::BindRepeating(
           &CalendarView::OnContentsScrolled, base::Unretained(this)));
@@ -412,7 +410,7 @@ int CalendarView::PositionOfSelectedDate() const {
 }
 
 void CalendarView::ResetToToday() {
-  if (event_list_container_)
+  if (event_list_)
     return;
 
   calendar_view_controller_->UpdateMonth(base::Time::Now());
@@ -518,11 +516,6 @@ void CalendarView::MaybeResetContentViewFocusBehavior() {
   }
 
   content_view_->SetFocusBehavior(FocusBehavior::ALWAYS);
-
-  // Also disable the focus behavior of the `event_list_container_`, since now
-  // the focusing ring is out of the date cells.
-  if (event_list_container_)
-    event_list_container_->SetFocusBehavior(FocusBehavior::NEVER);
 }
 
 void CalendarView::OnViewBoundsChanged(views::View* observed_view) {
@@ -542,24 +535,12 @@ void CalendarView::OnViewFocused(View* observed_view) {
   if (observed_view != content_view_ || IsDateCellViewFocused())
     return;
 
-  auto* focus_manager = GetFocusManager();
+  // When focusing on the `content_view_`, we decide which is the to-be-focued
+  // cell based on the current position.
   previous_month_->EnableFocus();
   current_month_->EnableFocus();
   next_month_->EnableFocus();
-
-  // If the event list is showing, focus on the first cell in the current row or
-  // today's cell if today is in this row.
-  if (event_list_container_) {
-    focus_manager->SetFocusedView(
-        current_month_->focused_cells()[calendar_view_controller_
-                                            ->GetExpandedRowIndex()]);
-    content_view_->SetFocusBehavior(FocusBehavior::NEVER);
-    event_list_container_->SetFocusBehavior(FocusBehavior::ALWAYS);
-    return;
-  }
-
-  // When focusing on the `content_view_`, we decide which is the to-be-focued
-  // cell based on the current position.
+  auto* focus_manager = GetFocusManager();
   const int position = scroll_view_->GetVisibleRect().y();
   const int row_height = calendar_view_controller_->row_height();
 
@@ -666,12 +647,9 @@ void CalendarView::OnEventsFetched(
 }
 
 void CalendarView::OpenEventList() {
-  if (event_list_container_)
+  if (event_list_)
     return;
 
-  scroll_view_->SetVerticalScrollBarMode(
-      views::ScrollView::ScrollBarMode::kHiddenButEnabled);
-
   if (!calendar_view_controller_->IsSelectedDateInCurrentMonth())
     ScrollDownOneMonth();
   base::AutoReset<bool> is_resetting_scrolling(&is_resetting_scroll_, true);
@@ -682,29 +660,16 @@ void CalendarView::OpenEventList() {
                                     calendar_view_controller_->row_height());
   scroll_view_->SetVerticalScrollBarMode(
       views::ScrollView::ScrollBarMode::kDisabled);
-
-  // The event list is in a container, which will be used for escaping the
-  // focusing from the date cells.
-  event_list_container_ = AddChildView(std::make_unique<views::View>());
-  event_list_container_->SetLayoutManager(std::make_unique<views::BoxLayout>(
-      views::BoxLayout::Orientation::kVertical));
-  event_list_container_->GetViewAccessibility().OverrideName(GetClassName());
-  event_list_container_->SetFocusBehavior(
-      IsDateCellViewFocused() ? FocusBehavior::ALWAYS : FocusBehavior::NEVER);
-
-  event_list_ = event_list_container_->AddChildView(
+  event_list_ = AddChildView(
       std::make_unique<CalendarEventListView>(calendar_view_controller_.get()));
-  event_list_->GetViewAccessibility().OverrideName(GetClassName());
-  event_list_->SetFocusBehavior(FocusBehavior::ALWAYS);
   calendar_view_controller_->OnEventListOpened();
 }
 
 void CalendarView::CloseEventList() {
   scroll_view_->ClipHeightTo(0, INT_MAX);
   scroll_view_->SetVerticalScrollBarMode(
       views::ScrollView::ScrollBarMode::kHiddenButEnabled);
-  RemoveChildViewT(event_list_container_);
-  event_list_container_ = nullptr;
+  RemoveChildViewT(event_list_);
   event_list_ = nullptr;
   calendar_view_controller_->OnEventListClosed();
 }
@@ -802,7 +767,7 @@ void CalendarView::ScrollOneMonthWithAnimation(bool is_scrolling_up) {
   if (is_resetting_scroll_)
     return;
 
-  if (event_list_container_) {
+  if (event_list_) {
     ScrollOneRowWithAnimation(is_scrolling_up);
     return;
   }
@@ -956,23 +921,13 @@ void CalendarView::OnEvent(ui::Event* event) {
   // goes to the next focusable button in the header.
   if (key_event->type() == ui::EventType::ET_KEY_PRESSED &&
       views::FocusManager::IsTabTraversalKeyEvent(*key_event)) {
-    // Set focus on `scroll_view_`/`event_list_` or null pointer to escape the
-    // focusing on the date cell.
-    if (key_event->IsShiftDown()) {
-      scroll_view_->RequestFocus();
-    } else if (event_list_container_) {
-      event_list_container_->RequestFocus();
-      event_list_container_->SetFocusBehavior(FocusBehavior::NEVER);
-    } else {
-      focus_manager->SetFocusedView(nullptr);
-    }
-
+    // Set focus on null pointer first. Otherwise the it will auto
+    // `AdvanceFocus` when the focused cell is on blur.
+    focus_manager->SetFocusedView(nullptr);
     current_month_->DisableFocus();
     previous_month_->DisableFocus();
     next_month_->DisableFocus();
-
     TrayDetailedView::OnEvent(event);
-
     content_view_->SetFocusBehavior(FocusBehavior::ALWAYS);
     return;
   }
@@ -988,10 +943,6 @@ void CalendarView::OnEvent(ui::Event* event) {
     case ui::VKEY_UP:
     case ui::VKEY_DOWN: {
       auto* current_focusable_view = focus_manager->GetFocusedView();
-      // Enable the scroll bar mode, in case it is disabled when the event list
-      // is showing.
-      scroll_view_->SetVerticalScrollBarMode(
-          views::ScrollView::ScrollBarMode::kHiddenButEnabled);
 
       // Moving 7 (`kDateInOneWeek`) steps will focus on the cell which is right
       // above or below the current cell, since each row has 7 days.
@@ -1043,36 +994,13 @@ void CalendarView::OnEvent(ui::Event* event) {
         }
       }
       focus_manager->SetFocusedView(current_focusable_view);
-      // After focusing on the new cell the view should have scrolled already
-      // if needed, disable the scroll bar mode if the even list is showing.
-      if (event_list_container_)
-        scroll_view_->SetVerticalScrollBarMode(
-            views::ScrollView::ScrollBarMode::kDisabled);
-      const int current_height =
-          scroll_view_->GetVisibleRect().y() - PositionOfCurrentMonth();
-      calendar_view_controller_->set_expanded_row_index(
-          current_height / calendar_view_controller_->row_height());
       return;
     }
     case ui::VKEY_LEFT:
     case ui::VKEY_RIGHT: {
-      // Enable the scroll bar mode, in case it is disabled when the event list
-      // is showing.
-      scroll_view_->SetVerticalScrollBarMode(
-          views::ScrollView::ScrollBarMode::kHiddenButEnabled);
       bool is_reverse = base::i18n::IsRTL() ? key_code == ui::VKEY_RIGHT
                                             : key_code == ui::VKEY_LEFT;
       focus_manager->AdvanceFocus(/*reverse=*/is_reverse);
-      // After focusing on the new cell the view should have scrolled already
-      // if needed, disable the scroll bar mode if the even list is showing.
-      if (event_list_container_)
-        scroll_view_->SetVerticalScrollBarMode(
-            views::ScrollView::ScrollBarMode::kDisabled);
-
-      const int current_height =
-          scroll_view_->GetVisibleRect().y() - PositionOfCurrentMonth();
-      calendar_view_controller_->set_expanded_row_index(
-          current_height / calendar_view_controller_->row_height());
       return;
     }
     default:

diff --git a/ash/system/time/calendar_view.h b/ash/system/time/calendar_view.h
@@ -210,7 +210,6 @@ class ASH_EXPORT CalendarView : public CalendarViewController::Observer,
   views::Button* settings_button_ = nullptr;
   IconButton* up_button_ = nullptr;
   IconButton* down_button_ = nullptr;
-  views::View* event_list_container_ = nullptr;
   CalendarEventListView* event_list_ = nullptr;
 
   // If it `is_resetting_scroll_`, we don't calculate the scroll position and we