| Index: ppapi/examples/mouse_lock/mouse_lock.cc
|
| diff --git a/ppapi/examples/mouse_lock/mouse_lock.cc b/ppapi/examples/mouse_lock/mouse_lock.cc
|
| index f6bfbb653b50b8c7f5ca521dc6dfb707359236a3..7eec8284d0191014ef42c470863d6c6ab06c50a1 100644
|
| --- a/ppapi/examples/mouse_lock/mouse_lock.cc
|
| +++ b/ppapi/examples/mouse_lock/mouse_lock.cc
|
| @@ -51,8 +51,7 @@ class MyInstance : public pp::Instance, public pp::MouseLock {
|
| pp::MouseInputEvent mouse_event(event);
|
| if (mouse_event.GetButton() == PP_INPUTEVENT_MOUSEBUTTON_LEFT &&
|
| !mouse_locked_) {
|
| - LockMouse(
|
| - callback_factory_.NewRequiredCallback(&MyInstance::DidLockMouse));
|
| + LockMouse(callback_factory_.NewCallback(&MyInstance::DidLockMouse));
|
| }
|
| return true;
|
| }
|
| @@ -69,12 +68,10 @@ class MyInstance : public pp::Instance, public pp::MouseLock {
|
| pp::KeyboardInputEvent key_event(event);
|
| // Lock the mouse when the Enter key is pressed.
|
| if (key_event.GetKeyCode() == 13) {
|
| - if (mouse_locked_) {
|
| + if (mouse_locked_)
|
| UnlockMouse();
|
| - } else {
|
| - LockMouse(callback_factory_.NewRequiredCallback(
|
| - &MyInstance::DidLockMouse));
|
| - }
|
| + else
|
| + LockMouse(callback_factory_.NewCallback(&MyInstance::DidLockMouse));
|
| return true;
|
| }
|
| return false;
|
| @@ -135,7 +132,7 @@ class MyInstance : public pp::Instance, public pp::MouseLock {
|
| device_context_.ReplaceContents(&image);
|
| waiting_for_flush_completion_ = true;
|
| device_context_.Flush(
|
| - callback_factory_.NewRequiredCallback(&MyInstance::DidFlush));
|
| + callback_factory_.NewCallback(&MyInstance::DidFlush));
|
| }
|
| }
|
|
|
|
|