diff options
author | Iliyan Malchev <malchev@google.com> | 2011-04-14 16:54:38 -0700 |
---|---|---|
committer | Iliyan Malchev <malchev@google.com> | 2011-05-03 15:49:40 -0700 |
commit | 4d7c1ce651bd5e283e694fa34641e1dc080613c0 (patch) | |
tree | cfb1f708b760f20b08ec81a6bc4d25c59ec8cc04 | |
parent | 9c7ac0d142eaf4b083a309299ab023932a9bb109 (diff) | |
download | frameworks_base-4d7c1ce651bd5e283e694fa34641e1dc080613c0.zip frameworks_base-4d7c1ce651bd5e283e694fa34641e1dc080613c0.tar.gz frameworks_base-4d7c1ce651bd5e283e694fa34641e1dc080613c0.tar.bz2 |
frameworks/base: make the ANativeWindow query() method const
query() does not modify the object's data, so it needs to be a const method
Change-Id: I67c40a3c865461e6f1cc2193fd2d74286ff6ac8f
Signed-off-by: Iliyan Malchev <malchev@google.com>
-rw-r--r-- | include/gui/SurfaceTextureClient.h | 4 | ||||
-rw-r--r-- | include/surfaceflinger/Surface.h | 4 | ||||
-rw-r--r-- | include/ui/FramebufferNativeWindow.h | 2 | ||||
-rw-r--r-- | include/ui/egl/android_natives.h | 2 | ||||
-rw-r--r-- | libs/gui/Surface.cpp | 6 | ||||
-rw-r--r-- | libs/gui/SurfaceTextureClient.cpp | 7 | ||||
-rw-r--r-- | libs/ui/FramebufferNativeWindow.cpp | 4 |
7 files changed, 15 insertions, 14 deletions
diff --git a/include/gui/SurfaceTextureClient.h b/include/gui/SurfaceTextureClient.h index fe9b049..61ccbcb 100644 --- a/include/gui/SurfaceTextureClient.h +++ b/include/gui/SurfaceTextureClient.h @@ -49,7 +49,7 @@ private: static int dequeueBuffer(ANativeWindow* window, android_native_buffer_t** buffer); static int lockBuffer(ANativeWindow* window, android_native_buffer_t* buffer); static int perform(ANativeWindow* window, int operation, ...); - static int query(ANativeWindow* window, int what, int* value); + static int query(const ANativeWindow* window, int what, int* value); static int queueBuffer(ANativeWindow* window, android_native_buffer_t* buffer); static int setSwapInterval(ANativeWindow* window, int interval); @@ -57,7 +57,7 @@ private: int dequeueBuffer(android_native_buffer_t** buffer); int lockBuffer(android_native_buffer_t* buffer); int perform(int operation, va_list args); - int query(int what, int* value); + int query(int what, int* value) const; int queueBuffer(android_native_buffer_t* buffer); int setSwapInterval(int interval); diff --git a/include/surfaceflinger/Surface.h b/include/surfaceflinger/Surface.h index 3923e61..31f2496 100644 --- a/include/surfaceflinger/Surface.h +++ b/include/surfaceflinger/Surface.h @@ -206,14 +206,14 @@ private: static int cancelBuffer(ANativeWindow* window, android_native_buffer_t* buffer); static int lockBuffer(ANativeWindow* window, android_native_buffer_t* buffer); static int queueBuffer(ANativeWindow* window, android_native_buffer_t* buffer); - static int query(ANativeWindow* window, int what, int* value); + static int query(const ANativeWindow* window, int what, int* value); static int perform(ANativeWindow* window, int operation, ...); int dequeueBuffer(android_native_buffer_t** buffer); int lockBuffer(android_native_buffer_t* buffer); int queueBuffer(android_native_buffer_t* buffer); int cancelBuffer(android_native_buffer_t* buffer); - int query(int what, int* value); + int query(int what, int* value) const; int perform(int operation, va_list args); void dispatch_setUsage(va_list args); diff --git a/include/ui/FramebufferNativeWindow.h b/include/ui/FramebufferNativeWindow.h index 16117ad..3e67f96 100644 --- a/include/ui/FramebufferNativeWindow.h +++ b/include/ui/FramebufferNativeWindow.h @@ -70,7 +70,7 @@ private: static int dequeueBuffer(ANativeWindow* window, android_native_buffer_t** buffer); static int lockBuffer(ANativeWindow* window, android_native_buffer_t* buffer); static int queueBuffer(ANativeWindow* window, android_native_buffer_t* buffer); - static int query(ANativeWindow* window, int what, int* value); + static int query(const ANativeWindow* window, int what, int* value); static int perform(ANativeWindow* window, int operation, ...); framebuffer_device_t* fbDev; diff --git a/include/ui/egl/android_natives.h b/include/ui/egl/android_natives.h index 0a6e4fb..79339a4 100644 --- a/include/ui/egl/android_natives.h +++ b/include/ui/egl/android_natives.h @@ -249,7 +249,7 @@ struct ANativeWindow * * Returns 0 on success or -errno on error. */ - int (*query)(struct ANativeWindow* window, + int (*query)(const struct ANativeWindow* window, int what, int* value); /* diff --git a/libs/gui/Surface.cpp b/libs/gui/Surface.cpp index 44d9b4b..812bd6a 100644 --- a/libs/gui/Surface.cpp +++ b/libs/gui/Surface.cpp @@ -536,9 +536,9 @@ int Surface::queueBuffer(ANativeWindow* window, return self->queueBuffer(buffer); } -int Surface::query(ANativeWindow* window, +int Surface::query(const ANativeWindow* window, int what, int* value) { - Surface* self = getSelf(window); + const Surface* self = getSelf(window); return self->query(what, value); } @@ -697,7 +697,7 @@ int Surface::queueBuffer(android_native_buffer_t* buffer) return err; } -int Surface::query(int what, int* value) +int Surface::query(int what, int* value) const { switch (what) { case NATIVE_WINDOW_WIDTH: diff --git a/libs/gui/SurfaceTextureClient.cpp b/libs/gui/SurfaceTextureClient.cpp index f4b2416..7631449 100644 --- a/libs/gui/SurfaceTextureClient.cpp +++ b/libs/gui/SurfaceTextureClient.cpp @@ -76,8 +76,9 @@ int SurfaceTextureClient::queueBuffer(ANativeWindow* window, return c->queueBuffer(buffer); } -int SurfaceTextureClient::query(ANativeWindow* window, int what, int* value) { - SurfaceTextureClient* c = getSelf(window); +int SurfaceTextureClient::query(const ANativeWindow* window, + int what, int* value) { + const SurfaceTextureClient* c = getSelf(window); return c->query(what, value); } @@ -160,7 +161,7 @@ int SurfaceTextureClient::queueBuffer(android_native_buffer_t* buffer) { return BAD_VALUE; } -int SurfaceTextureClient::query(int what, int* value) { +int SurfaceTextureClient::query(int what, int* value) const { LOGV("SurfaceTextureClient::query"); Mutex::Autolock lock(mMutex); switch (what) { diff --git a/libs/ui/FramebufferNativeWindow.cpp b/libs/ui/FramebufferNativeWindow.cpp index dc223f9..0c820e5 100644 --- a/libs/ui/FramebufferNativeWindow.cpp +++ b/libs/ui/FramebufferNativeWindow.cpp @@ -270,10 +270,10 @@ int FramebufferNativeWindow::queueBuffer(ANativeWindow* window, return res; } -int FramebufferNativeWindow::query(ANativeWindow* window, +int FramebufferNativeWindow::query(const ANativeWindow* window, int what, int* value) { - FramebufferNativeWindow* self = getSelf(window); + const FramebufferNativeWindow* self = getSelf(window); Mutex::Autolock _l(self->mutex); framebuffer_device_t* fb = self->fbDev; switch (what) { |