| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "components/exo/surface.h" | 5 #include "components/exo/surface.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/callback_helpers.h" | 9 #include "base/callback_helpers.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 544 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 555 cursor_providers_.insert(provider); | 555 cursor_providers_.insert(provider); |
| 556 } | 556 } |
| 557 | 557 |
| 558 void Surface::UnregisterCursorProvider(Pointer* provider) { | 558 void Surface::UnregisterCursorProvider(Pointer* provider) { |
| 559 cursor_providers_.erase(provider); | 559 cursor_providers_.erase(provider); |
| 560 } | 560 } |
| 561 | 561 |
| 562 gfx::NativeCursor Surface::GetCursor() { | 562 gfx::NativeCursor Surface::GetCursor() { |
| 563 // What cursor we display when we have multiple cursor providers is not | 563 // What cursor we display when we have multiple cursor providers is not |
| 564 // important. Return the first non-null cursor. | 564 // important. Return the first non-null cursor. |
| 565 for (const auto& cursor_provider : cursor_providers_) { | 565 for (auto* cursor_provider : cursor_providers_) { |
| 566 gfx::NativeCursor cursor = cursor_provider->GetCursor(); | 566 gfx::NativeCursor cursor = cursor_provider->GetCursor(); |
| 567 if (cursor != ui::kCursorNull) | 567 if (cursor != ui::kCursorNull) |
| 568 return cursor; | 568 return cursor; |
| 569 } | 569 } |
| 570 return ui::kCursorNull; | 570 return ui::kCursorNull; |
| 571 } | 571 } |
| 572 | 572 |
| 573 void Surface::SetSurfaceDelegate(SurfaceDelegate* delegate) { | 573 void Surface::SetSurfaceDelegate(SurfaceDelegate* delegate) { |
| 574 DCHECK(!delegate_ || !delegate); | 574 DCHECK(!delegate_ || !delegate); |
| 575 delegate_ = delegate; | 575 delegate_ = delegate; |
| (...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 829 render_pass->CreateAndAppendDrawQuad<cc::SolidColorDrawQuad>(); | 829 render_pass->CreateAndAppendDrawQuad<cc::SolidColorDrawQuad>(); |
| 830 solid_quad->SetNew(quad_state, quad_rect, quad_rect, SK_ColorBLACK, false); | 830 solid_quad->SetNew(quad_state, quad_rect, quad_rect, SK_ColorBLACK, false); |
| 831 } | 831 } |
| 832 | 832 |
| 833 frame.render_pass_list.push_back(std::move(render_pass)); | 833 frame.render_pass_list.push_back(std::move(render_pass)); |
| 834 compositor_frame_sink_holder_->GetCompositorFrameSink() | 834 compositor_frame_sink_holder_->GetCompositorFrameSink() |
| 835 ->SubmitCompositorFrame(local_surface_id_, std::move(frame)); | 835 ->SubmitCompositorFrame(local_surface_id_, std::move(frame)); |
| 836 } | 836 } |
| 837 | 837 |
| 838 } // namespace exo | 838 } // namespace exo |
| OLD | NEW |