chrome/browser/android/vr_shell/ui_elements/textured_element.cc - Issue 2914623003: [VrShell] Centralize color handling and enable close button on fullscreen

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: chrome/browser/android/vr_shell/ui_elements/textured_element.cc

Issue 2914623003: [VrShell] Centralize color handling and enable close button on fullscreen (Closed)

Patch Set: adjust close button vertical a bit Created 3 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

« no previous file with comments | « chrome/browser/android/vr_shell/ui_elements/screen_dimmer.cc ('k') | chrome/browser/android/vr_shell/ui_scene.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2017 The Chromium Authors. All rights reserved.	1 // Copyright 2017 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 "chrome/browser/android/vr_shell/ui_elements/textured_element.h"	5 #include "chrome/browser/android/vr_shell/ui_elements/textured_element.h"

6	6

7 #include "base/trace_event/trace_event.h"	7 #include "base/trace_event/trace_event.h"

8 #include "cc/paint/skia_paint_canvas.h"	8 #include "cc/paint/skia_paint_canvas.h"

9 #include "chrome/browser/android/vr_shell/textures/ui_texture.h"	9 #include "chrome/browser/android/vr_shell/textures/ui_texture.h"

10 #include "chrome/browser/android/vr_shell/ui_element_renderer.h"	10 #include "chrome/browser/android/vr_shell/ui_element_renderer.h"

(...skipping 49 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
60 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);	60 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);

61 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);	61 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);

62 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);	62 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);

63 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);	63 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);

64 glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, pixmap.width(), pixmap.height(), 0,	64 glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, pixmap.width(), pixmap.height(), 0,

65 GL_RGBA, GL_UNSIGNED_BYTE, pixmap.addr());	65 GL_RGBA, GL_UNSIGNED_BYTE, pixmap.addr());

66 }	66 }

67	67

68 void TexturedElement::OnSetMode() {	68 void TexturedElement::OnSetMode() {

69 GetTexture()->SetMode(mode());	69 GetTexture()->SetMode(mode());

	70 UpdateTexture();

70 }	71 }

71	72

72 } // namespace vr_shell	73 } // namespace vr_shell

OLD	NEW