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

Side by Side Diff: blimp/client/feature/compositor/blimp_compositor.cc

Issue 2241623002: blimp: Move compositing, input and render widget feature to client/core. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix gn files Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "blimp/client/feature/compositor/blimp_compositor.h" 5 #include "blimp/client/feature/compositor/blimp_compositor.h"
nyquist 2016/08/16 23:14:57 Does this file still exist after your change, or s
Khushal 2016/08/18 03:16:32 Done.
6 6
7 #include <blimp/client/core/compositor/blimp_delegating_output_surface.h>
nyquist 2016/08/16 23:14:57 This had a weird format and location in the file..
Khushal 2016/08/18 03:16:32 Done.
7 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
8 #include "base/command_line.h" 9 #include "base/command_line.h"
9 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
10 #include "base/numerics/safe_conversions.h" 11 #include "base/numerics/safe_conversions.h"
11 #include "base/single_thread_task_runner.h" 12 #include "base/single_thread_task_runner.h"
12 #include "base/threading/thread.h" 13 #include "base/threading/thread.h"
13 #include "base/threading/thread_local.h" 14 #include "base/threading/thread_local.h"
14 #include "base/threading/thread_restrictions.h" 15 #include "base/threading/thread_restrictions.h"
15 #include "base/threading/thread_task_runner_handle.h" 16 #include "base/threading/thread_task_runner_handle.h"
16 #include "blimp/client/feature/compositor/blimp_context_provider.h" 17 #include "blimp/client/feature/compositor/blimp_context_provider.h"
17 #include "blimp/client/feature/compositor/blimp_delegating_output_surface.h"
18 #include "blimp/client/feature/compositor/blimp_output_surface.h" 18 #include "blimp/client/feature/compositor/blimp_output_surface.h"
19 #include "cc/animation/animation_host.h" 19 #include "cc/animation/animation_host.h"
20 #include "cc/layers/layer.h" 20 #include "cc/layers/layer.h"
21 #include "cc/output/output_surface.h" 21 #include "cc/output/output_surface.h"
22 #include "cc/proto/compositor_message.pb.h" 22 #include "cc/proto/compositor_message.pb.h"
23 #include "cc/trees/layer_tree_host.h" 23 #include "cc/trees/layer_tree_host.h"
24 #include "net/base/net_errors.h" 24 #include "net/base/net_errors.h"
25 #include "ui/gl/gl_surface.h" 25 #include "ui/gl/gl_surface.h"
26 26
27 namespace blimp { 27 namespace blimp {
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 client_->GetGpuMemoryBufferManager(), 278 client_->GetGpuMemoryBufferManager(),
279 host_->settings().renderer_settings, 279 host_->settings().renderer_settings,
280 client_->GetCompositorTaskRunner().get()); 280 client_->GetCompositorTaskRunner().get());
281 281
282 host_->SetOutputSurface(std::move(delegating_output_surface)); 282 host_->SetOutputSurface(std::move(delegating_output_surface));
283 output_surface_request_pending_ = false; 283 output_surface_request_pending_ = false;
284 } 284 }
285 285
286 } // namespace client 286 } // namespace client
287 } // namespace blimp 287 } // namespace blimp
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698