diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-13 02:37:18 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-13 02:37:18 +0000 |
| commit | c5e9c6ce5aad49a14fc197cf09b813754d52d322 (patch) | |
| tree | 736000646615b76ed6fe809c916d1207d9575974 | |
| parent | e548ee8631114b4deab5ba4fdd85db9702d40139 (diff) | |
| download | chromium_src-c5e9c6ce5aad49a14fc197cf09b813754d52d322.zip chromium_src-c5e9c6ce5aad49a14fc197cf09b813754d52d322.tar.gz chromium_src-c5e9c6ce5aad49a14fc197cf09b813754d52d322.tar.bz2 | |
Disable hole-punching on Windows, it seems to be broken right now, probably due to a bug in ViewTexture::Draw().
BUG=none
TEST=none
TBR=sky
Review URL: http://codereview.chromium.org/8958020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117585 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ui/aura/root_window_host_win.cc | 4 | ||||
| -rw-r--r-- | ui/gfx/compositor/layer.cc | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/ui/aura/root_window_host_win.cc b/ui/aura/root_window_host_win.cc index 443da6b..0b8d28c 100644 --- a/ui/aura/root_window_host_win.cc +++ b/ui/aura/root_window_host_win.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -224,7 +224,7 @@ void RootWindowHostWin::SetCursor(gfx::NativeCursor native_cursor) { } void RootWindowHostWin::ShowCursor(bool show) { - NOTIMPLEMENTED(); + // NOTIMPLEMENTED(); } gfx::Point RootWindowHostWin::QueryMouseLocation() { diff --git a/ui/gfx/compositor/layer.cc b/ui/gfx/compositor/layer.cc index aead021..adbf009 100644 --- a/ui/gfx/compositor/layer.cc +++ b/ui/gfx/compositor/layer.cc @@ -373,6 +373,12 @@ void Layer::Draw() { texture_draw_params.opacity = combined_opacity; texture_draw_params.has_valid_alpha_channel = has_valid_alpha_channel(); +#if defined(OS_WIN) + // TODO(beng): figure out why the other branch of this code renders improperly + // on Windows, and fix it, otherwise just remove all of this when + // WK compositor is default. + texture_->Draw(texture_draw_params, gfx::Rect(gfx::Point(), bounds().size())); +#else std::vector<gfx::Rect> regions_to_draw; PunchHole(gfx::Rect(gfx::Point(), bounds().size()), hole_rect_, ®ions_to_draw); @@ -382,6 +388,7 @@ void Layer::Draw() { texture_->Draw(texture_draw_params, regions_to_draw[i]); } #endif +#endif } void Layer::DrawTree() { |