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 <OpenGL/gl.h> | 8 #include <OpenGL/gl.h> |
9 #include <QuartzCore/QuartzCore.h> | 9 #include <QuartzCore/QuartzCore.h> |
10 #include <stdint.h> | 10 #include <stdint.h> |
(...skipping 1269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1280 | 1280 |
1281 bool RenderWidgetHostViewMac::HasAcceleratedSurface( | 1281 bool RenderWidgetHostViewMac::HasAcceleratedSurface( |
1282 const gfx::Size& desired_size) { | 1282 const gfx::Size& desired_size) { |
1283 ui::AcceleratedWidgetMac* accelerated_widget_mac = | 1283 ui::AcceleratedWidgetMac* accelerated_widget_mac = |
1284 browser_compositor_->GetAcceleratedWidgetMac(); | 1284 browser_compositor_->GetAcceleratedWidgetMac(); |
1285 if (accelerated_widget_mac) | 1285 if (accelerated_widget_mac) |
1286 return accelerated_widget_mac->HasFrameOfSize(desired_size); | 1286 return accelerated_widget_mac->HasFrameOfSize(desired_size); |
1287 return false; | 1287 return false; |
1288 } | 1288 } |
1289 | 1289 |
1290 void RenderWidgetHostViewMac::OnSwapCompositorFrame(uint32_t output_surface_id, | 1290 void RenderWidgetHostViewMac::OnSwapCompositorFrame( |
1291 cc::CompositorFrame frame) { | 1291 uint32_t output_surface_id, |
| 1292 const cc::SurfaceId& surface_id, |
| 1293 cc::CompositorFrame frame) { |
1292 TRACE_EVENT0("browser", "RenderWidgetHostViewMac::OnSwapCompositorFrame"); | 1294 TRACE_EVENT0("browser", "RenderWidgetHostViewMac::OnSwapCompositorFrame"); |
1293 | 1295 |
1294 last_scroll_offset_ = frame.metadata.root_scroll_offset; | 1296 last_scroll_offset_ = frame.metadata.root_scroll_offset; |
1295 | 1297 |
1296 page_at_minimum_scale_ = | 1298 page_at_minimum_scale_ = |
1297 frame.metadata.page_scale_factor == frame.metadata.min_page_scale_factor; | 1299 frame.metadata.page_scale_factor == frame.metadata.min_page_scale_factor; |
1298 if (frame.delegated_frame_data) { | 1300 if (frame.delegated_frame_data) { |
1299 browser_compositor_->SwapCompositorFrame(output_surface_id, | 1301 browser_compositor_->SwapCompositorFrame(output_surface_id, |
1300 std::move(frame)); | 1302 std::move(frame)); |
1301 SendVSyncParametersToRenderer(); | 1303 SendVSyncParametersToRenderer(); |
(...skipping 1925 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3227 | 3229 |
3228 // "-webkit-app-region: drag | no-drag" is implemented on Mac by excluding | 3230 // "-webkit-app-region: drag | no-drag" is implemented on Mac by excluding |
3229 // regions that are not draggable. (See ControlRegionView in | 3231 // regions that are not draggable. (See ControlRegionView in |
3230 // native_app_window_cocoa.mm). This requires the render host view to be | 3232 // native_app_window_cocoa.mm). This requires the render host view to be |
3231 // draggable by default. | 3233 // draggable by default. |
3232 - (BOOL)mouseDownCanMoveWindow { | 3234 - (BOOL)mouseDownCanMoveWindow { |
3233 return YES; | 3235 return YES; |
3234 } | 3236 } |
3235 | 3237 |
3236 @end | 3238 @end |
OLD | NEW |