| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/mus/demo/mus_demo.h" | 5 #include "services/ui/demo/mus_demo.h" |
| 6 | 6 |
| 7 #include "base/time/time.h" | 7 #include "base/time/time.h" |
| 8 #include "components/bitmap_uploader/bitmap_uploader.h" | 8 #include "components/bitmap_uploader/bitmap_uploader.h" |
| 9 #include "components/mus/common/gpu_service.h" | |
| 10 #include "components/mus/public/cpp/window.h" | |
| 11 #include "components/mus/public/cpp/window_tree_client.h" | |
| 12 #include "services/shell/public/cpp/connector.h" | 9 #include "services/shell/public/cpp/connector.h" |
| 10 #include "services/ui/common/gpu_service.h" |
| 11 #include "services/ui/public/cpp/window.h" |
| 12 #include "services/ui/public/cpp/window_tree_client.h" |
| 13 #include "third_party/skia/include/core/SkCanvas.h" | 13 #include "third_party/skia/include/core/SkCanvas.h" |
| 14 #include "third_party/skia/include/core/SkColor.h" | 14 #include "third_party/skia/include/core/SkColor.h" |
| 15 #include "third_party/skia/include/core/SkImageInfo.h" | 15 #include "third_party/skia/include/core/SkImageInfo.h" |
| 16 #include "third_party/skia/include/core/SkPaint.h" | 16 #include "third_party/skia/include/core/SkPaint.h" |
| 17 #include "third_party/skia/include/core/SkRect.h" | 17 #include "third_party/skia/include/core/SkRect.h" |
| 18 #include "ui/gfx/geometry/rect.h" | 18 #include "ui/gfx/geometry/rect.h" |
| 19 | 19 |
| 20 namespace mus_demo { | 20 namespace mus_demo { |
| 21 | 21 |
| 22 namespace { | 22 namespace { |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 170 std::unique_ptr<std::vector<unsigned char>> data( | 170 std::unique_ptr<std::vector<unsigned char>> data( |
| 171 new std::vector<unsigned char>(addr, addr + bytes)); | 171 new std::vector<unsigned char>(addr, addr + bytes)); |
| 172 bitmap_.unlockPixels(); | 172 bitmap_.unlockPixels(); |
| 173 | 173 |
| 174 // Send frame to MUS via BitmapUploader. | 174 // Send frame to MUS via BitmapUploader. |
| 175 uploader_->SetBitmap(bounds.width(), bounds.height(), std::move(data), | 175 uploader_->SetBitmap(bounds.width(), bounds.height(), std::move(data), |
| 176 bitmap_uploader::BitmapUploader::BGRA); | 176 bitmap_uploader::BitmapUploader::BGRA); |
| 177 } | 177 } |
| 178 | 178 |
| 179 } // namespace mus_demo | 179 } // namespace mus_demo |
| OLD | NEW |