| Index: ui/base/x/x11_util.cc
|
| diff --git a/ui/base/x/x11_util.cc b/ui/base/x/x11_util.cc
|
| index 4bfd5c7ee9f9d8222c2a4f42e6a3f7252a6a7d79..17a67393718fa2c08cd3acee3ff4ec5d957d7f04 100644
|
| --- a/ui/base/x/x11_util.cc
|
| +++ b/ui/base/x/x11_util.cc
|
| @@ -216,14 +216,6 @@ class XCustomCursorCache {
|
| DISALLOW_COPY_AND_ASSIGN(XCustomCursorCache);
|
| };
|
|
|
| -bool IsShapeAvailable() {
|
| - int dummy;
|
| - static bool is_shape_available =
|
| - XShapeQueryExtension(gfx::GetXDisplay(), &dummy, &dummy);
|
| - return is_shape_available;
|
| -
|
| -}
|
| -
|
| } // namespace
|
|
|
| bool IsXInput2Available() {
|
| @@ -468,6 +460,13 @@ void HideHostCursor() {
|
| return invisible_cursor;
|
| }
|
|
|
| +bool IsShapeExtensionAvailable() {
|
| + int dummy;
|
| + static bool is_shape_available =
|
| + XShapeQueryExtension(gfx::GetXDisplay(), &dummy, &dummy);
|
| + return is_shape_available;
|
| +}
|
| +
|
| XID GetX11RootWindow() {
|
| return DefaultRootWindow(gfx::GetXDisplay());
|
| }
|
| @@ -576,7 +575,7 @@ bool WindowContainsPoint(XID window, gfx::Point screen_loc) {
|
| if (!window_rect.Contains(screen_loc))
|
| return false;
|
|
|
| - if (!IsShapeAvailable())
|
| + if (!IsShapeExtensionAvailable())
|
| return true;
|
|
|
| // According to http://www.x.org/releases/X11R7.6/doc/libXext/shapelib.html,
|
|
|