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

Side by Side Diff: trunk/src/content/browser/compositor/software_output_device_ozone.cc

Issue 183003011: Revert 254567 "don't create SkDevice directly, use SkBitmap or (..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/compositor/software_output_device_ozone.h" 5 #include "content/browser/compositor/software_output_device_ozone.h"
6 #include "third_party/skia/include/core/SkBitmapDevice.h"
6 #include "third_party/skia/include/core/SkDevice.h" 7 #include "third_party/skia/include/core/SkDevice.h"
7 #include "ui/compositor/compositor.h" 8 #include "ui/compositor/compositor.h"
8 #include "ui/gfx/ozone/surface_factory_ozone.h" 9 #include "ui/gfx/ozone/surface_factory_ozone.h"
9 #include "ui/gfx/skia_util.h" 10 #include "ui/gfx/skia_util.h"
10 #include "ui/gfx/vsync_provider.h" 11 #include "ui/gfx/vsync_provider.h"
11 12
12 namespace content { 13 namespace content {
13 14
14 SoftwareOutputDeviceOzone::SoftwareOutputDeviceOzone(ui::Compositor* compositor) 15 SoftwareOutputDeviceOzone::SoftwareOutputDeviceOzone(ui::Compositor* compositor)
15 : compositor_(compositor), realized_widget_(gfx::kNullAcceleratedWidget) { 16 : compositor_(compositor), realized_widget_(gfx::kNullAcceleratedWidget) {
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 64
64 if (damage_rect_.IsEmpty()) 65 if (damage_rect_.IsEmpty())
65 return; 66 return;
66 67
67 bool scheduled = gfx::SurfaceFactoryOzone::GetInstance()->SchedulePageFlip( 68 bool scheduled = gfx::SurfaceFactoryOzone::GetInstance()->SchedulePageFlip(
68 compositor_->widget()); 69 compositor_->widget());
69 DCHECK(scheduled) << "Failed to schedule pageflip"; 70 DCHECK(scheduled) << "Failed to schedule pageflip";
70 } 71 }
71 72
72 } // namespace content 73 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698