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

Side by Side Diff: ui/ozone/public/overlay_candidates_ozone.h

Issue 1110813002: Fix assert in GetOverlayRect when transforming video with Ozone overlay (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changes display_rect to float Created 5 years, 7 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
« cc/output/overlay_unittest.cc ('K') | « cc/output/overlay_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef UI_OZONE_PUBLIC_OVERLAY_CANDIDATES_OZONE_H_ 5 #ifndef UI_OZONE_PUBLIC_OVERLAY_CANDIDATES_OZONE_H_
6 #define UI_OZONE_PUBLIC_OVERLAY_CANDIDATES_OZONE_H_ 6 #define UI_OZONE_PUBLIC_OVERLAY_CANDIDATES_OZONE_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 10 matching lines...) Expand all
21 public: 21 public:
22 struct OverlaySurfaceCandidate { 22 struct OverlaySurfaceCandidate {
23 OverlaySurfaceCandidate(); 23 OverlaySurfaceCandidate();
24 ~OverlaySurfaceCandidate(); 24 ~OverlaySurfaceCandidate();
25 25
26 // Transformation to apply to layer during composition. 26 // Transformation to apply to layer during composition.
27 gfx::OverlayTransform transform; 27 gfx::OverlayTransform transform;
28 // Format of the buffer to composite. 28 // Format of the buffer to composite.
29 SurfaceFactoryOzone::BufferFormat format; 29 SurfaceFactoryOzone::BufferFormat format;
30 // Rect on the display to position the overlay to. 30 // Rect on the display to position the overlay to.
31 gfx::Rect display_rect; 31 gfx::RectF display_rect;
32 // Crop within the buffer to be placed inside |display_rect|. 32 // Crop within the buffer to be placed inside |display_rect|.
33 gfx::RectF crop_rect; 33 gfx::RectF crop_rect;
34 // Stacking order of the overlay plane relative to the main surface, 34 // Stacking order of the overlay plane relative to the main surface,
35 // which is 0. Signed to allow for "underlays". 35 // which is 0. Signed to allow for "underlays".
36 int plane_z_order; 36 int plane_z_order;
37 37
38 // To be modified by the implementer if this candidate can go into 38 // To be modified by the implementer if this candidate can go into
39 // an overlay. 39 // an overlay.
40 bool overlay_handled; 40 bool overlay_handled;
41 }; 41 };
42 42
43 typedef std::vector<OverlaySurfaceCandidate> OverlaySurfaceCandidateList; 43 typedef std::vector<OverlaySurfaceCandidate> OverlaySurfaceCandidateList;
44 44
45 // A list of possible overlay candidates is presented to this function. 45 // A list of possible overlay candidates is presented to this function.
46 // The expected result is that those candidates that can be in a separate 46 // The expected result is that those candidates that can be in a separate
47 // plane are marked with |overlay_handled| set to true, otherwise they are 47 // plane are marked with |overlay_handled| set to true, otherwise they are
48 // to be tranditionally composited. 48 // to be tranditionally composited.
49 virtual void CheckOverlaySupport(OverlaySurfaceCandidateList* surfaces); 49 virtual void CheckOverlaySupport(OverlaySurfaceCandidateList* surfaces);
50 50
51 virtual ~OverlayCandidatesOzone(); 51 virtual ~OverlayCandidatesOzone();
52 }; 52 };
53 53
54 } // namespace ui 54 } // namespace ui
55 55
56 #endif // UI_OZONE_PUBLIC_OVERLAY_CANDIDATES_OZONE_H_ 56 #endif // UI_OZONE_PUBLIC_OVERLAY_CANDIDATES_OZONE_H_
OLDNEW
« cc/output/overlay_unittest.cc ('K') | « cc/output/overlay_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698