Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Issue 2651213004: Revert of Decouple GpuCompositorFrameSink from DisplayCompositor (Closed)

Created:
3 years, 11 months ago by Dan Beam
Modified:
3 years, 11 months ago
CC:
chromium-reviews, rjkroege, cc-bugs_chromium.org, kylechar
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Revert of Decouple GpuCompositorFrameSink from DisplayCompositor (patchset #7 id:120001 of https://codereview.chromium.org/2654693003/ ) Reason for revert: Broke Win 64 builder's compile step: https://build.chromium.org/p/chromium/builders/Win%20x64/builds/7950 [23910/48389] CXX obj/content/app/content_main_runner_child/content_main_runner.obj FAILED: obj/content/app/content_main_runner_child/content_main_runner.obj ninja -t msvc -e environment.x64 -- C:\b\c\cipd\goma/gomacc.exe "C:\b\depot_tools\win_toolchain\vs_files\d3cb0e37bdd120ad0ac4650b674b09e81be45616\VC\bin\amd64/cl.exe" /nologo /showIncludes /FC @obj/content/app/content_main_runner_child/content_main_runner.obj.rsp /c ../../content/app/content_main_runner.cc /Foobj/content/app/content_main_runner_child/content_main_runner.obj /Fd"obj/content/app/content_main_runner_child_cc.pdb" c:\b\c\b\win_x64_archive\src\content\browser\gpu\gpu_process_host.h(32): fatal error C1083: Cannot open include file: 'services/ui/gpu/interfaces/gpu_host.mojom.h': No such file or directory Original issue's description: > Decouple GpuCompositorFrameSink from DisplayCompositor > > In order to reuse GpuCompositorFrameSink in other parts of Chrome > (e.g. OffscreenCanvas), this CL decouples > GpuCompositorFrameSinkSupport from DisplayCompositor. > > This CL also moves GpuCompositorFrameSInk out of > services/ui/surfaces for now as well because we would like to use > this code in Chrome and this is currently an incomplete internal > implementation detail of Mus. Once code is unified between Chrome > and Mus, components/display_compositor can probably move to > services/ui/gpu/display_compositor. > > BUG=683735 > CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel > > Review-Url: https://codereview.chromium.org/2654693003 > Cr-Commit-Position: refs/heads/master@{#446223} > Committed: https://chromium.googlesource.com/chromium/src/+/81183e45cf14c416dfce69b990a0c71a4e1c3399 TBR=fsamuel@chromium.org,ben@chromium.org,kylechar@chromium.org,jam@chromium.org,danakj@chromium.org,xing.xu@intel.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=683735 Review-Url: https://codereview.chromium.org/2651213004 Cr-Commit-Position: refs/heads/master@{#446233} Committed: https://chromium.googlesource.com/chromium/src/+/c850f7de840cdb2c21ee10166a76c2acbf04cc01

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+458 lines, -511 lines) Patch
M cc/surfaces/surface_manager.h View 1 chunk +0 lines, -4 lines 0 comments Download
M cc/surfaces/surface_manager.cc View 1 chunk +0 lines, -18 lines 0 comments Download
M cc/surfaces/surface_reference_manager.h View 2 chunks +0 lines, -11 lines 0 comments Download
M components/display_compositor/BUILD.gn View 2 chunks +0 lines, -9 lines 0 comments Download
M components/display_compositor/DEPS View 1 chunk +0 lines, -3 lines 0 comments Download
D components/display_compositor/gpu_compositor_frame_sink.h View 1 chunk +0 lines, -90 lines 0 comments Download
D components/display_compositor/gpu_compositor_frame_sink.cc View 1 chunk +0 lines, -153 lines 0 comments Download
D components/display_compositor/gpu_compositor_frame_sink_delegate.h View 1 chunk +0 lines, -26 lines 0 comments Download
D components/display_compositor/gpu_display_compositor_frame_sink.h View 1 chunk +0 lines, -46 lines 0 comments Download
D components/display_compositor/gpu_display_compositor_frame_sink.cc View 1 chunk +0 lines, -57 lines 0 comments Download
D components/display_compositor/gpu_offscreen_compositor_frame_sink.h View 1 chunk +0 lines, -35 lines 0 comments Download
D components/display_compositor/gpu_offscreen_compositor_frame_sink.cc View 1 chunk +0 lines, -32 lines 0 comments Download
M services/ui/surfaces/BUILD.gn View 1 chunk +6 lines, -0 lines 0 comments Download
M services/ui/surfaces/display_compositor.h View 4 chunks +25 lines, -18 lines 0 comments Download
M services/ui/surfaces/display_compositor.cc View 5 chunks +30 lines, -9 lines 0 comments Download
A services/ui/surfaces/gpu_compositor_frame_sink.h View 1 chunk +88 lines, -0 lines 0 comments Download
A services/ui/surfaces/gpu_compositor_frame_sink.cc View 1 chunk +150 lines, -0 lines 0 comments Download
A services/ui/surfaces/gpu_display_compositor_frame_sink.h View 1 chunk +43 lines, -0 lines 0 comments Download
A services/ui/surfaces/gpu_display_compositor_frame_sink.cc View 1 chunk +55 lines, -0 lines 0 comments Download
A services/ui/surfaces/gpu_offscreen_compositor_frame_sink.h View 1 chunk +31 lines, -0 lines 0 comments Download
A services/ui/surfaces/gpu_offscreen_compositor_frame_sink.cc View 1 chunk +30 lines, -0 lines 0 comments Download

