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

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

Issue 2658293002: content: Remove Lock/Unlock CompositingSurface API from RWH. (Closed)
Patch Set: last_frame_info Created 3 years, 11 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.h
diff --git a/content/browser/renderer_host/render_widget_host_view_android.h b/content/browser/renderer_host/render_widget_host_view_android.h
index 96b806cc57786dcb412ae44261e65586622b440a..265dac382f48e4f4ed1c7c6533d4ab25acfd53f8 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.h
+++ b/content/browser/renderer_host/render_widget_host_view_android.h
@@ -146,8 +146,6 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
const SkBitmap& zoomed_bitmap) override;
std::unique_ptr<SyntheticGestureTarget> CreateSyntheticGestureTarget()
override;
- void LockCompositingSurface() override;
- void UnlockCompositingSurface() override;
void OnDidNavigateMainFrameToNewPage() override;
void SetNeedsBeginFrames(bool needs_begin_frames) override;
@@ -279,11 +277,6 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
const ReadbackRequestCallback& callback,
const SkColorType color_type);
- // If we have locks on a frame during a ContentViewCore swap or a context
- // lost, the frame is no longer valid and we can safely release all the locks.
- // Use this method to release all the locks.
- void ReleaseLocksOnSurface();
-
// Drop any incoming frames from the renderer when there are locks on the
// current frame.
void RetainFrame(uint32_t compositor_frame_sink_id,
@@ -381,19 +374,8 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
std::unique_ptr<DelegatedFrameEvictor> frame_evictor_;
- size_t locks_on_frame_count_;
bool observing_root_window_;
- struct LastFrameInfo {
- LastFrameInfo(uint32_t compositor_frame_sink_id,
- cc::CompositorFrame output_frame);
- ~LastFrameInfo();
- uint32_t compositor_frame_sink_id;
- cc::CompositorFrame frame;
- };
-
- std::unique_ptr<LastFrameInfo> last_frame_info_;
-
// The last scroll offset of the view.
gfx::Vector2dF last_scroll_offset_;

Powered by Google App Engine
This is Rietveld 408576698