diff options
| author | aelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-11 20:01:35 +0000 |
|---|---|---|
| committer | aelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-11 20:01:35 +0000 |
| commit | 891621bc1754d9fb6a44beea516f0495447f9fbb (patch) | |
| tree | 8bab70da30fb088e5ba32922e966e7c1864ccbc6 /cc | |
| parent | b17e2df888390f4d60855852d397f41751ff3ec2 (diff) | |
| download | chromium_src-891621bc1754d9fb6a44beea516f0495447f9fbb.zip chromium_src-891621bc1754d9fb6a44beea516f0495447f9fbb.tar.gz chromium_src-891621bc1754d9fb6a44beea516f0495447f9fbb.tar.bz2 | |
Fix DCHECK in browser software compositing.
I introduced this problem in r205501.
NOTRY=true
BUG=237006
Review URL: https://chromiumcodereview.appspot.com/16781004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205614 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/output/software_output_device.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/cc/output/software_output_device.cc b/cc/output/software_output_device.cc index 30817e0..fc77eb4 100644 --- a/cc/output/software_output_device.cc +++ b/cc/output/software_output_device.cc @@ -33,13 +33,11 @@ SkCanvas* SoftwareOutputDevice::BeginPaint(gfx::Rect damage_rect) { } void SoftwareOutputDevice::EndPaint(SoftwareFrameData* frame_data) { - DCHECK(device_); - if (frame_data) { - frame_data->id = 0; - frame_data->size = viewport_size_; - frame_data->damage_rect = damage_rect_; - frame_data->handle = base::SharedMemory::NULLHandle(); - } + DCHECK(frame_data); + frame_data->id = 0; + frame_data->size = viewport_size_; + frame_data->damage_rect = damage_rect_; + frame_data->handle = base::SharedMemory::NULLHandle(); } void SoftwareOutputDevice::CopyToBitmap( |