| OLD | NEW |
| 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 #ifndef WebToCCInputHandlerAdapter_h | 5 #ifndef WebToCCInputHandlerAdapter_h |
| 6 #define WebToCCInputHandlerAdapter_h | 6 #define WebToCCInputHandlerAdapter_h |
| 7 | 7 |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "CCInputHandler.h" | 9 #include "cc/input_handler.h" |
| 10 #include <public/WebInputHandler.h> | 10 #include "third_party/WebKit/Source/Platform/chromium/public/WebInputHandler.h" |
| 11 #include <wtf/OwnPtr.h> | |
| 12 #include <wtf/PassOwnPtr.h> | |
| 13 | 11 |
| 14 namespace WebKit { | 12 namespace WebKit { |
| 15 | 13 |
| 16 class WebToCCInputHandlerAdapter : public cc::CCInputHandler { | 14 class WebToCCInputHandlerAdapter : public cc::CCInputHandler { |
| 17 public: | 15 public: |
| 18 static scoped_ptr<WebToCCInputHandlerAdapter> create(PassOwnPtr<WebInputHand
ler>); | 16 static scoped_ptr<WebToCCInputHandlerAdapter> create(scoped_ptr<WebInputHand
ler>); |
| 19 virtual ~WebToCCInputHandlerAdapter(); | 17 virtual ~WebToCCInputHandlerAdapter(); |
| 20 | 18 |
| 21 // cc::CCInputHandler implementation. | 19 // cc::CCInputHandler implementation. |
| 22 virtual void bindToClient(cc::CCInputHandlerClient*) OVERRIDE; | 20 virtual void bindToClient(cc::CCInputHandlerClient*) OVERRIDE; |
| 23 virtual void animate(double monotonicTime) OVERRIDE; | 21 virtual void animate(double monotonicTime) OVERRIDE; |
| 24 | 22 |
| 25 private: | 23 private: |
| 26 explicit WebToCCInputHandlerAdapter(PassOwnPtr<WebInputHandler>); | 24 explicit WebToCCInputHandlerAdapter(scoped_ptr<WebInputHandler>); |
| 27 | 25 |
| 28 class ClientAdapter; | 26 class ClientAdapter; |
| 29 OwnPtr<ClientAdapter> m_clientAdapter; | 27 scoped_ptr<ClientAdapter> m_clientAdapter; |
| 30 OwnPtr<WebInputHandler> m_handler; | 28 scoped_ptr<WebInputHandler> m_handler; |
| 31 }; | 29 }; |
| 32 | 30 |
| 33 } | 31 } |
| 34 | 32 |
| 35 #endif // WebToCCInputHandlerAdapter_h | 33 #endif // WebToCCInputHandlerAdapter_h |
| OLD | NEW |