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

Unified Diff: ui/gl/gl_image_shared_memory_unittest.cc

Issue 1484473003: gl, ozone: enable GLImageBindTest unittests Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: ui/gl/gl_image_shared_memory_unittest.cc
diff --git a/ui/gl/gl_image_shared_memory_unittest.cc b/ui/gl/gl_image_shared_memory_unittest.cc
index da6feac37d4040512eafc5fa1b290c9312c5a82b..5bf4874e2912d19ca3afd19f9ec6fe5f46445137 100644
--- a/ui/gl/gl_image_shared_memory_unittest.cc
+++ b/ui/gl/gl_image_shared_memory_unittest.cc
@@ -6,6 +6,7 @@
#include "base/sys_info.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gl/gl_image_shared_memory.h"
+#include "ui/gl/gl_utils.h"
#include "ui/gl/test/gl_image_test_template.h"
namespace gl {
@@ -26,8 +27,8 @@ class GLImageSharedMemoryTestDelegate {
size.width(), size.height(),
static_cast<int>(RowSizeForBufferFormat(size.width(), format, 0)),
format, color, reinterpret_cast<uint8_t*>(shared_memory.memory()));
- scoped_refptr<gl::GLImageSharedMemory> image(new gl::GLImageSharedMemory(
- size, gl::GLImageMemory::GetInternalFormatForTesting(format)));
+ scoped_refptr<gl::GLImageSharedMemory> image(
+ new gl::GLImageSharedMemory(size, gl::GetTextureFormatFrom(format)));
rv = image->Initialize(
base::SharedMemory::DuplicateHandle(shared_memory.handle()),
gfx::GenericSharedMemoryId(0), format, 0,

Powered by Google App Engine
This is Rietveld 408576698