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

Side by Side Diff: ui/compositor/compositor.cc

Issue 12440005: Use gpu::Mailbox in IPCs instead of std::string (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ui/compositor/compositor.h" 5 #include "ui/compositor/compositor.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <deque> 8 #include <deque>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/memory/singleton.h" 12 #include "base/memory/singleton.h"
13 #include "base/message_loop.h" 13 #include "base/message_loop.h"
14 #include "base/string_util.h" 14 #include "base/string_util.h"
no sievers 2013/03/06 23:19:23 I think string_util.h is not needed anymore after
piman 2013/03/07 01:48:02 Done.
15 #include "base/threading/thread.h" 15 #include "base/threading/thread.h"
16 #include "base/threading/thread_restrictions.h" 16 #include "base/threading/thread_restrictions.h"
17 #include "cc/context_provider.h" 17 #include "cc/context_provider.h"
18 #include "cc/input_handler.h" 18 #include "cc/input_handler.h"
19 #include "cc/layer.h" 19 #include "cc/layer.h"
20 #include "cc/layer_tree_host.h" 20 #include "cc/layer_tree_host.h"
21 #include "cc/output_surface.h" 21 #include "cc/output_surface.h"
22 #include "cc/thread_impl.h" 22 #include "cc/thread_impl.h"
23 #include "gpu/command_buffer/common/mailbox.h"
23 #include "third_party/skia/include/core/SkBitmap.h" 24 #include "third_party/skia/include/core/SkBitmap.h"
24 #include "ui/compositor/compositor_observer.h" 25 #include "ui/compositor/compositor_observer.h"
25 #include "ui/compositor/compositor_switches.h" 26 #include "ui/compositor/compositor_switches.h"
26 #include "ui/compositor/dip_util.h" 27 #include "ui/compositor/dip_util.h"
27 #include "ui/compositor/layer.h" 28 #include "ui/compositor/layer.h"
28 #include "ui/compositor/test_web_graphics_context_3d.h" 29 #include "ui/compositor/test_web_graphics_context_3d.h"
29 #include "ui/gl/gl_context.h" 30 #include "ui/gl/gl_context.h"
30 #include "ui/gl/gl_implementation.h" 31 #include "ui/gl/gl_implementation.h"
31 #include "ui/gl/gl_surface.h" 32 #include "ui/gl/gl_surface.h"
32 #include "ui/gl/gl_switches.h" 33 #include "ui/gl/gl_switches.h"
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 256
256 Texture::Texture(bool flipped, const gfx::Size& size, float device_scale_factor) 257 Texture::Texture(bool flipped, const gfx::Size& size, float device_scale_factor)
257 : size_(size), 258 : size_(size),
258 flipped_(flipped), 259 flipped_(flipped),
259 device_scale_factor_(device_scale_factor) { 260 device_scale_factor_(device_scale_factor) {
260 } 261 }
261 262
262 Texture::~Texture() { 263 Texture::~Texture() {
263 } 264 }
264 265
265 std::string Texture::Produce() { 266 gpu::Mailbox Texture::Produce() {
266 return EmptyString(); 267 return gpu::Mailbox();
267 } 268 }
268 269
269 CompositorLock::CompositorLock(Compositor* compositor) 270 CompositorLock::CompositorLock(Compositor* compositor)
270 : compositor_(compositor) { 271 : compositor_(compositor) {
271 MessageLoop::current()->PostDelayedTask( 272 MessageLoop::current()->PostDelayedTask(
272 FROM_HERE, 273 FROM_HERE,
273 base::Bind(&CompositorLock::CancelLock, AsWeakPtr()), 274 base::Bind(&CompositorLock::CancelLock, AsWeakPtr()),
274 base::TimeDelta::FromMilliseconds(kCompositorLockTimeoutMs)); 275 base::TimeDelta::FromMilliseconds(kCompositorLockTimeoutMs));
275 } 276 }
276 277
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
691 692
692 COMPOSITOR_EXPORT void DisableTestCompositor() { 693 COMPOSITOR_EXPORT void DisableTestCompositor() {
693 g_test_compositor_enabled = false; 694 g_test_compositor_enabled = false;
694 } 695 }
695 696
696 COMPOSITOR_EXPORT bool IsTestCompositorEnabled() { 697 COMPOSITOR_EXPORT bool IsTestCompositorEnabled() {
697 return g_test_compositor_enabled; 698 return g_test_compositor_enabled;
698 } 699 }
699 700
700 } // namespace ui 701 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698