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

Side by Side Diff: ui/ozone/platform/dri/dri_surface.cc

Issue 552553002: Fix the uses of T* conversion operator from scoped_refptr<T> which is now removed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
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 "ui/ozone/platform/dri/dri_surface.h" 5 #include "ui/ozone/platform/dri/dri_surface.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "third_party/skia/include/core/SkCanvas.h" 9 #include "third_party/skia/include/core/SkCanvas.h"
10 #include "third_party/skia/include/core/SkSurface.h" 10 #include "third_party/skia/include/core/SkSurface.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 return; 57 return;
58 58
59 // For the display buffers use the mode size since a |viewport_size| smaller 59 // For the display buffers use the mode size since a |viewport_size| smaller
60 // than the display size will not scanout. 60 // than the display size will not scanout.
61 for (size_t i = 0; i < arraysize(buffers_); ++i) 61 for (size_t i = 0; i < arraysize(buffers_); ++i)
62 buffers_[i] = AllocateBuffer(dri_, controller->GetModeSize()); 62 buffers_[i] = AllocateBuffer(dri_, controller->GetModeSize());
63 } 63 }
64 64
65 void DriSurface::PresentCanvas(const gfx::Rect& damage) { 65 void DriSurface::PresentCanvas(const gfx::Rect& damage) {
66 DCHECK(base::MessageLoopForUI::IsCurrent()); 66 DCHECK(base::MessageLoopForUI::IsCurrent());
67 DCHECK(buffers_[front_buffer_ ^ 1]); 67 DCHECK(buffers_[front_buffer_ ^ 1].get());
68 68
69 HardwareDisplayController* controller = window_delegate_->GetController(); 69 HardwareDisplayController* controller = window_delegate_->GetController();
70 if (!controller) 70 if (!controller)
71 return; 71 return;
72 72
73 controller->QueueOverlayPlane(OverlayPlane(buffers_[front_buffer_ ^ 1])); 73 controller->QueueOverlayPlane(OverlayPlane(buffers_[front_buffer_ ^ 1]));
74 74
75 UpdateNativeSurface(damage); 75 UpdateNativeSurface(damage);
76 controller->SchedulePageFlip(); 76 controller->SchedulePageFlip();
77 controller->WaitForPageFlipEvent(); 77 controller->WaitForPageFlipEvent();
(...skipping 14 matching lines...) Expand all
92 SkRect real_damage = RectToSkRect(UnionRects(damage, last_damage_)); 92 SkRect real_damage = RectToSkRect(UnionRects(damage, last_damage_));
93 93
94 // Copy damage region. 94 // Copy damage region.
95 skia::RefPtr<SkImage> image = skia::AdoptRef(surface_->newImageSnapshot()); 95 skia::RefPtr<SkImage> image = skia::AdoptRef(surface_->newImageSnapshot());
96 image->draw(canvas, &real_damage, real_damage, NULL); 96 image->draw(canvas, &real_damage, real_damage, NULL);
97 97
98 last_damage_ = damage; 98 last_damage_ = damage;
99 } 99 }
100 100
101 } // namespace ui 101 } // namespace ui
OLDNEW
« no previous file with comments | « ui/ozone/platform/dri/dri_cursor.cc ('k') | ui/ozone/platform/dri/hardware_display_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698