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

Unified Diff: cc/surfaces/display.cc

Issue 2377533002: cc: Remove Display::SetExternalViewport. (Closed)
Patch Set: webview-expand-sw: rebase Created 4 years, 2 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
« no previous file with comments | « cc/surfaces/display.h ('k') | content/renderer/android/synchronous_compositor_frame_sink.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/surfaces/display.cc
diff --git a/cc/surfaces/display.cc b/cc/surfaces/display.cc
index 585ac0c66fa24441322f4a610586043810c13c79..24f521dcef01e519fc938e27797764269748f85c 100644
--- a/cc/surfaces/display.cc
+++ b/cc/surfaces/display.cc
@@ -146,14 +146,6 @@ void Display::SetColorSpace(const gfx::ColorSpace& color_space) {
device_color_space_ = color_space;
}
-void Display::SetExternalClip(const gfx::Rect& clip) {
- external_clip_ = clip;
-}
-
-void Display::SetExternalViewport(const gfx::Rect& viewport) {
- external_viewport_ = viewport;
-}
-
void Display::SetOutputIsSecure(bool secure) {
if (secure == output_is_secure_)
return;
@@ -297,11 +289,8 @@ bool Display::DrawAndSwap() {
client_->DisplayWillDrawAndSwap(should_draw, frame_data->render_pass_list);
if (should_draw) {
- gfx::Rect device_viewport_rect = external_viewport_.IsEmpty()
- ? gfx::Rect(current_surface_size_)
- : external_viewport_;
- gfx::Rect device_clip_rect =
- external_clip_.IsEmpty() ? device_viewport_rect : external_clip_;
+ gfx::Rect device_viewport_rect(current_surface_size_);
+ gfx::Rect device_clip_rect(current_surface_size_);
bool disable_image_filtering =
frame.metadata.is_resourceless_software_draw_with_scroll_or_animation;
« no previous file with comments | « cc/surfaces/display.h ('k') | content/renderer/android/synchronous_compositor_frame_sink.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698