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

Side by Side Diff: components/exo/display_unittest.cc

Issue 2768343002: Change namespace from ui to gfx for NativePixmap related code (Closed)
Patch Set: Addressed sadrul's remark Created 3 years, 9 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
« no previous file with comments | « no previous file | content/browser/browser_main_loop.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/public/cpp/shell_window_ids.h" 5 #include "ash/public/cpp/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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 EXPECT_FALSE(shm2); 54 EXPECT_FALSE(shm2);
55 } 55 }
56 56
57 #if defined(USE_OZONE) 57 #if defined(USE_OZONE)
58 // The test crashes: crbug.com/622724 58 // The test crashes: crbug.com/622724
59 TEST_F(DisplayTest, DISABLED_CreateLinuxDMABufBuffer) { 59 TEST_F(DisplayTest, DISABLED_CreateLinuxDMABufBuffer) {
60 const gfx::Size buffer_size(256, 256); 60 const gfx::Size buffer_size(256, 256);
61 61
62 std::unique_ptr<Display> display(new Display); 62 std::unique_ptr<Display> display(new Display);
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<gfx::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<gfx::NativePixmapPlane> planes; 71 std::vector<gfx::NativePixmapPlane> planes;
72 std::vector<base::ScopedFD> fds; 72 std::vector<base::ScopedFD> fds;
73 planes.push_back(native_pixmap_handle.planes[0]); 73 planes.push_back(native_pixmap_handle.planes[0]);
74 fds.push_back(base::ScopedFD(native_pixmap_handle.fds[0].fd)); 74 fds.push_back(base::ScopedFD(native_pixmap_handle.fds[0].fd));
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 // Attempting to create a sub surface for parent with grandchild as its parent 217 // Attempting to create a sub surface for parent with grandchild as its parent
218 // should fail. 218 // should fail.
219 EXPECT_FALSE(display->CreateSubSurface(parent.get(), grandchild.get())); 219 EXPECT_FALSE(display->CreateSubSurface(parent.get(), grandchild.get()));
220 220
221 // Create a sub surface for parent. 221 // Create a sub surface for parent.
222 EXPECT_TRUE(display->CreateSubSurface(parent.get(), toplevel.get())); 222 EXPECT_TRUE(display->CreateSubSurface(parent.get(), toplevel.get()));
223 } 223 }
224 224
225 } // namespace 225 } // namespace
226 } // namespace exo 226 } // namespace exo
OLDNEW
« no previous file with comments | « no previous file | content/browser/browser_main_loop.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698