diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/ui/accelerated_widget_mac | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/ui/accelerated_widget_mac')
4 files changed, 5 insertions, 3 deletions
diff --git a/chromium/ui/accelerated_widget_mac/ca_layer_tree_coordinator.h b/chromium/ui/accelerated_widget_mac/ca_layer_tree_coordinator.h index 5fb42fd647d..c6ae9a055f3 100644 --- a/chromium/ui/accelerated_widget_mac/ca_layer_tree_coordinator.h +++ b/chromium/ui/accelerated_widget_mac/ca_layer_tree_coordinator.h @@ -36,7 +36,7 @@ class ACCELERATED_WIDGET_MAC_EXPORT CALayerTreeCoordinator { // Commit the pending frame's OpenGL backbuffer or CALayer tree to be // attached to the root CALayer. - void CommitPendingTreesToCA(const gfx::Rect& pixel_damage_rect); + void CommitPendingTreesToCA(); // Get the root CALayer to display the current frame. This does not change // over the lifetime of the object. diff --git a/chromium/ui/accelerated_widget_mac/ca_layer_tree_coordinator.mm b/chromium/ui/accelerated_widget_mac/ca_layer_tree_coordinator.mm index c86751a944f..2d50aa7207e 100644 --- a/chromium/ui/accelerated_widget_mac/ca_layer_tree_coordinator.mm +++ b/chromium/ui/accelerated_widget_mac/ca_layer_tree_coordinator.mm @@ -6,6 +6,7 @@ #import <AVFoundation/AVFoundation.h> +#include "base/logging.h" #include "base/mac/mac_util.h" #include "base/trace_event/trace_event.h" #include "ui/base/cocoa/animation_utils.h" @@ -40,8 +41,7 @@ CARendererLayerTree* CALayerTreeCoordinator::GetPendingCARendererLayerTree() { return pending_ca_renderer_layer_tree_.get(); } -void CALayerTreeCoordinator::CommitPendingTreesToCA( - const gfx::Rect& pixel_damage_rect) { +void CALayerTreeCoordinator::CommitPendingTreesToCA() { // Update the CALayer hierarchy. ScopedCAActionDisabler disabler; if (pending_ca_renderer_layer_tree_) { 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 90ebd774026..f66002644bf 100644 --- a/chromium/ui/accelerated_widget_mac/ca_renderer_layer_tree.mm +++ b/chromium/ui/accelerated_widget_mac/ca_renderer_layer_tree.mm @@ -12,6 +12,7 @@ #include <utility> #include "base/command_line.h" +#include "base/logging.h" #include "base/trace_event/trace_event.h" #include "components/metal_util/hdr_copier_layer.h" #include "third_party/skia/include/core/SkColor.h" diff --git a/chromium/ui/accelerated_widget_mac/display_ca_layer_tree.mm b/chromium/ui/accelerated_widget_mac/display_ca_layer_tree.mm index 38f25d6314f..0db8f3e223e 100644 --- a/chromium/ui/accelerated_widget_mac/display_ca_layer_tree.mm +++ b/chromium/ui/accelerated_widget_mac/display_ca_layer_tree.mm @@ -8,6 +8,7 @@ #include <IOSurface/IOSurface.h> #include "base/debug/dump_without_crashing.h" +#include "base/logging.h" #include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" #include "base/trace_event/trace_event.h" |