| 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 "ash/common/shell_window_ids.h" | 5 #include "ash/common/shell_window_ids.h" |
| 6 #include "components/exo/buffer.h" | 6 #include "components/exo/buffer.h" |
| 7 #include "components/exo/display.h" | 7 #include "components/exo/display.h" |
| 8 #include "components/exo/shared_memory.h" | 8 #include "components/exo/shared_memory.h" |
| 9 #include "components/exo/shell_surface.h" | 9 #include "components/exo/shell_surface.h" |
| 10 #include "components/exo/sub_surface.h" | 10 #include "components/exo/sub_surface.h" |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 display->CreateSharedMemory(handle, shm_size); | 48 display->CreateSharedMemory(handle, shm_size); |
| 49 EXPECT_TRUE(shm1); | 49 EXPECT_TRUE(shm1); |
| 50 | 50 |
| 51 // Creating a shared memory instance from a invalid handle should fail. | 51 // Creating a shared memory instance from a invalid handle should fail. |
| 52 std::unique_ptr<SharedMemory> shm2 = | 52 std::unique_ptr<SharedMemory> shm2 = |
| 53 display->CreateSharedMemory(base::SharedMemoryHandle(), shm_size); | 53 display->CreateSharedMemory(base::SharedMemoryHandle(), shm_size); |
| 54 EXPECT_FALSE(shm2); | 54 EXPECT_FALSE(shm2); |
| 55 } | 55 } |
| 56 | 56 |
| 57 #if defined(USE_OZONE) | 57 #if defined(USE_OZONE) |
| 58 TEST_F(DisplayTest, CreateLinuxDMABufBuffer) { | 58 // The test crashes: crbug.com/622724 |
| 59 TEST_F(DisplayTest, DISABLED_CreateLinuxDMABufBuffer) { |
| 59 const gfx::Size buffer_size(256, 256); | 60 const gfx::Size buffer_size(256, 256); |
| 60 | 61 |
| 61 std::unique_ptr<Display> display(new Display); | 62 std::unique_ptr<Display> display(new Display); |
| 62 | |
| 63 // Creating a prime buffer from a native pixmap handle should succeed. | 63 // Creating a prime buffer from a native pixmap handle should succeed. |
| 64 scoped_refptr<ui::NativePixmap> pixmap = | 64 scoped_refptr<ui::NativePixmap> pixmap = |
| 65 ui::OzonePlatform::GetInstance() | 65 ui::OzonePlatform::GetInstance() |
| 66 ->GetSurfaceFactoryOzone() | 66 ->GetSurfaceFactoryOzone() |
| 67 ->CreateNativePixmap(gfx::kNullAcceleratedWidget, buffer_size, | 67 ->CreateNativePixmap(gfx::kNullAcceleratedWidget, buffer_size, |
| 68 gfx::BufferFormat::RGBA_8888, | 68 gfx::BufferFormat::RGBA_8888, |
| 69 gfx::BufferUsage::GPU_READ); | 69 gfx::BufferUsage::GPU_READ); |
| 70 gfx::NativePixmapHandle native_pixmap_handle = pixmap->ExportHandle(); | 70 gfx::NativePixmapHandle native_pixmap_handle = pixmap->ExportHandle(); |
| 71 std::vector<int> strides; | 71 std::vector<int> strides; |
| 72 std::vector<int> offsets; | 72 std::vector<int> offsets; |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 220 // Attempting to create a sub surface for parent with grandchild as its parent | 220 // Attempting to create a sub surface for parent with grandchild as its parent |
| 221 // should fail. | 221 // should fail. |
| 222 EXPECT_FALSE(display->CreateSubSurface(parent.get(), grandchild.get())); | 222 EXPECT_FALSE(display->CreateSubSurface(parent.get(), grandchild.get())); |
| 223 | 223 |
| 224 // Create a sub surface for parent. | 224 // Create a sub surface for parent. |
| 225 EXPECT_TRUE(display->CreateSubSurface(parent.get(), toplevel.get())); | 225 EXPECT_TRUE(display->CreateSubSurface(parent.get(), toplevel.get())); |
| 226 } | 226 } |
| 227 | 227 |
| 228 } // namespace | 228 } // namespace |
| 229 } // namespace exo | 229 } // namespace exo |
| OLD | NEW |