mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 69.0.3476.0 (#571360)
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
diff --git content/browser/compositor/gpu_process_transport_factory.cc content/browser/compositor/gpu_process_transport_factory.cc
|
||||
index ef785207cd5b..bafbce4fdfd4 100644
|
||||
index 03defa1ab778..73be8a2c8253 100644
|
||||
--- content/browser/compositor/gpu_process_transport_factory.cc
|
||||
+++ content/browser/compositor/gpu_process_transport_factory.cc
|
||||
@@ -494,10 +494,20 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
|
||||
@@ -26,7 +26,7 @@ index ef785207cd5b..bafbce4fdfd4 100644
|
||||
} else {
|
||||
DCHECK(context_provider);
|
||||
diff --git ui/compositor/compositor.h ui/compositor/compositor.h
|
||||
index 7efccc23d777..f355c678027b 100644
|
||||
index fccba71bf856..85e305a783b9 100644
|
||||
--- ui/compositor/compositor.h
|
||||
+++ ui/compositor/compositor.h
|
||||
@@ -24,6 +24,7 @@
|
||||
@@ -37,7 +37,7 @@ index 7efccc23d777..f355c678027b 100644
|
||||
#include "third_party/skia/include/core/SkColor.h"
|
||||
#include "third_party/skia/include/core/SkMatrix44.h"
|
||||
#include "ui/compositor/compositor_animation_observer.h"
|
||||
@@ -191,6 +192,17 @@ class COMPOSITOR_EXPORT ContextFactory {
|
||||
@@ -193,6 +194,17 @@ class COMPOSITOR_EXPORT ContextFactory {
|
||||
virtual bool SyncTokensRequiredForDisplayCompositor() = 0;
|
||||
};
|
||||
|
||||
@@ -55,7 +55,7 @@ index 7efccc23d777..f355c678027b 100644
|
||||
// Compositor object to take care of GPU painting.
|
||||
// A Browser compositor object is responsible for generating the final
|
||||
// displayable form of pixels comprising a single widget's contents. It draws an
|
||||
@@ -231,6 +243,9 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient,
|
||||
@@ -233,6 +245,9 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient,
|
||||
// Schedules a redraw of the layer tree associated with this compositor.
|
||||
void ScheduleDraw();
|
||||
|
||||
|
Reference in New Issue
Block a user