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

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

Issue 163433008: Revert 251207 "Use gpu::Mailbox instead of std:string in IPCs" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 10 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 | « trunk/src/ui/compositor/compositor.h ('k') | trunk/src/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"
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 85
86 Texture::Texture(bool flipped, const gfx::Size& size, float device_scale_factor) 86 Texture::Texture(bool flipped, const gfx::Size& size, float device_scale_factor)
87 : size_(size), 87 : size_(size),
88 flipped_(flipped), 88 flipped_(flipped),
89 device_scale_factor_(device_scale_factor) { 89 device_scale_factor_(device_scale_factor) {
90 } 90 }
91 91
92 Texture::~Texture() { 92 Texture::~Texture() {
93 } 93 }
94 94
95 gpu::Mailbox Texture::Produce() { 95 std::string Texture::Produce() {
96 return gpu::Mailbox(); 96 return std::string();
97 } 97 }
98 98
99 CompositorLock::CompositorLock(Compositor* compositor) 99 CompositorLock::CompositorLock(Compositor* compositor)
100 : compositor_(compositor) { 100 : compositor_(compositor) {
101 base::MessageLoop::current()->PostDelayedTask( 101 base::MessageLoop::current()->PostDelayedTask(
102 FROM_HERE, 102 FROM_HERE,
103 base::Bind(&CompositorLock::CancelLock, AsWeakPtr()), 103 base::Bind(&CompositorLock::CancelLock, AsWeakPtr()),
104 base::TimeDelta::FromMilliseconds(kCompositorLockTimeoutMs)); 104 base::TimeDelta::FromMilliseconds(kCompositorLockTimeoutMs));
105 } 105 }
106 106
(...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after
559 // CompositorObservers to be notified before starting another 559 // CompositorObservers to be notified before starting another
560 // draw cycle. 560 // draw cycle.
561 ScheduleDraw(); 561 ScheduleDraw();
562 } 562 }
563 FOR_EACH_OBSERVER(CompositorObserver, 563 FOR_EACH_OBSERVER(CompositorObserver,
564 observer_list_, 564 observer_list_,
565 OnCompositingEnded(this)); 565 OnCompositingEnded(this));
566 } 566 }
567 567
568 } // namespace ui 568 } // namespace ui
OLDNEW
« no previous file with comments | « trunk/src/ui/compositor/compositor.h ('k') | trunk/src/ui/compositor/compositor.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698