| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/frame_host/render_widget_host_view_child_frame.h" | 5 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 531 | 531 |
| 532 bool RenderWidgetHostViewChildFrame::HasAcceleratedSurface( | 532 bool RenderWidgetHostViewChildFrame::HasAcceleratedSurface( |
| 533 const gfx::Size& desired_size) { | 533 const gfx::Size& desired_size) { |
| 534 return false; | 534 return false; |
| 535 } | 535 } |
| 536 | 536 |
| 537 #if defined(OS_WIN) | 537 #if defined(OS_WIN) |
| 538 void RenderWidgetHostViewChildFrame::SetParentNativeViewAccessible( | 538 void RenderWidgetHostViewChildFrame::SetParentNativeViewAccessible( |
| 539 gfx::NativeViewAccessible accessible_parent) { | 539 gfx::NativeViewAccessible accessible_parent) { |
| 540 } | 540 } |
| 541 | |
| 542 gfx::NativeViewId RenderWidgetHostViewChildFrame::GetParentForWindowlessPlugin() | |
| 543 const { | |
| 544 return NULL; | |
| 545 } | |
| 546 #endif // defined(OS_WIN) | 541 #endif // defined(OS_WIN) |
| 547 | 542 |
| 548 // cc::SurfaceFactoryClient implementation. | 543 // cc::SurfaceFactoryClient implementation. |
| 549 void RenderWidgetHostViewChildFrame::ReturnResources( | 544 void RenderWidgetHostViewChildFrame::ReturnResources( |
| 550 const cc::ReturnedResourceArray& resources) { | 545 const cc::ReturnedResourceArray& resources) { |
| 551 if (resources.empty()) | 546 if (resources.empty()) |
| 552 return; | 547 return; |
| 553 | 548 |
| 554 if (!ack_pending_count_ && host_) { | 549 if (!ack_pending_count_ && host_) { |
| 555 cc::CompositorFrameAck ack; | 550 cc::CompositorFrameAck ack; |
| (...skipping 24 matching lines...) Expand all Loading... |
| 580 if (surface_factory_ && !surface_id_.is_null()) | 575 if (surface_factory_ && !surface_id_.is_null()) |
| 581 surface_factory_->Destroy(surface_id_); | 576 surface_factory_->Destroy(surface_id_); |
| 582 surface_id_ = cc::SurfaceId(); | 577 surface_id_ = cc::SurfaceId(); |
| 583 } | 578 } |
| 584 | 579 |
| 585 cc::SurfaceId RenderWidgetHostViewChildFrame::SurfaceIdForTesting() const { | 580 cc::SurfaceId RenderWidgetHostViewChildFrame::SurfaceIdForTesting() const { |
| 586 return surface_id_; | 581 return surface_id_; |
| 587 }; | 582 }; |
| 588 | 583 |
| 589 } // namespace content | 584 } // namespace content |
| OLD | NEW |