VT: Rename "shared element" to "view transition"
Renaming some instances missed in previous renames.
Change-Id: I18c14df9def3e38014779df3b22692f384c6e434
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4182595
Reviewed-by: Vladimir Levin <vmpstr@chromium.org>
Reviewed-by: Jeremy Roman <jbroman@chromium.org>
Reviewed-by: danakj <danakj@chromium.org>
Commit-Queue: David Bokan <bokan@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1095241}
diff --git a/cc/BUILD.gn b/cc/BUILD.gn
index 18a09f3..a43b848 100644
--- a/cc/BUILD.gn
+++ b/cc/BUILD.gn
@@ -437,10 +437,10 @@
"trees/viewport_layers.cc",
"trees/viewport_layers.h",
"trees/viewport_property_ids.h",
+ "view_transition/view_transition_element_id.cc",
+ "view_transition/view_transition_element_id.h",
"view_transition/view_transition_request.cc",
"view_transition/view_transition_request.h",
- "view_transition/view_transition_shared_element_id.cc",
- "view_transition/view_transition_shared_element_id.h",
]
public_deps = [
diff --git a/cc/animation/animation_host.cc b/cc/animation/animation_host.cc
index 4ccda6e..91b23dc 100644
--- a/cc/animation/animation_host.cc
+++ b/cc/animation/animation_host.cc
@@ -155,13 +155,12 @@
has_smil_animation_.Write(*this) = has_smil_animation;
}
-bool AnimationHost::HasSharedElementTransition() const {
- return has_shared_element_transition_.Read(*this);
+bool AnimationHost::HasViewTransition() const {
+ return has_view_transition_.Read(*this);
}
-void AnimationHost::SetHasSharedElementTransition(
- bool has_shared_element_transition) {
- has_shared_element_transition_.Write(*this) = has_shared_element_transition;
+void AnimationHost::SetHasViewTransition(bool has_view_transition) {
+ has_view_transition_.Write(*this) = has_view_transition;
}
void AnimationHost::SetCurrentFrameHadRaf(bool current_frame_had_raf) {
@@ -345,7 +344,7 @@
host_impl->SetHasCanvasInvalidation(HasCanvasInvalidation());
host_impl->SetHasInlineStyleMutation(HasJSAnimation());
host_impl->SetHasSmilAnimation(HasSmilAnimation());
- host_impl->SetHasSharedElementTransition(HasSharedElementTransition());
+ host_impl->SetHasViewTransition(HasViewTransition());
if (needs_push_properties()) {
needs_push_properties_.Write(*this) = false;
diff --git a/cc/animation/animation_host.h b/cc/animation/animation_host.h
index b22c471..1f5f2e4 100644
--- a/cc/animation/animation_host.h
+++ b/cc/animation/animation_host.h
@@ -209,7 +209,7 @@
bool HasCanvasInvalidation() const override;
bool HasJSAnimation() const override;
bool HasSmilAnimation() const override;
- bool HasSharedElementTransition() const override;
+ bool HasViewTransition() const override;
// Starts/stops throughput tracking represented by |sequence_id|.
void StartThroughputTracking(TrackedAnimationSequenceId sequence_id);
@@ -219,7 +219,7 @@
void SetHasCanvasInvalidation(bool has_canvas_invalidation);
void SetHasInlineStyleMutation(bool has_inline_style_mutation);
void SetHasSmilAnimation(bool has_svg_smil_animation);
- void SetHasSharedElementTransition(bool hash_shared_element_transition);
+ void SetHasViewTransition(bool has_view_transition);
void SetCurrentFrameHadRaf(bool current_frame_had_raf);
void SetNextFrameHasPendingRaf(bool next_frame_has_pending_raf);
@@ -289,7 +289,7 @@
ProtectedSequenceReadable<bool> has_canvas_invalidation_{false};
ProtectedSequenceReadable<bool> has_inline_style_mutation_{false};
ProtectedSequenceReadable<bool> has_smil_animation_{false};
- ProtectedSequenceReadable<bool> has_shared_element_transition_{false};
+ ProtectedSequenceReadable<bool> has_view_transition_{false};
ProtectedSequenceWritable<PendingThroughputTrackerInfos>
pending_throughput_tracker_infos_;
diff --git a/cc/layers/render_surface_impl.h b/cc/layers/render_surface_impl.h
index 2e21ab5..4504b8e 100644
--- a/cc/layers/render_surface_impl.h
+++ b/cc/layers/render_surface_impl.h
@@ -18,7 +18,7 @@
#include "cc/layers/layer_collections.h"
#include "cc/trees/occlusion.h"
#include "cc/trees/property_tree.h"
-#include "cc/view_transition/view_transition_shared_element_id.h"
+#include "cc/view_transition/view_transition_element_id.h"
#include "components/viz/common/quads/compositor_render_pass.h"
#include "components/viz/common/quads/shared_quad_state.h"
#include "components/viz/common/surfaces/subtree_capture_id.h"
diff --git a/cc/trees/effect_node.h b/cc/trees/effect_node.h
index 4c305773..c329bea 100644
--- a/cc/trees/effect_node.h
+++ b/cc/trees/effect_node.h
@@ -8,7 +8,7 @@
#include "cc/cc_export.h"
#include "cc/paint/element_id.h"
#include "cc/paint/filter_operations.h"
-#include "cc/view_transition/view_transition_shared_element_id.h"
+#include "cc/view_transition/view_transition_element_id.h"
#include "components/viz/common/surfaces/subtree_capture_id.h"
#include "components/viz/common/view_transition_element_resource_id.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index 12a1491e..a8d0fce 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -780,7 +780,7 @@
mutator_host_->HasSmilAnimation()) {
frame_trackers_.StartSequence(
FrameSequenceTrackerType::kMainThreadAnimation);
- if (mutator_host_->HasSharedElementTransition()) {
+ if (mutator_host_->HasViewTransition()) {
frame_trackers_.StartSequence(
FrameSequenceTrackerType::kSETMainThreadAnimation);
}
@@ -2546,7 +2546,7 @@
FrameSequenceTrackerType::kMainThreadAnimation);
frame_trackers_.StopSequence(
FrameSequenceTrackerType::kSETMainThreadAnimation);
- } else if (!mutator_host_->HasSharedElementTransition()) {
+ } else if (!mutator_host_->HasViewTransition()) {
frame_trackers_.StopSequence(
FrameSequenceTrackerType::kSETMainThreadAnimation);
}
@@ -4302,7 +4302,7 @@
FrameSequenceTrackerType::kCompositorAnimation);
}
- if (animated && mutator_host_->HasSharedElementTransition()) {
+ if (animated && mutator_host_->HasViewTransition()) {
frame_trackers_.StartSequence(
FrameSequenceTrackerType::kSETCompositorAnimation);
} else {
diff --git a/cc/trees/mutator_host.h b/cc/trees/mutator_host.h
index aed5595..74fddb4 100644
--- a/cc/trees/mutator_host.h
+++ b/cc/trees/mutator_host.h
@@ -141,7 +141,7 @@
virtual bool HasCanvasInvalidation() const = 0;
virtual bool HasJSAnimation() const = 0;
virtual bool HasSmilAnimation() const = 0;
- virtual bool HasSharedElementTransition() const = 0;
+ virtual bool HasViewTransition() const = 0;
// Iterates through all animations and returns the minimum tick interval.
// Returns 0 if there is a continuous animation which should be ticked
diff --git a/cc/view_transition/view_transition_shared_element_id.cc b/cc/view_transition/view_transition_element_id.cc
similarity index 95%
rename from cc/view_transition/view_transition_shared_element_id.cc
rename to cc/view_transition/view_transition_element_id.cc
index ed88e6e1..066c5f3 100644
--- a/cc/view_transition/view_transition_shared_element_id.cc
+++ b/cc/view_transition/view_transition_element_id.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 "cc/view_transition/view_transition_shared_element_id.h"
+#include "cc/view_transition/view_transition_element_id.h"
#include <sstream>
#include <string>
diff --git a/cc/view_transition/view_transition_shared_element_id.h b/cc/view_transition/view_transition_element_id.h
similarity index 85%
rename from cc/view_transition/view_transition_shared_element_id.h
rename to cc/view_transition/view_transition_element_id.h
index f3e4118..7590fb5 100644
--- a/cc/view_transition/view_transition_shared_element_id.h
+++ b/cc/view_transition/view_transition_element_id.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 CC_VIEW_TRANSITION_VIEW_TRANSITION_SHARED_ELEMENT_ID_H_
-#define CC_VIEW_TRANSITION_VIEW_TRANSITION_SHARED_ELEMENT_ID_H_
+#ifndef CC_VIEW_TRANSITION_VIEW_TRANSITION_ELEMENT_ID_H_
+#define CC_VIEW_TRANSITION_VIEW_TRANSITION_ELEMENT_ID_H_
#include <stdint.h>
@@ -23,7 +23,7 @@
ViewTransitionElementId(ViewTransitionElementId&&);
~ViewTransitionElementId();
- // Add a shared index to this id. It must have a valid document tag.
+ // Add an element index to this id. It must have a valid document tag.
void AddIndex(uint32_t index);
// Returns true if the document tag matches this id and the index is in the
@@ -61,4 +61,4 @@
} // namespace cc
-#endif // CC_VIEW_TRANSITION_VIEW_TRANSITION_SHARED_ELEMENT_ID_H_
+#endif // CC_VIEW_TRANSITION_VIEW_TRANSITION_ELEMENT_ID_H_
diff --git a/cc/view_transition/view_transition_request.cc b/cc/view_transition/view_transition_request.cc
index b7b24b9..81db4a28 100644
--- a/cc/view_transition/view_transition_request.cc
+++ b/cc/view_transition/view_transition_request.cc
@@ -14,7 +14,7 @@
#include "base/functional/callback_helpers.h"
#include "base/memory/ptr_util.h"
#include "base/ranges/algorithm.h"
-#include "cc/view_transition/view_transition_shared_element_id.h"
+#include "cc/view_transition/view_transition_element_id.h"
#include "components/viz/common/quads/compositor_frame_transition_directive.h"
#include "components/viz/common/quads/compositor_render_pass.h"
diff --git a/cc/view_transition/view_transition_request.h b/cc/view_transition/view_transition_request.h
index 6ff8490..6d27beb0 100644
--- a/cc/view_transition/view_transition_request.h
+++ b/cc/view_transition/view_transition_request.h
@@ -13,7 +13,7 @@
#include "base/functional/callback.h"
#include "cc/cc_export.h"
-#include "cc/view_transition/view_transition_shared_element_id.h"
+#include "cc/view_transition/view_transition_element_id.h"
#include "components/viz/common/quads/compositor_frame_transition_directive.h"
#include "components/viz/common/quads/compositor_render_pass.h"