| 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 "examples/ui/shapes/shapes_view.h" | 5 #include "examples/ui/shapes/shapes_view.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "third_party/skia/include/core/SkCanvas.h" | 9 #include "third_party/skia/include/core/SkCanvas.h" |
| 10 #include "third_party/skia/include/core/SkColor.h" | 10 #include "third_party/skia/include/core/SkColor.h" |
| 11 #include "third_party/skia/include/core/SkSurface.h" | 11 #include "third_party/skia/include/core/SkSurface.h" |
| 12 | 12 |
| 13 namespace examples { | 13 namespace examples { |
| 14 | 14 |
| 15 namespace { | 15 namespace { |
| 16 constexpr uint32_t kContentImageResourceId = 1; | 16 constexpr uint32_t kContentImageResourceId = 1; |
| 17 constexpr uint32_t kRootNodeId = mojo::gfx::composition::kSceneRootNodeId; | 17 constexpr uint32_t kRootNodeId = mojo::gfx::composition::kSceneRootNodeId; |
| 18 } // namespace | 18 } // namespace |
| 19 | 19 |
| 20 ShapesView::ShapesView( | 20 ShapesView::ShapesView( |
| 21 mojo::ApplicationImpl* app_impl, | 21 mojo::InterfaceHandle<mojo::ApplicationConnector> app_connector, |
| 22 mojo::InterfaceRequest<mojo::ui::ViewOwner> view_owner_request) | 22 mojo::InterfaceRequest<mojo::ui::ViewOwner> view_owner_request) |
| 23 : GaneshView(app_impl, view_owner_request.Pass(), "Shapes") {} | 23 : GaneshView(app_connector.Pass(), view_owner_request.Pass(), "Shapes") {} |
| 24 | 24 |
| 25 ShapesView::~ShapesView() {} | 25 ShapesView::~ShapesView() {} |
| 26 | 26 |
| 27 void ShapesView::OnPropertiesChanged( | 27 void ShapesView::OnPropertiesChanged( |
| 28 uint32_t old_scene_version, | 28 uint32_t old_scene_version, |
| 29 mojo::ui::ViewPropertiesPtr old_properties) { | 29 mojo::ui::ViewPropertiesPtr old_properties) { |
| 30 UpdateScene(); | 30 UpdateScene(); |
| 31 } | 31 } |
| 32 | 32 |
| 33 void ShapesView::UpdateScene() { | 33 void ShapesView::UpdateScene() { |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 SkRect rect = SkRect::MakeWH(size.width, size.height); | 83 SkRect rect = SkRect::MakeWH(size.width, size.height); |
| 84 rect.inset(10, 10); | 84 rect.inset(10, 10); |
| 85 canvas->drawRect(rect, paint); | 85 canvas->drawRect(rect, paint); |
| 86 | 86 |
| 87 paint.setColor(SK_ColorRED); | 87 paint.setColor(SK_ColorRED); |
| 88 paint.setFlags(SkPaint::kAntiAlias_Flag); | 88 paint.setFlags(SkPaint::kAntiAlias_Flag); |
| 89 canvas->drawCircle(50, 100, 100, paint); | 89 canvas->drawCircle(50, 100, 100, paint); |
| 90 } | 90 } |
| 91 | 91 |
| 92 } // namespace examples | 92 } // namespace examples |
| OLD | NEW |