bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 68.0.3403.0 (#552595)

Browse Source
This commit is contained in:
Marshall Greenblatt
2018-05-16 12:28:49 +03:00
parent 58413e16b1
commit 84e2286995
31 changed files with 207 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patch/patches/compositor_1368.patch
View File

@@ -1,5 +1,5 @@
diff --git content/browser/compositor/gpu_process_transport_factory.cc content/browser/compositor/gpu_process_transport_factory.cc
index 7b9fc4114c52..bdbbf93f6f0d 100644
index e34a0de26349..b90d1a106aff 100644
--- content/browser/compositor/gpu_process_transport_factory.cc
+++ content/browser/compositor/gpu_process_transport_factory.cc
@@ -495,9 +495,19 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
@@ -24,7 +24,7 @@ index 7b9fc4114c52..bdbbf93f6f0d 100644
} else {
DCHECK(context_provider);
diff --git ui/compositor/compositor.h ui/compositor/compositor.h
index a6a0cb9df028..478f11e0d925 100644
index eb250697ebd6..24910afc962c 100644
--- ui/compositor/compositor.h
+++ ui/compositor/compositor.h
@@ -24,6 +24,7 @@
@@ -35,7 +35,7 @@ index a6a0cb9df028..478f11e0d925 100644
#include "third_party/skia/include/core/SkColor.h"
#include "third_party/skia/include/core/SkMatrix44.h"
#include "ui/compositor/compositor_animation_observer.h"
@@ -182,6 +183,17 @@ class COMPOSITOR_EXPORT ContextFactory {
@@ -183,6 +184,17 @@ class COMPOSITOR_EXPORT ContextFactory {
virtual void RemoveObserver(ContextFactoryObserver* observer) = 0;
};
@@ -53,7 +53,7 @@ index a6a0cb9df028..478f11e0d925 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
@@ -221,6 +233,9 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient,
@@ -222,6 +234,9 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient,
// Schedules a redraw of the layer tree associated with this compositor.
void ScheduleDraw();
@@ -63,7 +63,7 @@ index a6a0cb9df028..478f11e0d925 100644
// Sets the root of the layer tree drawn by this Compositor. The root layer
// must have no parent. The compositor's root layer is reset if the root layer
// is destroyed. NULL can be passed to reset the root layer, in which case the
@@ -442,6 +457,8 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient,
@@ -447,6 +462,8 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient,
ui::ContextFactory* context_factory_;
ui::ContextFactoryPrivate* context_factory_private_;