Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(430)

Unified Diff: ui/gfx/compositor/compositor_gl.cc

Issue 7461152: Gets rid of chrome being cleared for a moment when keyboard is hidden (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Modified variable name in all relevant files Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/compositor/compositor_gl.h ('k') | ui/gfx/compositor/compositor_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/compositor/compositor_gl.cc
diff --git a/ui/gfx/compositor/compositor_gl.cc b/ui/gfx/compositor/compositor_gl.cc
index 6e1e65160f90ab50da4cf374b41042b54fd6b385..db0618f203e419e86b5ca19157389ce6adb7e756 100644
--- a/ui/gfx/compositor/compositor_gl.cc
+++ b/ui/gfx/compositor/compositor_gl.cc
@@ -336,13 +336,17 @@ void TextureGL::Draw(const ui::TextureDrawParams& params) {
}
void TextureGL::Draw(const ui::TextureDrawParams& params,
- const gfx::Rect& clip_bounds) {
+ const gfx::Rect& clip_bounds_in_texture) {
DCHECK(compositor_->program_swizzle());
- DrawInternal(*compositor_->program_swizzle(), params, clip_bounds);
+ DrawInternal(*compositor_->program_swizzle(), params, clip_bounds_in_texture);
}
void TextureGL::DrawInternal(const ui::TextureProgramGL& program,
const ui::TextureDrawParams& params,
- const gfx::Rect& clip_bounds) {
+ const gfx::Rect& clip_bounds_in_texture) {
+ // clip clip_bounds_in_layer to size of texture
sky 2011/08/17 15:53:57 -> Clip clip_bounds_in_texture to current size.
+ gfx::Rect clip_bounds = clip_bounds_in_texture.Intersect(
+ gfx::Rect(gfx::Point(0, 0), size_));
+
if (params.blend)
glEnable(GL_BLEND);
else
« no previous file with comments | « ui/gfx/compositor/compositor_gl.h ('k') | ui/gfx/compositor/compositor_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698