mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Use ranged for loop

Browse source
This commit is contained in:
Cheng Zhao 2015-08-05 12:34:45 +08:00
parent 58c0486236
commit 438a5acc0f
1 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
atom/browser/native_window.cc
View file

@ -70,13 +70,10 @@ const char* kWebRuntimeFeatures[] = {
// Convert draggable regions in raw format to SkRegion format. Caller is // Convert draggable regions in raw format to SkRegion format. Caller is
// responsible for deleting the returned SkRegion instance. // responsible for deleting the returned SkRegion instance.
SkRegion* DraggableRegionsToSkRegion( scoped_ptr<SkRegion> DraggableRegionsToSkRegion(
const std::vector<DraggableRegion>& regions) { const std::vector<DraggableRegion>& regions) {
SkRegion* sk_region = new SkRegion; scoped_ptr<SkRegion> sk_region(new SkRegion);
for (std::vector<DraggableRegion>::const_iterator iter = regions.begin(); for (const DraggableRegion& region : regions) {
iter != regions.end();
++iter) {
const DraggableRegion& region = *iter;
sk_region->op( sk_region->op(
region.bounds.x(), region.bounds.x(),
region.bounds.y(), region.bounds.y(),
@ -84,7 +81,7 @@ SkRegion* DraggableRegionsToSkRegion(
region.bounds.bottom(), region.bounds.bottom(),
region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op); region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op);
} }
return sk_region; return sk_region.Pass();
} }
} // namespace } // namespace
@ -583,8 +580,7 @@ void NativeWindow::UpdateDraggableRegions(
// Draggable region is not supported for non-frameless window. // Draggable region is not supported for non-frameless window.
if (has_frame_) if (has_frame_)
return; return;
draggable_region_ = DraggableRegionsToSkRegion(regions);
draggable_region_.reset(DraggableRegionsToSkRegion(regions));
} }
void NativeWindow::ScheduleUnresponsiveEvent(int ms) { void NativeWindow::ScheduleUnresponsiveEvent(int ms) {