diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-23 03:03:08 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-23 03:03:08 +0000 |
| commit | 6d9beebd5f1a713f86aacfdcc11550aae2f1875b (patch) | |
| tree | 25f3ea350085ec52c2545b05778702f19bf15683 /cc/test/layer_tree_pixel_test.cc | |
| parent | 8b68e2bd35dbe83be805a8665a264e977d66835c (diff) | |
| download | chromium_src-6d9beebd5f1a713f86aacfdcc11550aae2f1875b.zip chromium_src-6d9beebd5f1a713f86aacfdcc11550aae2f1875b.tar.gz chromium_src-6d9beebd5f1a713f86aacfdcc11550aae2f1875b.tar.bz2 | |
Revert 189820 "Lazy initialize WGC3DInProcessCommandBufferImpl". Causing checkfailures.
> Lazy initialize WGC3DInProcessCommandBufferImpl
>
> WGC3DInProcessCommandBufferImpl will be used in Android WebView synchronous
> draw artchitecture, where directl GL calls can be made only inside the android
> GL draw functor.
>
> This patch moves the Intialize logic of WGC3DInProcessCommandBufferImpl to
> makeContextCurrent, so the initilization GL calls are delayed until inside
> the GL draw functor. This also allows WGC3DInProcessCommandBufferImpl to be
> created on one thread and be used on a different thread where it is made
> current. This is a requirement for using it in threaded compositor.
>
> Also some clean ups:
> Remove the parent view context param. NULL is passed in everywhere.
> Make the attribute param const ref.
> Folded Initialize into constructor.
>
> BUG=179436
>
> Review URL: https://codereview.chromium.org/12908004
TBR=boliu@chromium.org
Review URL: https://codereview.chromium.org/12915008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189975 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/layer_tree_pixel_test.cc')
| -rw-r--r-- | cc/test/layer_tree_pixel_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/test/layer_tree_pixel_test.cc b/cc/test/layer_tree_pixel_test.cc index 897349e..79a0d39 100644 --- a/cc/test/layer_tree_pixel_test.cc +++ b/cc/test/layer_tree_pixel_test.cc @@ -23,8 +23,8 @@ scoped_ptr<OutputSurface> LayerTreePixelTest::CreateOutputSurface() { using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl; scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> context3d( - new WebGraphicsContext3DInProcessCommandBufferImpl( - WebKit::WebGraphicsContext3D::Attributes())); + new WebGraphicsContext3DInProcessCommandBufferImpl); + context3d->Initialize(WebKit::WebGraphicsContext3D::Attributes(), NULL); return make_scoped_ptr( new OutputSurface(context3d.PassAs<WebKit::WebGraphicsContext3D>())); } |