diff options
| author | Romain Guy <romainguy@google.com> | 2011-03-16 17:28:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-16 17:28:43 -0700 |
| commit | 72064c66e20b9cc86900a9d833c228c345a2b2a4 (patch) | |
| tree | 911894bd95721a7739ee8d17a2fbdab9e8b97b7f /include/utils | |
| parent | 8504423f00237e13e87499f74e41ecf73c3e8e1b (diff) | |
| parent | b0204d0a271dafdf5be216f30c001929bdd831c0 (diff) | |
| download | frameworks_base-72064c66e20b9cc86900a9d833c228c345a2b2a4.zip frameworks_base-72064c66e20b9cc86900a9d833c228c345a2b2a4.tar.gz frameworks_base-72064c66e20b9cc86900a9d833c228c345a2b2a4.tar.bz2 | |
am b0204d0a: am c2b91a61: Merge "Modify the GL renderer\'s functor to pass the clip to WebView" into honeycomb-mr1
* commit 'b0204d0a271dafdf5be216f30c001929bdd831c0':
Modify the GL renderer's functor to pass the clip to WebView
Diffstat (limited to 'include/utils')
| -rw-r--r-- | include/utils/Functor.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/utils/Functor.h b/include/utils/Functor.h index 565f4a3..e24ded4 100644 --- a/include/utils/Functor.h +++ b/include/utils/Functor.h @@ -25,8 +25,7 @@ class Functor { public: Functor() {} virtual ~Functor() {} - virtual status_t operator ()() { return true; } - virtual status_t operator ()(float* data, uint32_t len) { return true; } + virtual status_t operator ()(int what, void* data) { return NO_ERROR; } }; }; // namespace android |