summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorbacker@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-12 15:16:58 +0000
committerbacker@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-12 15:16:58 +0000
commite1e4764e8bb875391a5888bfb2996b86fa538a4f (patch)
treec42181cc43bed157f5b410fc3f0d2cb96282257d /chrome
parenta7b09ca2a399d8ab1ae37f7e10b0211835f27f88 (diff)
downloadchromium_src-e1e4764e8bb875391a5888bfb2996b86fa538a4f.zip
chromium_src-e1e4764e8bb875391a5888bfb2996b86fa538a4f.tar.gz
chromium_src-e1e4764e8bb875391a5888bfb2996b86fa538a4f.tar.bz2
Gets rid of chrome being cleared for a moment when keyboard is hidden
When the keyboard was hidden, the chrome would be temporarily hidden while the ui was layed out. This patch gets rid of this. The problem was that the texture bounds is delayed some delay after the layer bounds are set. This would make the math fail inside drawInternal BUG= TEST= Review URL: http://codereview.chromium.org/7461152 Patch from Peter Kotwicz <pkotwicz@chromium.org>. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96557 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/renderer_host/accelerated_surface_container_touch.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/renderer_host/accelerated_surface_container_touch.cc b/chrome/browser/renderer_host/accelerated_surface_container_touch.cc
index a4f2eb7..e3a5237 100644
--- a/chrome/browser/renderer_host/accelerated_surface_container_touch.cc
+++ b/chrome/browser/renderer_host/accelerated_surface_container_touch.cc
@@ -27,7 +27,7 @@ class AcceleratedSurfaceContainerTouchEGL
uint64 surface_handle);
// TextureGL implementation
virtual void Draw(const ui::TextureDrawParams& params,
- const gfx::Rect& clip_bounds) OVERRIDE;
+ const gfx::Rect& clip_bounds_in_texture) OVERRIDE;
private:
~AcceleratedSurfaceContainerTouchEGL();
@@ -44,7 +44,7 @@ class AcceleratedSurfaceContainerTouchGLX
uint64 surface_handle);
// TextureGL implementation
virtual void Draw(const ui::TextureDrawParams& params,
- const gfx::Rect& clip_bounds) OVERRIDE;
+ const gfx::Rect& clip_bounds_in_texture) OVERRIDE;
private:
~AcceleratedSurfaceContainerTouchGLX();
@@ -90,7 +90,7 @@ AcceleratedSurfaceContainerTouchEGL::~AcceleratedSurfaceContainerTouchEGL() {
void AcceleratedSurfaceContainerTouchEGL::Draw(
const ui::TextureDrawParams& params,
- const gfx::Rect& clip_bounds) {
+ const gfx::Rect& clip_bounds_in_texture) {
DCHECK(compositor_->program_no_swizzle());
ui::TextureDrawParams modified_params = params;
@@ -105,7 +105,7 @@ void AcceleratedSurfaceContainerTouchEGL::Draw(
DrawInternal(*compositor_->program_no_swizzle(),
modified_params,
- clip_bounds);
+ clip_bounds_in_texture);
}
AcceleratedSurfaceContainerTouchGLX::AcceleratedSurfaceContainerTouchGLX(
@@ -205,7 +205,7 @@ AcceleratedSurfaceContainerTouchGLX::~AcceleratedSurfaceContainerTouchGLX() {
void AcceleratedSurfaceContainerTouchGLX::Draw(
const ui::TextureDrawParams& params,
- const gfx::Rect& clip_bounds) {
+ const gfx::Rect& clip_bounds_in_texture) {
DCHECK(compositor_->program_no_swizzle());
Display* dpy = gfx::GLSurfaceGLX::GetDisplay();
@@ -213,7 +213,7 @@ void AcceleratedSurfaceContainerTouchGLX::Draw(
glXBindTexImageEXT(dpy, glx_pixmap_, GLX_FRONT_LEFT_EXT, NULL);
DrawInternal(*compositor_->program_no_swizzle(),
params,
- clip_bounds);
+ clip_bounds_in_texture);
glXReleaseTexImageEXT(dpy, glx_pixmap_, GLX_FRONT_LEFT_EXT);
}