gpu/command_buffer/tests/gl_unittests_android.cc - Issue 16907002: Update Android to use scoped_refptr<T>::get() rather than implicit "operator T*"

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: gpu/command_buffer/tests/gl_unittests_android.cc

Issue 16907002: Update Android to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased Created 7 years, 6 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 | Annotate | Revision Log

« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | media/base/android/media_player_listener.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2013 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 <GLES2/gl2.h>	5 #include <GLES2/gl2.h>

6 #include <GLES2/gl2ext.h>	6 #include <GLES2/gl2ext.h>

7	7

8 #include <android/native_window_jni.h>	8 #include <android/native_window_jni.h>

9	9

10 #include "base/bind.h"	10 #include "base/bind.h"

(...skipping 29 matching lines...) Expand all Loading...
40	40

41 scoped_refptr<gfx::SurfaceTextureBridge> surface_texture(	41 scoped_refptr<gfx::SurfaceTextureBridge> surface_texture(

42 new gfx::SurfaceTextureBridge(texture));	42 new gfx::SurfaceTextureBridge(texture));

43 gfx::AcceleratedWidget window = surface_texture->CreateSurface();	43 gfx::AcceleratedWidget window = surface_texture->CreateSurface();

44 EXPECT_TRUE(window != NULL);	44 EXPECT_TRUE(window != NULL);

45	45

46 scoped_refptr<gfx::GLSurface> gl_surface =	46 scoped_refptr<gfx::GLSurface> gl_surface =

47 gfx::GLSurface::CreateViewGLSurface(false, window);	47 gfx::GLSurface::CreateViewGLSurface(false, window);

48 EXPECT_TRUE(gl_surface.get() != NULL);	48 EXPECT_TRUE(gl_surface.get() != NULL);

49	49

50 gl_.SetSurface(gl_surface);	50 gl_.SetSurface(gl_surface.get());

51	51

52 glClearColor(0.0f, 1.0f, 0.0f, 1.0f);	52 glClearColor(0.0f, 1.0f, 0.0f, 1.0f);

53 glClear(GL_COLOR_BUFFER_BIT);	53 glClear(GL_COLOR_BUFFER_BIT);

54 // glSwapBuffers();	54 // glSwapBuffers();

55	55

56 surface_texture->UpdateTexImage();	56 surface_texture->UpdateTexImage();

57	57

58 GLTestHelper::CheckGLError("no errors", __LINE__);	58 GLTestHelper::CheckGLError("no errors", __LINE__);

59	59

60 ANativeWindow_release(window);	60 ANativeWindow_release(window);

61 }	61 }

62	62

63 } // namespace gpu	63 } // namespace gpu

64	64

OLD	NEW