Messages

Total messages: 11 (4 generated)
Dan Beam
Created Revert of Decouple GpuCompositorFrameSink from DisplayCompositor
3 years, 11 months ago (2017-01-26 05:28:19 UTC) #2
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2651213004/1
3 years, 11 months ago (2017-01-26 05:28:48 UTC) #3
commit-bot: I haz the power
Committed patchset #1 (id:1) as https://chromium.googlesource.com/chromium/src/+/c850f7de840cdb2c21ee10166a76c2acbf04cc01
3 years, 11 months ago (2017-01-26 05:30:47 UTC) #7
Dan Beam
sorry, just found https://bugs.chromium.org/p/chromium/issues/detail?id=685440 and evidence that this happened earlier today as well (before your ...
3 years, 11 months ago (2017-01-26 05:31:19 UTC) #8
xing.xu
On 2017/01/26 05:31:19, Dan Beam wrote: > sorry, just found https://bugs.chromium.org/p/chromium/issues/detail?id=685440 > and evidence that ...
3 years, 11 months ago (2017-01-26 05:41:51 UTC) #9
kjellander_chromium
On 2017/01/26 05:41:51, xing.xu wrote: > On 2017/01/26 05:31:19, Dan Beam wrote: > > sorry, ...
3 years, 11 months ago (2017-01-26 05:47:58 UTC) #10
xing.xu
3 years, 11 months ago (2017-01-26 06:28:03 UTC) #11
Message was sent while issue was closed.
I tried git cl reland, but it failed and my local code seems in mess. Is there
any document about how to git cl reland?

Then I tried git cherry-pick, and re-land it here:
https://codereview.chromium.org/2651283004/

On 2017/01/26 05:47:58, kjellander_chromium wrote:
> On 2017/01/26 05:41:51, xing.xu wrote:
> > On 2017/01/26 05:31:19, Dan Beam wrote:
> > > sorry, just found
> https://bugs.chromium.org/p/chromium/issues/detail?id=685440
> > > and evidence that this happened earlier today as well (before your patch)
> > > 
> > > hopefully stopped the CQ in time.  if not: sorry!
> > 
> > So, should I re-land this patch again?
> 
> Please do (or let me know if I shall do it for you).

Powered by Google App Engine
This is Rietveld 408576698