diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-23 17:21:03 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-23 16:25:15 +0000 |
| commit | c551f43206405019121bd2b2c93714319a0a3300 (patch) | |
| tree | 1f48c30631c421fd4bbb3c36da20183c8a2ed7d7 /chromium/ui/accelerated_widget_mac/ca_renderer_layer_tree.mm | |
| parent | 7961cea6d1041e3e454dae6a1da660b453efd238 (diff) | |
| download | qtwebengine-chromium-c551f43206405019121bd2b2c93714319a0a3300.tar.gz | |
BASELINE: Update Chromium to 79.0.3945.139
Change-Id: I336b7182fab9bca80b709682489c07db112eaca5
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/ui/accelerated_widget_mac/ca_renderer_layer_tree.mm')
| -rw-r--r-- | chromium/ui/accelerated_widget_mac/ca_renderer_layer_tree.mm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chromium/ui/accelerated_widget_mac/ca_renderer_layer_tree.mm b/chromium/ui/accelerated_widget_mac/ca_renderer_layer_tree.mm index 8cf753ed60f..5bc5c08121a 100644 --- a/chromium/ui/accelerated_widget_mac/ca_renderer_layer_tree.mm +++ b/chromium/ui/accelerated_widget_mac/ca_renderer_layer_tree.mm @@ -15,7 +15,6 @@ #include "base/mac/sdk_forward_declarations.h" #include "base/trace_event/trace_event.h" #include "third_party/skia/include/core/SkColor.h" -#include "ui/accelerated_widget_mac/availability_macros.h" #include "ui/base/cocoa/animation_utils.h" #include "ui/base/ui_base_switches.h" #include "ui/gfx/geometry/dip_util.h" @@ -29,7 +28,7 @@ namespace { // This will enqueue |io_surface| to be drawn by |av_layer|. This will // retain |cv_pixel_buffer| until it is no longer being displayed. bool AVSampleBufferDisplayLayerEnqueueCVPixelBuffer( - AVSampleBufferDisplayLayer109* av_layer, + AVSampleBufferDisplayLayer* av_layer, CVPixelBufferRef cv_pixel_buffer) { OSStatus os_status = noErr; @@ -103,7 +102,7 @@ bool AVSampleBufferDisplayLayerEnqueueCVPixelBuffer( // |io_surface| in a CVPixelBuffer. This will increase the in-use count // of and retain |io_surface| until it is no longer being displayed. bool AVSampleBufferDisplayLayerEnqueueIOSurface( - AVSampleBufferDisplayLayer109* av_layer, + AVSampleBufferDisplayLayer* av_layer, IOSurfaceRef io_surface) { CVReturn cv_return = kCVReturnSuccess; @@ -766,7 +765,7 @@ void CARendererLayerTree::ContentLayer::CommitToCA(CALayer* superlayer, update_ca_filter = old_layer->ca_filter != ca_filter; } else { if (use_av_layer) { - av_layer.reset([[AVSampleBufferDisplayLayer109 alloc] init]); + av_layer.reset([[AVSampleBufferDisplayLayer alloc] init]); ca_layer.reset([av_layer retain]); [av_layer setVideoGravity:AVLayerVideoGravityResize]; } else { |