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_mac.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_mac.h" |
6 | 6 |
7 #import <objc/runtime.h> | 7 #import <objc/runtime.h> |
8 #include <QuartzCore/QuartzCore.h> | 8 #include <QuartzCore/QuartzCore.h> |
9 | 9 |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
(...skipping 1675 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1686 render_widget_host_->GetProcess()->ReceivedBadMessage(); | 1686 render_widget_host_->GetProcess()->ReceivedBadMessage(); |
1687 return; | 1687 return; |
1688 } | 1688 } |
1689 | 1689 |
1690 cc::CompositorFrameAck ack; | 1690 cc::CompositorFrameAck ack; |
1691 RenderWidgetHostImpl::SendSwapCompositorFrameAck( | 1691 RenderWidgetHostImpl::SendSwapCompositorFrameAck( |
1692 render_widget_host_->GetRoutingID(), | 1692 render_widget_host_->GetRoutingID(), |
1693 software_frame_manager_->GetCurrentFrameOutputSurfaceId(), | 1693 software_frame_manager_->GetCurrentFrameOutputSurfaceId(), |
1694 render_widget_host_->GetProcess()->GetID(), | 1694 render_widget_host_->GetProcess()->GetID(), |
1695 ack); | 1695 ack); |
1696 software_latency_info_.push_back(frame->metadata.latency_info); | 1696 for (size_t i = 0; i < frame->metadata.latency_info.size(); i++) { |
| 1697 software_latency_info_.push_back(frame->metadata.latency_info[i]); |
| 1698 } |
1697 software_frame_manager_->SwapToNewFrameComplete( | 1699 software_frame_manager_->SwapToNewFrameComplete( |
1698 !render_widget_host_->is_hidden()); | 1700 !render_widget_host_->is_hidden()); |
1699 | 1701 |
1700 GotSoftwareFrame(); | 1702 GotSoftwareFrame(); |
1701 [cocoa_view_ setNeedsDisplay:YES]; | 1703 [cocoa_view_ setNeedsDisplay:YES]; |
1702 } | 1704 } |
1703 | 1705 |
1704 void RenderWidgetHostViewMac::OnAcceleratedCompositingStateChange() { | 1706 void RenderWidgetHostViewMac::OnAcceleratedCompositingStateChange() { |
1705 } | 1707 } |
1706 | 1708 |
(...skipping 2276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3983 return YES; | 3985 return YES; |
3984 } | 3986 } |
3985 | 3987 |
3986 - (BOOL)isOpaque { | 3988 - (BOOL)isOpaque { |
3987 if (renderWidgetHostView_->use_core_animation_) | 3989 if (renderWidgetHostView_->use_core_animation_) |
3988 return YES; | 3990 return YES; |
3989 return [super isOpaque]; | 3991 return [super isOpaque]; |
3990 } | 3992 } |
3991 | 3993 |
3992 @end | 3994 @end |
OLD | NEW |