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

Unified Diff: cc/layer_tree_host_unittest_context.cc

Issue 11941010: Fix scrollbars missing after lost context (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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
« no previous file with comments | « no previous file | cc/scrollbar_layer.cc » ('j') | cc/scrollbar_layer_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layer_tree_host_unittest_context.cc
diff --git a/cc/layer_tree_host_unittest_context.cc b/cc/layer_tree_host_unittest_context.cc
index cf9da18e157841235735795b9c6e071adb73c733..fe9416597b257d3e73e6a5deea665034d092f0db 100644
--- a/cc/layer_tree_host_unittest_context.cc
+++ b/cc/layer_tree_host_unittest_context.cc
@@ -30,6 +30,7 @@
#include "cc/texture_layer.h"
#include "cc/video_layer.h"
#include "cc/video_layer_impl.h"
+#include "gpu/GLES2/gl2extchromium.h"
#include "media/base/media.h"
using media::VideoFrame;
@@ -53,7 +54,8 @@ class LayerTreeHostContextTest : public ThreadedTest {
}
void LoseContext() {
- context3d_->loseContextCHROMIUM();
+ context3d_->loseContextCHROMIUM(GL_GUILTY_CONTEXT_RESET_ARB,
+ GL_INNOCENT_CONTEXT_RESET_ARB);
context3d_ = NULL;
}
@@ -803,7 +805,8 @@ class LayerTreeHostContextTestFailsImmediately :
virtual scoped_ptr<FakeWebGraphicsContext3D> CreateContext3d() OVERRIDE {
scoped_ptr<FakeWebGraphicsContext3D> context =
LayerTreeHostContextTest::CreateContext3d();
- context->loseContextCHROMIUM();
+ context->loseContextCHROMIUM(GL_GUILTY_CONTEXT_RESET_ARB,
+ GL_INNOCENT_CONTEXT_RESET_ARB);
return context.Pass();
}
« no previous file with comments | « no previous file | cc/scrollbar_layer.cc » ('j') | cc/scrollbar_layer_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698