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

Side by Side 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: removed extraneous code 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/gfx/compositor/compositor_gl.h" 5 #include "ui/gfx/compositor/compositor_gl.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 Draw(params, gfx::Rect(0, 0, size_.width(), size_.height())); 335 Draw(params, gfx::Rect(0, 0, size_.width(), size_.height()));
336 } 336 }
337 337
338 void TextureGL::Draw(const ui::TextureDrawParams& params, 338 void TextureGL::Draw(const ui::TextureDrawParams& params,
339 const gfx::Rect& clip_bounds) { 339 const gfx::Rect& clip_bounds) {
340 DCHECK(compositor_->program_swizzle()); 340 DCHECK(compositor_->program_swizzle());
341 DrawInternal(*compositor_->program_swizzle(), params, clip_bounds); 341 DrawInternal(*compositor_->program_swizzle(), params, clip_bounds);
342 } 342 }
343 void TextureGL::DrawInternal(const ui::TextureProgramGL& program, 343 void TextureGL::DrawInternal(const ui::TextureProgramGL& program,
344 const ui::TextureDrawParams& params, 344 const ui::TextureDrawParams& params,
345 const gfx::Rect& clip_bounds) { 345 const gfx::Rect& clip_bounds_in_layer) {
jonathan.backer 2011/08/11 11:52:52 How about we call it clip_bounds_in_texture, regio
346 // clip clip_bounds_in_layer to size of texture
347 gfx::Rect clip_bounds = clip_bounds_in_layer.Intersect(
348 gfx::Rect(gfx::Point(0, 0), size_));
349
346 if (params.blend) 350 if (params.blend)
347 glEnable(GL_BLEND); 351 glEnable(GL_BLEND);
348 else 352 else
349 glDisable(GL_BLEND); 353 glDisable(GL_BLEND);
350 354
351 program.Use(); 355 program.Use();
352 356
353 glActiveTexture(GL_TEXTURE0); 357 glActiveTexture(GL_TEXTURE0);
354 glUniform1i(program.u_tex_loc(), 0); 358 glUniform1i(program.u_tex_loc(), 0);
355 glBindTexture(GL_TEXTURE_2D, texture_id_); 359 glBindTexture(GL_TEXTURE_2D, texture_id_);
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
499 // on this thread long enough to perform the GL bindings. 503 // on this thread long enough to perform the GL bindings.
500 // TODO(wjmaclean) Remove this when GL initialisation cleaned up. 504 // TODO(wjmaclean) Remove this when GL initialisation cleaned up.
501 base::ThreadRestrictions::ScopedAllowIO allow_io; 505 base::ThreadRestrictions::ScopedAllowIO allow_io;
502 if (gfx::GLSurface::InitializeOneOff() && 506 if (gfx::GLSurface::InitializeOneOff() &&
503 gfx::GetGLImplementation() != gfx::kGLImplementationNone) 507 gfx::GetGLImplementation() != gfx::kGLImplementationNone)
504 return new CompositorGL(widget, size); 508 return new CompositorGL(widget, size);
505 return NULL; 509 return NULL;
506 } 510 }
507 511
508 } // namespace ui 512 } // namespace ui
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698