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 revision 68623971 (#403382)

Browse Source
This commit is contained in:
Marshall Greenblatt
2016-07-06 15:34:09 -04:00
parent d0a2e217a0
commit a60bb077a3
55 changed files with 437 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patch/patches/compositor_1368.patch
View File

@@ -1,8 +1,8 @@
diff --git content/browser/compositor/gpu_process_transport_factory.cc content/browser/compositor/gpu_process_transport_factory.cc
index 6fdb92e..5405306 100644
index 841fea0..8939665 100644
--- content/browser/compositor/gpu_process_transport_factory.cc
+++ content/browser/compositor/gpu_process_transport_factory.cc
@@ -184,6 +184,13 @@ GpuProcessTransportFactory::~GpuProcessTransportFactory() {
@@ -189,6 +189,13 @@ GpuProcessTransportFactory::~GpuProcessTransportFactory() {
std::unique_ptr<cc::SoftwareOutputDevice>
GpuProcessTransportFactory::CreateSoftwareOutputDevice(
ui::Compositor* compositor) {
@@ -17,7 +17,7 @@ index 6fdb92e..5405306 100644
if (shell::ShellIsRemote()) {
return std::unique_ptr<cc::SoftwareOutputDevice>(
diff --git ui/compositor/compositor.h ui/compositor/compositor.h
index a6245da..edfdeb5c 100644
index ee39c59..8f6082b 100644
--- ui/compositor/compositor.h
+++ ui/compositor/compositor.h
@@ -17,6 +17,7 @@
@@ -28,7 +28,7 @@ index a6245da..edfdeb5c 100644
#include "cc/surfaces/surface_sequence.h"
#include "cc/trees/layer_tree_host_client.h"
#include "cc/trees/layer_tree_host_single_thread_client.h"
@@ -156,6 +157,17 @@ class COMPOSITOR_EXPORT CompositorLock
@@ -179,6 +180,17 @@ class COMPOSITOR_EXPORT CompositorLock
DISALLOW_COPY_AND_ASSIGN(CompositorLock);
};
@@ -46,7 +46,7 @@ index a6245da..edfdeb5c 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
@@ -176,6 +188,9 @@ class COMPOSITOR_EXPORT Compositor
@@ -199,6 +211,9 @@ class COMPOSITOR_EXPORT Compositor
// Schedules a redraw of the layer tree associated with this compositor.
void ScheduleDraw();
@@ -56,7 +56,7 @@ index a6245da..edfdeb5c 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
@@ -345,6 +360,8 @@ class COMPOSITOR_EXPORT Compositor
@@ -368,6 +383,8 @@ class COMPOSITOR_EXPORT Compositor
ui::ContextFactory* context_factory_;