Index: ui/base/x/x11_util_internal.h |
=================================================================== |
--- ui/base/x/x11_util_internal.h (revision 92815) |
+++ ui/base/x/x11_util_internal.h (working copy) |
@@ -19,32 +19,35 @@ |
#include <X11/extensions/Xrender.h> |
} |
+#include "ui/ui_api.h" |
+ |
namespace ui { |
- // -------------------------------------------------------------------------- |
- // NOTE: these functions cache the results and must be called from the UI |
- // thread. |
- // Get the XRENDER format id for ARGB32 (Skia's format). |
- // |
- // NOTE:Currently this don't support multiple screens/displays. |
- XRenderPictFormat* GetRenderARGB32Format(Display* dpy); |
+// -------------------------------------------------------------------------- |
+// NOTE: these functions cache the results and must be called from the UI |
+// thread. |
+// Get the XRENDER format id for ARGB32 (Skia's format). |
+// |
+// NOTE:Currently this don't support multiple screens/displays. |
+XRenderPictFormat* GetRenderARGB32Format(Display* dpy); |
- // Get the XRENDER format id for the default visual on the first screen. This |
- // is the format which our GTK window will have. |
- XRenderPictFormat* GetRenderVisualFormat(Display* dpy, Visual* visual); |
+// Get the XRENDER format id for the default visual on the first screen. This |
+// is the format which our GTK window will have. |
+UI_API XRenderPictFormat* GetRenderVisualFormat(Display* dpy, Visual* visual); |
- // -------------------------------------------------------------------------- |
- // X11 error handling. |
- // Sets the X Error Handlers. Passing NULL for either will enable the default |
- // error handler, which if called will log the error and abort the process. |
- void SetX11ErrorHandlers(XErrorHandler error_handler, |
- XIOErrorHandler io_error_handler); |
+// -------------------------------------------------------------------------- |
+// X11 error handling. |
+// Sets the X Error Handlers. Passing NULL for either will enable the default |
+// error handler, which if called will log the error and abort the process. |
+UI_API void SetX11ErrorHandlers(XErrorHandler error_handler, |
+ XIOErrorHandler io_error_handler); |
- // NOTE: This function should not be called directly from the |
- // X11 Error handler because it queries the server to decode the |
- // error message, which may trigger other errors. A suitable workaround |
- // is to post a task in the error handler to call this function. |
- void LogErrorEventDescription(Display* dpy, const XErrorEvent& error_event); |
+// NOTE: This function should not be called directly from the |
+// X11 Error handler because it queries the server to decode the |
+// error message, which may trigger other errors. A suitable workaround |
+// is to post a task in the error handler to call this function. |
+UI_API void LogErrorEventDescription(Display* dpy, |
+ const XErrorEvent& error_event); |
} // namespace ui |