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

Side by Side Diff: cc/output/overlay_unittest.cc

Issue 1314943008: cc: Remove implicit conversions from Rect to RectF in src/cc/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/base/scoped_ptr_vector.h" 5 #include "cc/base/scoped_ptr_vector.h"
6 #include "cc/output/compositor_frame_metadata.h" 6 #include "cc/output/compositor_frame_metadata.h"
7 #include "cc/output/gl_renderer.h" 7 #include "cc/output/gl_renderer.h"
8 #include "cc/output/output_surface.h" 8 #include "cc/output/output_surface.h"
9 #include "cc/output/output_surface_client.h" 9 #include "cc/output/output_surface_client.h"
10 #include "cc/output/overlay_candidate_validator.h" 10 #include "cc/output/overlay_candidate_validator.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 public: 56 public:
57 void CheckOverlaySupport(OverlayCandidateList* surfaces) override; 57 void CheckOverlaySupport(OverlayCandidateList* surfaces) override;
58 }; 58 };
59 59
60 void SingleOverlayValidator::CheckOverlaySupport( 60 void SingleOverlayValidator::CheckOverlaySupport(
61 OverlayCandidateList* surfaces) { 61 OverlayCandidateList* surfaces) {
62 ASSERT_EQ(2U, surfaces->size()); 62 ASSERT_EQ(2U, surfaces->size());
63 63
64 OverlayCandidate& candidate = surfaces->back(); 64 OverlayCandidate& candidate = surfaces->back();
65 if (candidate.display_rect.width() == 64) { 65 if (candidate.display_rect.width() == 64) {
66 EXPECT_EQ(kOverlayBottomRightRect, candidate.display_rect); 66 EXPECT_EQ(gfx::RectF(kOverlayBottomRightRect), candidate.display_rect);
67 } else { 67 } else {
68 EXPECT_NEAR(kOverlayRect.x(), candidate.display_rect.x(), 0.01f); 68 EXPECT_NEAR(kOverlayRect.x(), candidate.display_rect.x(), 0.01f);
69 EXPECT_NEAR(kOverlayRect.y(), candidate.display_rect.y(), 0.01f); 69 EXPECT_NEAR(kOverlayRect.y(), candidate.display_rect.y(), 0.01f);
70 EXPECT_NEAR(kOverlayRect.width(), candidate.display_rect.width(), 0.01f); 70 EXPECT_NEAR(kOverlayRect.width(), candidate.display_rect.width(), 0.01f);
71 EXPECT_NEAR(kOverlayRect.height(), candidate.display_rect.height(), 0.01f); 71 EXPECT_NEAR(kOverlayRect.height(), candidate.display_rect.height(), 0.01f);
72 } 72 }
73 EXPECT_EQ(BoundingRect(kUVTopLeft, kUVBottomRight).ToString(), 73 EXPECT_EQ(BoundingRect(kUVTopLeft, kUVBottomRight).ToString(),
74 candidate.uv_rect.ToString()); 74 candidate.uv_rect.ToString());
75 candidate.overlay_handled = true; 75 candidate.overlay_handled = true;
76 } 76 }
(...skipping 1088 matching lines...) Expand 10 before | Expand all | Expand 10 after
1165 renderer_->BeginDrawingFrame(&frame3); 1165 renderer_->BeginDrawingFrame(&frame3);
1166 renderer_->FinishDrawingFrame(&frame3); 1166 renderer_->FinishDrawingFrame(&frame3);
1167 EXPECT_TRUE(resource_provider_->InUseByConsumer(resource1)); 1167 EXPECT_TRUE(resource_provider_->InUseByConsumer(resource1));
1168 SwapBuffers(); 1168 SwapBuffers();
1169 EXPECT_FALSE(resource_provider_->InUseByConsumer(resource1)); 1169 EXPECT_FALSE(resource_provider_->InUseByConsumer(resource1));
1170 Mock::VerifyAndClearExpectations(&scheduler_); 1170 Mock::VerifyAndClearExpectations(&scheduler_);
1171 } 1171 }
1172 1172
1173 } // namespace 1173 } // namespace
1174 } // namespace cc 1174 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698