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

Side by Side Diff: content/common/gpu/stream_texture_android.h

Issue 1569543002: Revert of Apply the Surface Texture transformation matrix during texture copy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 unified diff | Download patch
« no previous file with comments | « no previous file | content/common/gpu/stream_texture_android.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #ifndef CONTENT_COMMON_GPU_STREAM_TEXTURE_ANDROID_H_ 5 #ifndef CONTENT_COMMON_GPU_STREAM_TEXTURE_ANDROID_H_
6 #define CONTENT_COMMON_GPU_STREAM_TEXTURE_ANDROID_H_ 6 #define CONTENT_COMMON_GPU_STREAM_TEXTURE_ANDROID_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
12 #include "content/common/gpu/gpu_command_buffer_stub.h" 12 #include "content/common/gpu/gpu_command_buffer_stub.h"
13 #include "ipc/ipc_listener.h" 13 #include "ipc/ipc_listener.h"
14 #include "ui/gl/android/surface_texture.h" 14 #include "ui/gl/android/surface_texture.h"
15 #include "ui/gl/gl_image.h" 15 #include "ui/gl/gl_image.h"
16 16
17 namespace ui {
18 class ScopedMakeCurrent;
19 }
20
21 namespace gfx { 17 namespace gfx {
22 class Size; 18 class Size;
23 } 19 }
24 20
25 namespace content { 21 namespace content {
26 22
27 class StreamTexture : public gl::GLImage, 23 class StreamTexture : public gl::GLImage,
28 public IPC::Listener, 24 public IPC::Listener,
29 public GpuCommandBufferStub::DestructionObserver { 25 public GpuCommandBufferStub::DestructionObserver {
30 public: 26 public:
(...skipping 22 matching lines...) Expand all
53 gfx::OverlayTransform transform, 49 gfx::OverlayTransform transform,
54 const gfx::Rect& bounds_rect, 50 const gfx::Rect& bounds_rect,
55 const gfx::RectF& crop_rect) override; 51 const gfx::RectF& crop_rect) override;
56 void OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd, 52 void OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd,
57 uint64_t process_tracing_id, 53 uint64_t process_tracing_id,
58 const std::string& dump_name) override; 54 const std::string& dump_name) override;
59 55
60 // GpuCommandBufferStub::DestructionObserver implementation. 56 // GpuCommandBufferStub::DestructionObserver implementation.
61 void OnWillDestroyStub() override; 57 void OnWillDestroyStub() override;
62 58
63 scoped_ptr<ui::ScopedMakeCurrent> MakeStubCurrent();
64
65 void UpdateTexImage();
66
67 // Called when a new frame is available for the SurfaceTexture. 59 // Called when a new frame is available for the SurfaceTexture.
68 void OnFrameAvailable(); 60 void OnFrameAvailable();
69 61
70 // IPC::Listener implementation: 62 // IPC::Listener implementation:
71 bool OnMessageReceived(const IPC::Message& message) override; 63 bool OnMessageReceived(const IPC::Message& message) override;
72 64
73 // IPC message handlers: 65 // IPC message handlers:
74 void OnStartListening(); 66 void OnStartListening();
75 void OnEstablishPeer(int32_t primary_id, int32_t secondary_id); 67 void OnEstablishPeer(int32_t primary_id, int32_t secondary_id);
76 void OnSetSize(const gfx::Size& size) { size_ = size; } 68 void OnSetSize(const gfx::Size& size) { size_ = size; }
(...skipping 10 matching lines...) Expand all
87 bool has_valid_frame_; 79 bool has_valid_frame_;
88 80
89 // Whether a new frame is available that we should update to. 81 // Whether a new frame is available that we should update to.
90 bool has_pending_frame_; 82 bool has_pending_frame_;
91 83
92 GpuCommandBufferStub* owner_stub_; 84 GpuCommandBufferStub* owner_stub_;
93 int32_t route_id_; 85 int32_t route_id_;
94 bool has_listener_; 86 bool has_listener_;
95 uint32_t texture_id_; 87 uint32_t texture_id_;
96 88
97 unsigned framebuffer_;
98 unsigned vertex_shader_;
99 unsigned fragment_shader_;
100 unsigned program_;
101 unsigned vertex_buffer_;
102 int u_xform_location_;
103
104 base::WeakPtrFactory<StreamTexture> weak_factory_; 89 base::WeakPtrFactory<StreamTexture> weak_factory_;
105 DISALLOW_COPY_AND_ASSIGN(StreamTexture); 90 DISALLOW_COPY_AND_ASSIGN(StreamTexture);
106 }; 91 };
107 92
108 } // namespace content 93 } // namespace content
109 94
110 #endif // CONTENT_COMMON_GPU_STREAM_TEXTURE_ANDROID_H_ 95 #endif // CONTENT_COMMON_GPU_STREAM_TEXTURE_ANDROID_H_
OLDNEW
« no previous file with comments | « no previous file | content/common/gpu/stream_texture_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698