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

Side by Side Diff: cc/test/fake_output_surface.cc

Issue 12545018: Move context-related callbacks into OutputSurface (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: suppress lost context notification before renderer initialized 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 "cc/test/fake_output_surface.h" 5 #include "cc/test/fake_output_surface.h"
6 6
7 namespace cc { 7 namespace cc {
8 8
9 FakeOutputSurface::FakeOutputSurface( 9 FakeOutputSurface::FakeOutputSurface(
10 scoped_ptr<WebKit::WebGraphicsContext3D> context3d, bool has_parent) 10 scoped_ptr<WebKit::WebGraphicsContext3D> context3d, bool has_parent)
11 : OutputSurface(context3d.Pass()), 11 : OutputSurface(context3d.Pass()),
12 num_sent_frames_(0) { 12 num_sent_frames_(0) {
13 capabilities_.has_parent_compositor = has_parent; 13 capabilities_.has_parent_compositor = has_parent;
14 } 14 }
15 15
16 FakeOutputSurface::FakeOutputSurface( 16 FakeOutputSurface::FakeOutputSurface(
17 scoped_ptr<SoftwareOutputDevice> software_device, bool has_parent) 17 scoped_ptr<SoftwareOutputDevice> software_device, bool has_parent)
18 : OutputSurface(software_device.Pass()), 18 : OutputSurface(software_device.Pass()),
19 num_sent_frames_(0) { 19 num_sent_frames_(0) {
20 capabilities_.has_parent_compositor = has_parent; 20 capabilities_.has_parent_compositor = has_parent;
21 } 21 }
22 22
23 FakeOutputSurface::~FakeOutputSurface() {} 23 FakeOutputSurface::~FakeOutputSurface() {}
24 24
25 bool FakeOutputSurface::BindToClient(
26 cc::OutputSurfaceClient* client) {
27 DCHECK(client);
28 client_ = client;
29 if (!context3d_)
30 return true;
31 return context3d_->makeContextCurrent();
32 }
33
34 void FakeOutputSurface::SendFrameToParentCompositor( 25 void FakeOutputSurface::SendFrameToParentCompositor(
35 CompositorFrame* frame) { 26 CompositorFrame* frame) {
36 frame->AssignTo(&last_sent_frame_); 27 frame->AssignTo(&last_sent_frame_);
37 ++num_sent_frames_; 28 ++num_sent_frames_;
38 } 29 }
39 30
40 } // namespace cc 31 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698