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

Side by Side Diff: content/renderer/pepper/ppb_graphics_3d_impl.cc

Issue 1912833002: Pepper takes ownership of a mailbox before passing it to the texture layer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comments from piman. Created 4 years, 7 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/renderer/pepper/ppb_graphics_3d_impl.h" 5 #include "content/renderer/pepper/ppb_graphics_3d_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
(...skipping 10 matching lines...) Expand all
21 #include "gpu/ipc/client/command_buffer_proxy_impl.h" 21 #include "gpu/ipc/client/command_buffer_proxy_impl.h"
22 #include "gpu/ipc/client/gpu_channel_host.h" 22 #include "gpu/ipc/client/gpu_channel_host.h"
23 #include "ppapi/c/ppp_graphics_3d.h" 23 #include "ppapi/c/ppp_graphics_3d.h"
24 #include "ppapi/thunk/enter.h" 24 #include "ppapi/thunk/enter.h"
25 #include "third_party/WebKit/public/platform/WebString.h" 25 #include "third_party/WebKit/public/platform/WebString.h"
26 #include "third_party/WebKit/public/web/WebConsoleMessage.h" 26 #include "third_party/WebKit/public/web/WebConsoleMessage.h"
27 #include "third_party/WebKit/public/web/WebDocument.h" 27 #include "third_party/WebKit/public/web/WebDocument.h"
28 #include "third_party/WebKit/public/web/WebElement.h" 28 #include "third_party/WebKit/public/web/WebElement.h"
29 #include "third_party/WebKit/public/web/WebLocalFrame.h" 29 #include "third_party/WebKit/public/web/WebLocalFrame.h"
30 #include "third_party/WebKit/public/web/WebPluginContainer.h" 30 #include "third_party/WebKit/public/web/WebPluginContainer.h"
31 #include "third_party/khronos/GLES2/gl2.h"
31 32
32 using ppapi::thunk::EnterResourceNoLock; 33 using ppapi::thunk::EnterResourceNoLock;
33 using ppapi::thunk::PPB_Graphics3D_API; 34 using ppapi::thunk::PPB_Graphics3D_API;
34 using blink::WebConsoleMessage; 35 using blink::WebConsoleMessage;
35 using blink::WebLocalFrame; 36 using blink::WebLocalFrame;
36 using blink::WebPluginContainer; 37 using blink::WebPluginContainer;
37 using blink::WebString; 38 using blink::WebString;
38 39
39 namespace content { 40 namespace content {
40 41
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 int32_t start, 108 int32_t start,
108 int32_t end) { 109 int32_t end) {
109 GetCommandBuffer()->WaitForGetOffsetInRange(start, end); 110 GetCommandBuffer()->WaitForGetOffsetInRange(start, end);
110 return GetCommandBuffer()->GetLastState(); 111 return GetCommandBuffer()->GetLastState();
111 } 112 }
112 113
113 void PPB_Graphics3D_Impl::EnsureWorkVisible() { 114 void PPB_Graphics3D_Impl::EnsureWorkVisible() {
114 command_buffer_->EnsureWorkVisible(); 115 command_buffer_->EnsureWorkVisible();
115 } 116 }
116 117
118 void PPB_Graphics3D_Impl::TakeFrontBuffer() {
119 DCHECK(taken_front_buffer_.IsZero());
120 taken_front_buffer_ = gpu::Mailbox::Generate();
121 command_buffer_->TakeFrontBuffer(taken_front_buffer_);
122 }
123
117 bool PPB_Graphics3D_Impl::BindToInstance(bool bind) { 124 bool PPB_Graphics3D_Impl::BindToInstance(bool bind) {
118 bound_to_instance_ = bind; 125 bound_to_instance_ = bind;
119 return true; 126 return true;
120 } 127 }
121 128
122 bool PPB_Graphics3D_Impl::IsOpaque() { return !has_alpha_; } 129 bool PPB_Graphics3D_Impl::IsOpaque() { return !has_alpha_; }
123 130
124 void PPB_Graphics3D_Impl::ViewInitiatedPaint() { 131 void PPB_Graphics3D_Impl::ViewInitiatedPaint() {
125 commit_pending_ = false; 132 commit_pending_ = false;
126 133
127 if (HasPendingSwap()) 134 if (HasPendingSwap())
128 SwapBuffersACK(PP_OK); 135 SwapBuffersACK(PP_OK);
129 } 136 }
130 137
131 gpu::CommandBufferProxyImpl* PPB_Graphics3D_Impl::GetCommandBufferProxy() { 138 gpu::CommandBufferProxyImpl* PPB_Graphics3D_Impl::GetCommandBufferProxy() {
132 DCHECK(command_buffer_); 139 DCHECK(command_buffer_);
133 return command_buffer_.get(); 140 return command_buffer_.get();
134 } 141 }
135 142
136 gpu::CommandBuffer* PPB_Graphics3D_Impl::GetCommandBuffer() { 143 gpu::CommandBuffer* PPB_Graphics3D_Impl::GetCommandBuffer() {
137 return command_buffer_.get(); 144 return command_buffer_.get();
138 } 145 }
139 146
140 gpu::GpuControl* PPB_Graphics3D_Impl::GetGpuControl() { 147 gpu::GpuControl* PPB_Graphics3D_Impl::GetGpuControl() {
141 return command_buffer_.get(); 148 return command_buffer_.get();
142 } 149 }
143 150
144 int32_t PPB_Graphics3D_Impl::DoSwapBuffers(const gpu::SyncToken& sync_token) { 151 int32_t PPB_Graphics3D_Impl::DoSwapBuffers(const gpu::SyncToken& sync_token) {
145 DCHECK(command_buffer_); 152 DCHECK(command_buffer_);
146 if (sync_token.HasData()) 153 DCHECK(!taken_front_buffer_.IsZero());
147 sync_token_ = sync_token;
148 154
149 if (bound_to_instance_) { 155 if (bound_to_instance_) {
150 // If we are bound to the instance, we need to ask the compositor 156 // If we are bound to the instance, we need to ask the compositor
151 // to commit our backing texture so that the graphics appears on the page. 157 // to commit our backing texture so that the graphics appears on the page.
152 // When the backing texture will be committed we get notified via 158 // When the backing texture will be committed we get notified via
153 // ViewFlushedPaint(). 159 // ViewFlushedPaint().
154 // 160 //
155 // Don't need to check for NULL from GetPluginInstance since when we're 161 // Don't need to check for NULL from GetPluginInstance since when we're
156 // bound, we know our instance is valid. 162 // bound, we know our instance is valid.
157 HostGlobals::Get()->GetInstance(pp_instance())->CommitBackingTexture(); 163 cc::TextureMailbox texture_mailbox(taken_front_buffer_, sync_token,
164 GL_TEXTURE_2D);
165 taken_front_buffer_.SetZero();
166 HostGlobals::Get()
167 ->GetInstance(pp_instance())
168 ->CommitTextureMailbox(texture_mailbox);
158 commit_pending_ = true; 169 commit_pending_ = true;
159 } else { 170 } else {
160 // Wait for the command to complete on the GPU to allow for throttling. 171 // Wait for the command to complete on the GPU to allow for throttling.
161 command_buffer_->SignalSyncToken( 172 command_buffer_->SignalSyncToken(
162 sync_token_, 173 sync_token, base::Bind(&PPB_Graphics3D_Impl::OnSwapBuffers,
163 base::Bind(&PPB_Graphics3D_Impl::OnSwapBuffers, 174 weak_ptr_factory_.GetWeakPtr()));
164 weak_ptr_factory_.GetWeakPtr()));
165 } 175 }
166 176
167 return PP_OK_COMPLETIONPENDING; 177 return PP_OK_COMPLETIONPENDING;
168 } 178 }
169 179
170 bool PPB_Graphics3D_Impl::InitRaw(PPB_Graphics3D_API* share_context, 180 bool PPB_Graphics3D_Impl::InitRaw(PPB_Graphics3D_API* share_context,
171 const int32_t* attrib_list, 181 const int32_t* attrib_list,
172 gpu::Capabilities* capabilities, 182 gpu::Capabilities* capabilities,
173 base::SharedMemoryHandle* shared_state_handle, 183 base::SharedMemoryHandle* shared_state_handle,
174 gpu::CommandBufferId* command_buffer_id) { 184 gpu::CommandBufferId* command_buffer_id) {
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 if (!command_buffer_->Initialize()) 265 if (!command_buffer_->Initialize())
256 return false; 266 return false;
257 267
258 if (shared_state_handle) 268 if (shared_state_handle)
259 *shared_state_handle = command_buffer_->GetSharedStateHandle(); 269 *shared_state_handle = command_buffer_->GetSharedStateHandle();
260 if (capabilities) 270 if (capabilities)
261 *capabilities = command_buffer_->GetCapabilities(); 271 *capabilities = command_buffer_->GetCapabilities();
262 if (command_buffer_id) 272 if (command_buffer_id)
263 *command_buffer_id = command_buffer_->GetCommandBufferID(); 273 *command_buffer_id = command_buffer_->GetCommandBufferID();
264 274
265 mailbox_ = gpu::Mailbox::Generate();
266 if (!command_buffer_->ProduceFrontBuffer(mailbox_))
267 return false;
268
269 return true; 275 return true;
270 } 276 }
271 277
272 void PPB_Graphics3D_Impl::OnGpuControlErrorMessage(const char* message, 278 void PPB_Graphics3D_Impl::OnGpuControlErrorMessage(const char* message,
273 int32_t id) { 279 int32_t id) {
274 if (!bound_to_instance_) 280 if (!bound_to_instance_)
275 return; 281 return;
276 WebPluginContainer* container = 282 WebPluginContainer* container =
277 HostGlobals::Get()->GetInstance(pp_instance())->container(); 283 HostGlobals::Get()->GetInstance(pp_instance())->container();
278 if (!container) 284 if (!container)
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 instance->module()->GetPluginInterface(PPP_GRAPHICS_3D_INTERFACE)); 339 instance->module()->GetPluginInterface(PPP_GRAPHICS_3D_INTERFACE));
334 // We have to check *again* that the instance exists, because it could have 340 // We have to check *again* that the instance exists, because it could have
335 // been deleted during GetPluginInterface(). Even the PluginModule could be 341 // been deleted during GetPluginInterface(). Even the PluginModule could be
336 // deleted, but in that case, the instance should also be gone, so the 342 // deleted, but in that case, the instance should also be gone, so the
337 // GetInstance check covers both cases. 343 // GetInstance check covers both cases.
338 if (ppp_graphics_3d && HostGlobals::Get()->GetInstance(this_pp_instance)) 344 if (ppp_graphics_3d && HostGlobals::Get()->GetInstance(this_pp_instance))
339 ppp_graphics_3d->Graphics3DContextLost(this_pp_instance); 345 ppp_graphics_3d->Graphics3DContextLost(this_pp_instance);
340 } 346 }
341 347
342 } // namespace content 348 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698