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

Unified Diff: ui/views/widget/desktop_aura/x11_topmost_window_finder_interactive_uitest.cc

Issue 1011173003: x11: Use gfx::XScopedPtr<> in more places. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/desktop_aura/x11_topmost_window_finder_interactive_uitest.cc
diff --git a/ui/views/widget/desktop_aura/x11_topmost_window_finder_interactive_uitest.cc b/ui/views/widget/desktop_aura/x11_topmost_window_finder_interactive_uitest.cc
index 0a234d5ba31c2d14354131570acb5c685b4507ee..05bd690c6de2eabae1ca268747e4aa64cef73f6f 100644
--- a/ui/views/widget/desktop_aura/x11_topmost_window_finder_interactive_uitest.cc
+++ b/ui/views/widget/desktop_aura/x11_topmost_window_finder_interactive_uitest.cc
@@ -330,11 +330,10 @@ TEST_F(X11TopmostWindowFinderTest, NonRectangular) {
skregion2.op(SkIRect::MakeXYWH(0, 10, 10, 90), SkRegion::kUnion_Op);
skregion2.op(SkIRect::MakeXYWH(10, 0, 90, 100), SkRegion::kUnion_Op);
XID xid2 = CreateAndShowXWindow(gfx::Rect(300, 100, 100, 100));
- REGION* region2 = gfx::CreateRegionFromSkRegion(skregion2);
- XShapeCombineRegion(xdisplay(), xid2, ShapeBounding, 0, 0, region2,
- false);
- XDestroyRegion(region2);
-
+ gfx::XScopedPtr<REGION, gfx::XObjectDeleter<REGION, int, XDestroyRegion>>
+ region2(gfx::CreateRegionFromSkRegion(skregion2));
+ XShapeCombineRegion(xdisplay(), xid2, ShapeBounding, 0, 0, region2.get(),
+ false);
XID xids[] = { xid1, xid2 };
StackingClientListWaiter stack_waiter(xids, arraysize(xids));
stack_waiter.Wait();
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698