Commit e5ebb726 authored Mar 16, 2011 by Romain Guy Committed by Android Git Automerger Mar 16, 2011

am b0204d0a: am c2b91a61: Merge "Modify the GL renderer\'s functor to pass the...

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

parents 1dd4a81c 8311f420

include/utils/Functor.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -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