summaryrefslogtreecommitdiffstats
path: root/include/utils
diff options
context:
space:
mode:
authorRomain Guy <romainguy@google.com>2011-03-16 17:31:30 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-16 17:31:30 -0700
commita30f43624f76a7d49fcb48944c310cb4dbfc6522 (patch)
tree33802c8360cead9e9dd88ecfe8e8d8e167dc5b3d /include/utils
parentd50349de17784f924f8cca6ef2fb2708b9fd2ecd (diff)
parent72064c66e20b9cc86900a9d833c228c345a2b2a4 (diff)
downloadframeworks_base-a30f43624f76a7d49fcb48944c310cb4dbfc6522.zip
frameworks_base-a30f43624f76a7d49fcb48944c310cb4dbfc6522.tar.gz
frameworks_base-a30f43624f76a7d49fcb48944c310cb4dbfc6522.tar.bz2
am 72064c66: am b0204d0a: am c2b91a61: Merge "Modify the GL renderer\'s functor to pass the clip to WebView" into honeycomb-mr1
* commit '72064c66e20b9cc86900a9d833c228c345a2b2a4': Modify the GL renderer's functor to pass the clip to WebView
Diffstat (limited to 'include/utils')
-rw-r--r--include/utils/Functor.h3
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