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

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: rebase 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
« no previous file with comments | « ui/compositor/compositor.h ('k') | ui/compositor/compositor.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
15 #include "base/threading/thread.h" 14 #include "base/threading/thread.h"
16 #include "base/threading/thread_restrictions.h" 15 #include "base/threading/thread_restrictions.h"
17 #include "cc/context_provider.h" 16 #include "cc/context_provider.h"
18 #include "cc/input_handler.h" 17 #include "cc/input_handler.h"
19 #include "cc/layer.h" 18 #include "cc/layer.h"
20 #include "cc/layer_tree_host.h" 19 #include "cc/layer_tree_host.h"
21 #include "cc/output_surface.h" 20 #include "cc/output_surface.h"
22 #include "cc/thread_impl.h" 21 #include "cc/thread_impl.h"
22 #include "gpu/command_buffer/common/mailbox.h"
23 #include "third_party/skia/include/core/SkBitmap.h" 23 #include "third_party/skia/include/core/SkBitmap.h"
24 #include "ui/compositor/compositor_observer.h" 24 #include "ui/compositor/compositor_observer.h"
25 #include "ui/compositor/compositor_switches.h" 25 #include "ui/compositor/compositor_switches.h"
26 #include "ui/compositor/dip_util.h" 26 #include "ui/compositor/dip_util.h"
27 #include "ui/compositor/layer.h" 27 #include "ui/compositor/layer.h"
28 #include "ui/compositor/test_web_graphics_context_3d.h" 28 #include "ui/compositor/test_web_graphics_context_3d.h"
29 #include "ui/gl/gl_context.h" 29 #include "ui/gl/gl_context.h"
30 #include "ui/gl/gl_implementation.h" 30 #include "ui/gl/gl_implementation.h"
31 #include "ui/gl/gl_surface.h" 31 #include "ui/gl/gl_surface.h"
32 #include "ui/gl/gl_switches.h" 32 #include "ui/gl/gl_switches.h"
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 278
279 Texture::Texture(bool flipped, const gfx::Size& size, float device_scale_factor) 279 Texture::Texture(bool flipped, const gfx::Size& size, float device_scale_factor)
280 : size_(size), 280 : size_(size),
281 flipped_(flipped), 281 flipped_(flipped),
282 device_scale_factor_(device_scale_factor) { 282 device_scale_factor_(device_scale_factor) {
283 } 283 }
284 284
285 Texture::~Texture() { 285 Texture::~Texture() {
286 } 286 }
287 287
288 std::string Texture::Produce() { 288 gpu::Mailbox Texture::Produce() {
289 return EmptyString(); 289 return gpu::Mailbox();
290 } 290 }
291 291
292 CompositorLock::CompositorLock(Compositor* compositor) 292 CompositorLock::CompositorLock(Compositor* compositor)
293 : compositor_(compositor) { 293 : compositor_(compositor) {
294 MessageLoop::current()->PostDelayedTask( 294 MessageLoop::current()->PostDelayedTask(
295 FROM_HERE, 295 FROM_HERE,
296 base::Bind(&CompositorLock::CancelLock, AsWeakPtr()), 296 base::Bind(&CompositorLock::CancelLock, AsWeakPtr()),
297 base::TimeDelta::FromMilliseconds(kCompositorLockTimeoutMs)); 297 base::TimeDelta::FromMilliseconds(kCompositorLockTimeoutMs));
298 } 298 }
299 299
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
693 COMPOSITOR_EXPORT void DisableTestCompositor() { 693 COMPOSITOR_EXPORT void DisableTestCompositor() {
694 ResetImplicitFactory(); 694 ResetImplicitFactory();
695 g_test_compositor_enabled = false; 695 g_test_compositor_enabled = false;
696 } 696 }
697 697
698 COMPOSITOR_EXPORT bool IsTestCompositorEnabled() { 698 COMPOSITOR_EXPORT bool IsTestCompositorEnabled() {
699 return g_test_compositor_enabled; 699 return g_test_compositor_enabled;
700 } 700 }
701 701
702 } // namespace ui 702 } // namespace ui
OLDNEW
« no previous file with comments | « ui/compositor/compositor.h ('k') | ui/compositor/compositor.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698