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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 7552039: Vend common GL context (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with ToT 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
« ui/gfx/compositor/compositor_win.cc ('K') | « ui/gfx/compositor/compositor_win.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/compositor/layer.cc
diff --git a/ui/gfx/compositor/layer.cc b/ui/gfx/compositor/layer.cc
index 214b07e302018d8d1e316d1072e0af46ae625e2e..1235bf78168c9006c14d41aa5f2de26f7786ba17 100644
--- a/ui/gfx/compositor/layer.cc
+++ b/ui/gfx/compositor/layer.cc
@@ -94,7 +94,7 @@ void Layer::Draw() {
texture_draw_params.blend = parent_ != NULL && !fills_bounds_opaquely_;
#if defined(OS_WIN)
- texture_->Draw(texture_draw_params);
+ texture_->Draw(texture_draw_params, compositor_->size());
#else
hole_rect_ = hole_rect_.Intersect(
gfx::Rect(0, 0, bounds_.width(), bounds_.height()));
@@ -128,7 +128,7 @@ void Layer::Draw() {
void Layer::DrawRegion(const ui::TextureDrawParams& params,
const gfx::Rect& region_to_draw) {
if (!region_to_draw.IsEmpty())
- texture_->Draw(params, region_to_draw);
+ texture_->Draw(params, region_to_draw, compositor_->size());
}
void Layer::RecomputeHole() {
« ui/gfx/compositor/compositor_win.cc ('K') | « ui/gfx/compositor/compositor_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698