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

Unified Diff: cc/test/layer_tree_pixel_test.h

Issue 171363008: cc: Make cc_unittests opt into real GL NullDraw contexts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: cc/test/layer_tree_pixel_test.h
diff --git a/cc/test/layer_tree_pixel_test.h b/cc/test/layer_tree_pixel_test.h
index 426cd023bc669899feea17d5abf88b76e5b63755..0c29e95dc4e84819f3243e5115d21c8e057dcc9c 100644
--- a/cc/test/layer_tree_pixel_test.h
+++ b/cc/test/layer_tree_pixel_test.h
@@ -2,6 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#ifndef CC_TEST_LAYER_TREE_PIXEL_TEST_H_
+#define CC_TEST_LAYER_TREE_PIXEL_TEST_H_
+
#include <vector>
#include "base/files/file_path.h"
@@ -9,9 +12,7 @@
#include "base/memory/scoped_ptr.h"
#include "cc/resources/single_release_callback.h"
#include "cc/test/layer_tree_test.h"
-
-#ifndef CC_TEST_LAYER_TREE_PIXEL_TEST_H_
-#define CC_TEST_LAYER_TREE_PIXEL_TEST_H_
+#include "ui/gl/gl_implementation.h"
class SkBitmap;
@@ -95,6 +96,7 @@ class LayerTreePixelTest : public LayerTreeTest {
kCSSGreen = 0xff008000,
};
+ scoped_ptr<gfx::DisableNullDrawGLBindings> enable_pixel_output_;
enne (OOO) 2014/02/21 21:05:33 Could this just be a member, or does it need to be
danakj 2014/02/21 21:08:31 It means we'd toggle state in the GL bindings for
enne (OOO) 2014/02/21 21:11:37 That is a little weird. I could go either way.
danakj 2014/02/21 21:12:39 Well, I made the other one a simple member instead
scoped_ptr<PixelComparator> pixel_comparator_;
PixelTestType test_type_;
scoped_refptr<Layer> content_root_;

Powered by Google App Engine
This is Rietveld 408576698