From 606d85f2a5386472314d39923da28c70c60dc8e7 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 2 Feb 2022 12:21:57 +0100 Subject: BASELINE: Update Chromium to 96.0.4664.181 Change-Id: I762cd1da89d73aa6313b4a753fe126c34833f046 Reviewed-by: Allan Sandfeld Jensen --- chromium/components/page_image_annotation/OWNERS | 1 - .../content/renderer/content_page_annotator_driver.cc | 4 ++-- .../content/renderer/content_page_annotator_driver.h | 8 +++++--- chromium/components/page_image_annotation/core/page_annotator.h | 6 ++++-- 4 files changed, 11 insertions(+), 8 deletions(-) (limited to 'chromium/components/page_image_annotation') diff --git a/chromium/components/page_image_annotation/OWNERS b/chromium/components/page_image_annotation/OWNERS index b2737f856ac..f560ada4324 100644 --- a/chromium/components/page_image_annotation/OWNERS +++ b/chromium/components/page_image_annotation/OWNERS @@ -1,3 +1,2 @@ amoylan@chromium.org -dmazzoni@chromium.org martis@chromium.org diff --git a/chromium/components/page_image_annotation/content/renderer/content_page_annotator_driver.cc b/chromium/components/page_image_annotation/content/renderer/content_page_annotator_driver.cc index 7b9c83444e2..20c6be45505 100644 --- a/chromium/components/page_image_annotation/content/renderer/content_page_annotator_driver.cc +++ b/chromium/components/page_image_annotation/content/renderer/content_page_annotator_driver.cc @@ -113,7 +113,7 @@ std::string ContentPageAnnotatorDriver::GenerateSourceId( return std::string(); } -void ContentPageAnnotatorDriver::DidFinishDocumentLoad() { +void ContentPageAnnotatorDriver::DidDispatchDOMContentLoadedEvent() { if (!render_frame()->IsMainFrame()) return; @@ -138,7 +138,7 @@ void ContentPageAnnotatorDriver::DidFinishDocumentLoad() { FROM_HERE, base::BindOnce(&ContentPageAnnotatorDriver::FindAndTrackImages, weak_ptr_factory_.GetWeakPtr()), - base::TimeDelta::FromMilliseconds(kDomCrawlDelayMs)); + base::Milliseconds(kDomCrawlDelayMs)); } void ContentPageAnnotatorDriver::OnDestruct() { diff --git a/chromium/components/page_image_annotation/content/renderer/content_page_annotator_driver.h b/chromium/components/page_image_annotation/content/renderer/content_page_annotator_driver.h index 1825167ec76..4244f47cb03 100644 --- a/chromium/components/page_image_annotation/content/renderer/content_page_annotator_driver.h +++ b/chromium/components/page_image_annotation/content/renderer/content_page_annotator_driver.h @@ -27,6 +27,10 @@ class ContentPageAnnotatorDriver : public content::RenderFrameObserver, public content::RenderFrameObserverTracker { public: + ContentPageAnnotatorDriver(const ContentPageAnnotatorDriver&) = delete; + ContentPageAnnotatorDriver& operator=(const ContentPageAnnotatorDriver&) = + delete; + ~ContentPageAnnotatorDriver() override; static ContentPageAnnotatorDriver* GetOrCreate( @@ -55,7 +59,7 @@ class ContentPageAnnotatorDriver ContentPageAnnotatorDriver(content::RenderFrame* render_frame); // content::RenderFrameObserver: - void DidFinishDocumentLoad() override; + void DidDispatchDOMContentLoadedEvent() override; void OnDestruct() override; // Traverse the DOM starting at the given node, and add all elements with @@ -79,8 +83,6 @@ class ContentPageAnnotatorDriver PageAnnotator page_annotator_; base::WeakPtrFactory weak_ptr_factory_{this}; - - DISALLOW_COPY_AND_ASSIGN(ContentPageAnnotatorDriver); }; } // namespace page_image_annotation diff --git a/chromium/components/page_image_annotation/core/page_annotator.h b/chromium/components/page_image_annotation/core/page_annotator.h index e0854ab191b..e4bb809ee68 100644 --- a/chromium/components/page_image_annotation/core/page_annotator.h +++ b/chromium/components/page_image_annotation/core/page_annotator.h @@ -69,6 +69,10 @@ class PageAnnotator { explicit PageAnnotator( mojo::PendingRemote annotator); + + PageAnnotator(const PageAnnotator&) = delete; + PageAnnotator& operator=(const PageAnnotator&) = delete; + ~PageAnnotator(); // Request annotation of the given image via the image annotation service. @@ -109,8 +113,6 @@ class PageAnnotator { std::map> images_; - - DISALLOW_COPY_AND_ASSIGN(PageAnnotator); }; } // namespace page_image_annotation -- cgit v1.2.1