projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 7.36.149.0
[platform/framework/web/crosswalk.git]
/
src
/
cc
/
test
/
fake_output_surface.cc
diff --git
a/src/cc/test/fake_output_surface.cc
b/src/cc/test/fake_output_surface.cc
index
e72253c
..
352b6e4
100644
(file)
--- a/
src/cc/test/fake_output_surface.cc
+++ b/
src/cc/test/fake_output_surface.cc
@@
-19,7
+19,7
@@
FakeOutputSurface::FakeOutputSurface(
: OutputSurface(context_provider),
client_(NULL),
num_sent_frames_(0),
: OutputSurface(context_provider),
client_(NULL),
num_sent_frames_(0),
- needs_begin_
impl_
frame_(false),
+ needs_begin_frame_(false),
forced_draw_to_software_device_(false),
has_external_stencil_test_(false),
fake_weak_ptr_factory_(this) {
forced_draw_to_software_device_(false),
has_external_stencil_test_(false),
fake_weak_ptr_factory_(this) {
@@
-76,7
+76,7
@@
void FakeOutputSurface::SwapBuffers(CompositorFrame* frame) {
++num_sent_frames_;
PostSwapBuffersComplete();
++num_sent_frames_;
PostSwapBuffersComplete();
- DidSwapBuffers();
+
client_->
DidSwapBuffers();
} else {
OutputSurface::SwapBuffers(frame);
frame->AssignTo(&last_sent_frame_);
} else {
OutputSurface::SwapBuffers(frame);
frame->AssignTo(&last_sent_frame_);
@@
-84,22
+84,21
@@
void FakeOutputSurface::SwapBuffers(CompositorFrame* frame) {
}
}
}
}
-void FakeOutputSurface::SetNeedsBegin
Impl
Frame(bool enable) {
- needs_begin_
impl_
frame_ = enable;
- OutputSurface::SetNeedsBegin
Impl
Frame(enable);
+void FakeOutputSurface::SetNeedsBeginFrame(bool enable) {
+ needs_begin_frame_ = enable;
+ OutputSurface::SetNeedsBeginFrame(enable);
- // If there is not BeginImplFrame emulation from the FrameRateController,
- // then we just post a BeginImplFrame to emulate it as part of the test.
- if (enable && !frame_rate_controller_) {
+ if (enable) {
base::MessageLoop::current()->PostDelayedTask(
base::MessageLoop::current()->PostDelayedTask(
- FROM_HERE, base::Bind(&FakeOutputSurface::OnBeginImplFrame,
- fake_weak_ptr_factory_.GetWeakPtr()),
+ FROM_HERE,
+ base::Bind(&FakeOutputSurface::OnBeginFrame,
+ fake_weak_ptr_factory_.GetWeakPtr()),
base::TimeDelta::FromMilliseconds(16));
}
}
base::TimeDelta::FromMilliseconds(16));
}
}
-void FakeOutputSurface::OnBegin
Impl
Frame() {
-
OutputSurface::BeginImpl
Frame(BeginFrameArgs::CreateForTesting());
+void FakeOutputSurface::OnBeginFrame() {
+
client_->Begin
Frame(BeginFrameArgs::CreateForTesting());
}
}