| Index: gpu/demos/framework/pepper.cc
|
| ===================================================================
|
| --- gpu/demos/framework/pepper.cc (revision 65093)
|
| +++ gpu/demos/framework/pepper.cc (working copy)
|
| @@ -35,32 +35,31 @@
|
| }
|
| }
|
|
|
| - virtual void ViewChanged(const pp::Rect& position, const pp::Rect& /*clip*/) {
|
| - if (size_.IsEmpty() && !position.IsEmpty()) {
|
| - size_ = position.size();
|
| - demo_->InitWindowSize(size_.width(), size_.height());
|
| + virtual void DidChangeView(const pp::Rect& position,
|
| + const pp::Rect& /*clip*/) {
|
| + if (size_ == position.size())
|
| + return;
|
| +
|
| + size_ = position.size();
|
| + demo_->InitWindowSize(size_.width(), size_.height());
|
| +
|
| + if (graphics_.is_null()) {
|
| graphics_ = pp::Graphics3D_Dev(*this, 0, NULL, NULL);
|
| - if (!graphics_.is_null()) {
|
| - graphics_.MakeCurrent();
|
| - demo_->InitGL();
|
| - pp::Graphics3D_Dev::ResetCurrent();
|
| + if (graphics_.is_null())
|
| + return;
|
|
|
| - // TODO(neb): Remove this once the startup order bug (51842) is fixed.
|
| - if (true)
|
| - // if (demo_->IsAnimated())
|
| - Animate(0);
|
| - else
|
| - Paint();
|
| - }
|
| + if (!pp::Instance::BindGraphics(graphics_))
|
| + return;
|
| +
|
| + graphics_.MakeCurrent();
|
| + demo_->InitGL();
|
| + pp::Graphics3D_Dev::ResetCurrent();
|
| }
|
| - }
|
|
|
| - virtual void Graphics3DContextLost() {
|
| - // TODO(neb): Replace this with the correct code once 53889 is fixed.
|
| - Paint();
|
| -// pp::Rect fake_position(size_);
|
| -// size_ = pp::Size();
|
| -// ViewChanged(fake_position, fake_position);
|
| + if (demo_->IsAnimated())
|
| + Animate(0);
|
| + else
|
| + Paint();
|
| }
|
|
|
| void Paint() {
|
|
|