diff options
| author | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-12 10:06:51 +0000 |
|---|---|---|
| committer | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-12 10:06:51 +0000 |
| commit | f51a712deb178ed12e01621efa87f86d14012368 (patch) | |
| tree | 5e85f7b21de2e88f6e52f28a48194971280d96ee /ui/snapshot | |
| parent | 3d5b93cb3e1da25eb81562d65ac38b34403721f3 (diff) | |
| download | chromium_src-f51a712deb178ed12e01621efa87f86d14012368.zip chromium_src-f51a712deb178ed12e01621efa87f86d14012368.tar.gz chromium_src-f51a712deb178ed12e01621efa87f86d14012368.tar.bz2 | |
Stops using ConvertRectToPixel in snapshot_aura.
The CopyOutputRequest's area is now in layer's scale factor, not
in pixel.
R=danakj@chromium.org, piman@chromium.org
BUG=381578
TEST=manually, snapshot_unittests succeeds
Review URL: https://codereview.chromium.org/321323003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276612 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/snapshot')
| -rw-r--r-- | ui/snapshot/snapshot_aura.cc | 2 | ||||
| -rw-r--r-- | ui/snapshot/snapshot_aura_unittest.cc | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ui/snapshot/snapshot_aura.cc b/ui/snapshot/snapshot_aura.cc index fc7e6e7..911ad35 100644 --- a/ui/snapshot/snapshot_aura.cc +++ b/ui/snapshot/snapshot_aura.cc @@ -36,7 +36,7 @@ static void MakeAsyncCopyRequest( const cc::CopyOutputRequest::CopyOutputRequestCallback& callback) { scoped_ptr<cc::CopyOutputRequest> request = cc::CopyOutputRequest::CreateBitmapRequest(callback); - request->set_area(ui::ConvertRectToPixel(window->layer(), source_rect)); + request->set_area(source_rect); window->layer()->RequestCopyOfOutput(request.Pass()); } diff --git a/ui/snapshot/snapshot_aura_unittest.cc b/ui/snapshot/snapshot_aura_unittest.cc index f8a2a94..5fe05a8 100644 --- a/ui/snapshot/snapshot_aura_unittest.cc +++ b/ui/snapshot/snapshot_aura_unittest.cc @@ -126,12 +126,14 @@ class SnapshotAuraTest : public testing::Test { gfx::Image GrabSnapshotForTestWindow() { gfx::Rect source_rect(test_window_->bounds().size()); + aura::Window::ConvertRectToTarget( + test_window(), root_window(), &source_rect); scoped_refptr<base::TestSimpleTaskRunner> task_runner( new base::TestSimpleTaskRunner()); scoped_refptr<SnapshotHolder> holder(new SnapshotHolder); ui::GrabWindowSnapshotAsync( - test_window(), + root_window(), source_rect, task_runner, base::Bind(&SnapshotHolder::SnapshotCallback, holder)); |