diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-27 17:36:31 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-27 17:36:31 +0000 |
| commit | 71b7d733027ef93c9ed968ceee6f93f419589b7c (patch) | |
| tree | ed1e3b6e68f4c62b74c8ee32fd2d35ccf60cbfb2 | |
| parent | a43f85aa83270172d3f7f8fdcb74160b9d6b7c9c (diff) | |
| download | chromium_src-71b7d733027ef93c9ed968ceee6f93f419589b7c.zip chromium_src-71b7d733027ef93c9ed968ceee6f93f419589b7c.tar.gz chromium_src-71b7d733027ef93c9ed968ceee6f93f419589b7c.tar.bz2 | |
Fixes bug in updating only part of a texture and removes irrelevant TODO.
BUG=none
TEST=none
R=ben@chromium.org
Review URL: http://codereview.chromium.org/6962042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87042 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ui/gfx/compositor/compositor_win.cc | 2 | ||||
| -rw-r--r-- | views/view.cc | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/ui/gfx/compositor/compositor_win.cc b/ui/gfx/compositor/compositor_win.cc index a303f7bb..67be3a6 100644 --- a/ui/gfx/compositor/compositor_win.cc +++ b/ui/gfx/compositor/compositor_win.cc @@ -155,7 +155,7 @@ void ViewTexture::SetBitmap(const SkBitmap& bitmap, DCHECK(texture_.get()); D3D10_BOX dst_box = { origin.x(), origin.y(), 0, origin.x() + bitmap.width(), - origin.y() + bitmap.height(), 0 }; + origin.y() + bitmap.height(), 1 }; device_->UpdateSubresource(texture_.get(), 0, &dst_box, converted_data.get(), bitmap.width() * 4, 0); } diff --git a/views/view.cc b/views/view.cc index cfae126..88e3ce3 100644 --- a/views/view.cc +++ b/views/view.cc @@ -1165,7 +1165,6 @@ void View::PaintComposite() { return; if (texture_.get()) { - // TODO: if dirty_region doesn't itersect bounds, return. ui::Transform transform; GetTransformRelativeTo(NULL, &transform); texture_->Draw(transform); |