Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/browser/renderer_host/render_widget_host_view_aura.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/callback_helpers.h" | 9 #include "base/callback_helpers.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 3182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3193 idle_frame_subscriber_textures_.clear(); | 3193 idle_frame_subscriber_textures_.clear(); |
| 3194 | 3194 |
| 3195 // Make sure all ImageTransportClients are deleted now that the context those | 3195 // Make sure all ImageTransportClients are deleted now that the context those |
| 3196 // are using is becoming invalid. This sends pending ACKs and needs to happen | 3196 // are using is becoming invalid. This sends pending ACKs and needs to happen |
| 3197 // after calling UpdateExternalTexture() which syncs with the impl thread. | 3197 // after calling UpdateExternalTexture() which syncs with the impl thread. |
| 3198 RunOnCommitCallbacks(); | 3198 RunOnCommitCallbacks(); |
| 3199 | 3199 |
| 3200 DCHECK(!shared_surface_handle_.is_null()); | 3200 DCHECK(!shared_surface_handle_.is_null()); |
| 3201 ImageTransportFactory* factory = ImageTransportFactory::GetInstance(); | 3201 ImageTransportFactory* factory = ImageTransportFactory::GetInstance(); |
| 3202 factory->DestroySharedSurfaceHandle(shared_surface_handle_); | 3202 factory->DestroySharedSurfaceHandle(shared_surface_handle_); |
| 3203 shared_surface_handle_ = factory->CreateSharedSurfaceHandle(); | 3203 shared_surface_handle_ = factory->CreateSharedSurfaceHandle(); |
|
piman
2013/12/11 01:14:03
*if* we don't need to change the GLSurfaceHandle,
| |
| 3204 host_->CompositingSurfaceUpdated(); | |
| 3205 host_->ScheduleComposite(); | 3204 host_->ScheduleComposite(); |
| 3206 } | 3205 } |
| 3207 | 3206 |
| 3208 //////////////////////////////////////////////////////////////////////////////// | 3207 //////////////////////////////////////////////////////////////////////////////// |
| 3209 // RenderWidgetHostViewAura, private: | 3208 // RenderWidgetHostViewAura, private: |
| 3210 | 3209 |
| 3211 RenderWidgetHostViewAura::~RenderWidgetHostViewAura() { | 3210 RenderWidgetHostViewAura::~RenderWidgetHostViewAura() { |
| 3212 if (paint_observer_) | 3211 if (paint_observer_) |
| 3213 paint_observer_->OnViewDestroyed(); | 3212 paint_observer_->OnViewDestroyed(); |
| 3214 if (touch_editing_client_) | 3213 if (touch_editing_client_) |
| (...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3458 RenderWidgetHost* widget) { | 3457 RenderWidgetHost* widget) { |
| 3459 return new RenderWidgetHostViewAura(widget); | 3458 return new RenderWidgetHostViewAura(widget); |
| 3460 } | 3459 } |
| 3461 | 3460 |
| 3462 // static | 3461 // static |
| 3463 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { | 3462 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { |
| 3464 GetScreenInfoForWindow(results, NULL); | 3463 GetScreenInfoForWindow(results, NULL); |
| 3465 } | 3464 } |
| 3466 | 3465 |
| 3467 } // namespace content | 3466 } // namespace content |
| OLD | NEW |