From 1943b3c2a1dcee36c233724fc4ee7613d71b9cf6 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 26 Oct 2021 13:57:00 +0200 Subject: BASELINE: Update Chromium to 94.0.4606.111 Change-Id: I924781584def20fc800bedf6ff41fdb96c438193 Reviewed-by: Allan Sandfeld Jensen --- .../blink/renderer/core/accessibility/ax_context.h | 5 ++--- .../blink/renderer/core/accessibility/ax_object_cache.cc | 4 ++-- .../blink/renderer/core/accessibility/ax_object_cache.h | 5 +---- .../core/accessibility/scoped_blink_ax_event_intent.cc | 1 - .../core/accessibility/scoped_blink_ax_event_intent_test.cc | 11 ++++++----- 5 files changed, 11 insertions(+), 15 deletions(-) (limited to 'chromium/third_party/blink/renderer/core/accessibility') diff --git a/chromium/third_party/blink/renderer/core/accessibility/ax_context.h b/chromium/third_party/blink/renderer/core/accessibility/ax_context.h index 8302aebac05..16bfe8ce2aa 100644 --- a/chromium/third_party/blink/renderer/core/accessibility/ax_context.h +++ b/chromium/third_party/blink/renderer/core/accessibility/ax_context.h @@ -22,8 +22,7 @@ class CORE_EXPORT AXContext { USING_FAST_MALLOC(AXContext); public: - explicit AXContext(Document& document, - const ui::AXMode& mode = ui::kAXModeComplete); + AXContext(Document& document, const ui::AXMode& mode); AXContext(const AXContext&) = delete; AXContext& operator=(const AXContext&) = delete; virtual ~AXContext(); @@ -38,7 +37,7 @@ class CORE_EXPORT AXContext { Document* GetDocument(); - ui::AXMode GetAXMode() { return ax_mode_; } + const ui::AXMode& GetAXMode() { return ax_mode_; } protected: WeakPersistent document_; diff --git a/chromium/third_party/blink/renderer/core/accessibility/ax_object_cache.cc b/chromium/third_party/blink/renderer/core/accessibility/ax_object_cache.cc index a5e96bf7f4e..31f808cdc7e 100644 --- a/chromium/third_party/blink/renderer/core/accessibility/ax_object_cache.cc +++ b/chromium/third_party/blink/renderer/core/accessibility/ax_object_cache.cc @@ -30,14 +30,14 @@ #include +#include "base/cxx17_backports.h" #include "base/memory/ptr_util.h" -#include "base/stl_util.h" #include "third_party/blink/public/web/web_ax_enums.h" #include "third_party/blink/renderer/core/dom/element.h" #include "third_party/blink/renderer/core/dom/node.h" #include "third_party/blink/renderer/core/html_element_type_helpers.h" #include "third_party/blink/renderer/platform/wtf/hash_set.h" -#include "third_party/blink/renderer/platform/wtf/text/string_hash.h" +#include "third_party/blink/renderer/platform/wtf/text/case_folding_hash.h" #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h" namespace blink { diff --git a/chromium/third_party/blink/renderer/core/accessibility/ax_object_cache.h b/chromium/third_party/blink/renderer/core/accessibility/ax_object_cache.h index 39309496930..beeda720b84 100644 --- a/chromium/third_party/blink/renderer/core/accessibility/ax_object_cache.h +++ b/chromium/third_party/blink/renderer/core/accessibility/ax_object_cache.h @@ -73,14 +73,11 @@ class CORE_EXPORT AXObjectCache : public GarbageCollected { virtual void Freeze() = 0; virtual void Thaw() = 0; - // Register/remove popups - virtual void InitializePopup(Document* document) = 0; - virtual void DisposePopup(Document* document) = 0; - virtual void SelectionChanged(Node*) = 0; virtual void ChildrenChanged(Node*) = 0; virtual void ChildrenChanged(const LayoutObject*) = 0; virtual void ChildrenChanged(AccessibleNode*) = 0; + virtual void SlotAssignmentWillChange(Node*) = 0; virtual void CheckedStateChanged(Node*) = 0; virtual void ListboxOptionStateChanged(HTMLOptionElement*) = 0; virtual void ListboxSelectedChildrenChanged(HTMLSelectElement*) = 0; diff --git a/chromium/third_party/blink/renderer/core/accessibility/scoped_blink_ax_event_intent.cc b/chromium/third_party/blink/renderer/core/accessibility/scoped_blink_ax_event_intent.cc index 11f599ff8b1..09a63f771a1 100644 --- a/chromium/third_party/blink/renderer/core/accessibility/scoped_blink_ax_event_intent.cc +++ b/chromium/third_party/blink/renderer/core/accessibility/scoped_blink_ax_event_intent.cc @@ -4,7 +4,6 @@ #include "third_party/blink/renderer/core/accessibility/scoped_blink_ax_event_intent.h" -#include "base/macros.h" #include "third_party/blink/renderer/core/accessibility/ax_object_cache.h" namespace blink { diff --git a/chromium/third_party/blink/renderer/core/accessibility/scoped_blink_ax_event_intent_test.cc b/chromium/third_party/blink/renderer/core/accessibility/scoped_blink_ax_event_intent_test.cc index 77f2ab94b24..da4993f34a0 100644 --- a/chromium/third_party/blink/renderer/core/accessibility/scoped_blink_ax_event_intent_test.cc +++ b/chromium/third_party/blink/renderer/core/accessibility/scoped_blink_ax_event_intent_test.cc @@ -12,13 +12,14 @@ #include "third_party/blink/renderer/core/testing/core_unit_test_helper.h" #include "third_party/blink/renderer/platform/wtf/vector.h" #include "ui/accessibility/ax_enums.mojom-blink.h" +#include "ui/accessibility/ax_mode.h" namespace blink { using ScopedBlinkAXEventIntentTest = RenderingTest; TEST_F(ScopedBlinkAXEventIntentTest, SingleIntent) { - AXContext ax_context(GetDocument()); + AXContext ax_context(GetDocument(), ui::kAXModeComplete); AXObjectCache* cache = GetDocument().ExistingAXObjectCache(); ASSERT_NE(nullptr, cache); @@ -38,7 +39,7 @@ TEST_F(ScopedBlinkAXEventIntentTest, SingleIntent) { } TEST_F(ScopedBlinkAXEventIntentTest, MultipleIdenticalIntents) { - AXContext ax_context(GetDocument()); + AXContext ax_context(GetDocument(), ui::kAXModeComplete); AXObjectCache* cache = GetDocument().ExistingAXObjectCache(); ASSERT_NE(nullptr, cache); @@ -63,7 +64,7 @@ TEST_F(ScopedBlinkAXEventIntentTest, MultipleIdenticalIntents) { } TEST_F(ScopedBlinkAXEventIntentTest, NestedIndividualIntents) { - AXContext ax_context(GetDocument()); + AXContext ax_context(GetDocument(), ui::kAXModeComplete); AXObjectCache* cache = GetDocument().ExistingAXObjectCache(); ASSERT_NE(nullptr, cache); @@ -101,7 +102,7 @@ TEST_F(ScopedBlinkAXEventIntentTest, NestedIndividualIntents) { } TEST_F(ScopedBlinkAXEventIntentTest, NestedMultipleIntents) { - AXContext ax_context(GetDocument()); + AXContext ax_context(GetDocument(), ui::kAXModeComplete); AXObjectCache* cache = GetDocument().ExistingAXObjectCache(); ASSERT_NE(nullptr, cache); @@ -155,7 +156,7 @@ TEST_F(ScopedBlinkAXEventIntentTest, NestedMultipleIntents) { } TEST_F(ScopedBlinkAXEventIntentTest, NestedIdenticalIntents) { - AXContext ax_context(GetDocument()); + AXContext ax_context(GetDocument(), ui::kAXModeComplete); AXObjectCache* cache = GetDocument().ExistingAXObjectCache(); ASSERT_NE(nullptr, cache); -- cgit v1.2.1