Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1772)

Unified Diff: content/browser/renderer_host/render_widget_host_view_android.cc

Issue 2810813004: Hide fullscreen rotation jank (Closed)
Patch Set: Assume true/false when updating fullscreen state Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/render_widget_host_view_android.cc
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 2da5ad962dfed375abda9c138e1ef5a92d183fbd..8435766cbf5a1abdfb4e8ae94569a1c3ca0f11b8 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.cc
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -71,6 +71,7 @@
#include "content/public/browser/devtools_agent_host.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/render_widget_host_iterator.h"
+#include "content/public/common/content_features.h"
#include "content/public/common/content_switches.h"
#include "gpu/command_buffer/client/gles2_implementation.h"
#include "gpu/command_buffer/client/gles2_interface.h"
@@ -565,6 +566,12 @@ void RenderWidgetHostViewAndroid::WasResized() {
host_->WasResized();
}
+void RenderWidgetHostViewAndroid::OnFullscreenStateChanged(
+ bool entered_fullscreen) {
+ web_contents_is_fullscreen_ = entered_fullscreen;
+ UpdateFullscreenState(false);
+}
+
void RenderWidgetHostViewAndroid::SetSize(const gfx::Size& size) {
// Ignore the given size as only the Java code has the power to
// resize the view on Android.
@@ -1184,6 +1191,64 @@ void RenderWidgetHostViewAndroid::DidCreateNewRendererCompositorFrameSink(
surface_returned_resources_.clear();
}
+void RenderWidgetHostViewAndroid::UpdateFullscreenState(
+ bool physical_backing_resized) {
+ if (!base::FeatureList::IsEnabled(features::kHideFullscreenTransitionJank))
+ return;
+
+ bool mismatched_fullscreen_states =
+ web_contents_is_fullscreen_ != current_frame_is_fullscreen_;
+ bool mismatched_sizes =
+ view_.GetPhysicalBackingSize() != current_surface_size_;
+
+ if (physical_backing_resized)
+ fullscreen_transition_awaiting_resize_ = false;
+
+ switch (fullscreen_state_) {
+ // From kNotFullscreen, we transition to kEnteringFullscreen whenever the
+ // fullscreen state changes.
+ case FullscreenState::kNotFullscreen:
+ if (mismatched_fullscreen_states) {
+ DCHECK(web_contents_is_fullscreen_);
+ DCHECK(!physical_backing_resized);
+ fullscreen_state_ = FullscreenState::kEnteringFullscreen;
+ fullscreen_transition_awaiting_resize_ = true;
+ }
+ break;
+ // From kFullscreen, we transition to kExitingFullscreen on a fullscreen
+ // state change, or to kFullscreenRotation if we get a new size.
+ case FullscreenState::kFullscreen:
+ if (mismatched_fullscreen_states) {
+ DCHECK(!web_contents_is_fullscreen_);
+ DCHECK(!physical_backing_resized);
+ fullscreen_state_ = FullscreenState::kExitingFullscreen;
+ fullscreen_transition_awaiting_resize_ = true;
+ }
+ if (mismatched_sizes)
aelias_OOO_until_Jul13 2017/06/16 22:46:40 "else". I don't think ExitingFullscreen being clo
steimel 2017/06/16 23:24:12 Good point. done.
+ fullscreen_state_ = FullscreenState::kFullscreenRotation;
+ break;
+ // From any transition state, once we receive a "good" frame we transition
+ // to the proper "good" state.
+ case FullscreenState::kExitingFullscreen:
+ case FullscreenState::kEnteringFullscreen:
+ case FullscreenState::kFullscreenRotation:
+ if (!mismatched_fullscreen_states && !mismatched_sizes &&
+ !fullscreen_transition_awaiting_resize_) {
+ fullscreen_state_ = web_contents_is_fullscreen_
+ ? FullscreenState::kFullscreen
+ : FullscreenState::kNotFullscreen;
+ }
+ break;
+ }
+
+ if (fullscreen_state_ == FullscreenState::kEnteringFullscreen ||
+ fullscreen_state_ == FullscreenState::kExitingFullscreen ||
+ fullscreen_state_ == FullscreenState::kFullscreenRotation) {
+ EvictDelegatedFrame();
aelias_OOO_until_Jul13 2017/06/16 22:46:40 This only needs to happen in SubmitCompositorFrame
steimel 2017/06/16 23:24:12 No, this needs to happen regardless of where Updat
aelias_OOO_until_Jul13 2017/06/17 01:18:34 I'd still rather it be broken out and called in mu
Khushal 2017/06/19 18:46:34 The physical backing size change is the main trigg
steimel 2017/06/22 01:32:11 Done.
+ UpdateBackgroundColor(SK_ColorBLACK);
aelias_OOO_until_Jul13 2017/06/16 22:46:41 Please change the main UpdateBackgroundColor call
steimel 2017/06/16 23:24:12 If we're not coming from a SubmitCompositorFrame c
aelias_OOO_until_Jul13 2017/06/17 01:18:34 Is transparency equally good as black for your pur
liberato (no reviews please) 2017/06/19 13:26:37 aside: i'm decoupling uses of is_transparent_backg
Khushal 2017/06/19 18:46:34 Transparency is only used when the video is being
aelias_OOO_until_Jul13 2017/06/19 19:01:32 I'd be interested in hearing whether or not we see
liberato (no reviews please) 2017/06/19 20:22:29 re "transparency is needed... controls visible".
+ }
+}
+
void RenderWidgetHostViewAndroid::SubmitCompositorFrame(
const cc::LocalSurfaceId& local_surface_id,
cc::CompositorFrame frame) {
@@ -1197,6 +1262,7 @@ void RenderWidgetHostViewAndroid::SubmitCompositorFrame(
cc::RenderPass* root_pass = frame.render_pass_list.back().get();
current_surface_size_ = root_pass->output_rect.size();
+ current_frame_is_fullscreen_ = frame.metadata.is_fullscreen;
aelias_OOO_until_Jul13 2017/06/16 22:46:40 Please move this to OnFrameMetadataUpdated.
steimel 2017/06/16 23:24:12 Done.
bool is_transparent = root_pass->has_transparent_background;
cc::CompositorFrameMetadata metadata = frame.metadata.Clone();
@@ -1228,6 +1294,8 @@ void RenderWidgetHostViewAndroid::SubmitCompositorFrame(
// As the metadata update may trigger view invalidation, always call it after
// any potential compositor scheduling.
OnFrameMetadataUpdated(std::move(metadata), is_transparent);
+
+ UpdateFullscreenState(false);
aelias_OOO_until_Jul13 2017/06/16 22:46:40 Please move this call to OnFrameMetadataUpdated.
steimel 2017/06/16 23:24:12 Done with first part. Second part discussed above
}
void RenderWidgetHostViewAndroid::DestroyDelegatedContent() {
@@ -1243,6 +1311,7 @@ void RenderWidgetHostViewAndroid::DestroyDelegatedContent() {
frame_evictor_->DiscardedFrame();
delegated_frame_host_->DestroyDelegatedContent();
+ current_surface_size_.SetSize(0, 0);
}
void RenderWidgetHostViewAndroid::OnDidNotProduceFrame(
@@ -1930,6 +1999,12 @@ SkColor RenderWidgetHostViewAndroid::GetCachedBackgroundColor() const {
return cached_background_color_;
}
+bool RenderWidgetHostViewAndroid::CanShowThumbnailPlaceholder() const {
aelias_OOO_until_Jul13 2017/06/16 22:46:41 I'd prefer this to be called IsInFullscreenTransit
steimel 2017/06/16 23:24:12 It's a bit tricky, since yes, CanShowThumbnailPlac
steimel 2017/06/20 21:28:35 This is method getting removed in the next patch
+ return !(fullscreen_state_ == FullscreenState::kEnteringFullscreen ||
+ fullscreen_state_ == FullscreenState::kExitingFullscreen ||
+ fullscreen_state_ == FullscreenState::kFullscreenRotation);
+}
+
void RenderWidgetHostViewAndroid::SetIsInVR(bool is_in_vr) {
is_in_vr_ = is_in_vr;
}
@@ -2059,6 +2134,9 @@ void RenderWidgetHostViewAndroid::OnGestureEvent(
}
void RenderWidgetHostViewAndroid::OnPhysicalBackingSizeChanged() {
+ // If we're entering a fullscreen transition, show black until the transition
+ // is completed.
+ UpdateFullscreenState(true);
aelias_OOO_until_Jul13 2017/06/16 22:46:40 Simpler to remove "physical_backing_resized" argum
steimel 2017/06/16 23:24:12 Done.
WasResized();
}

Powered by Google App Engine
This is Rietveld 408576698