Do not scale cursor image for 2x image

ui/base/x/x11_util.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_BASE_X_X11_UTIL_H_
 #define UI_BASE_X_X11_UTIL_H_
 
 // This file declares utility functions for X11 (Linux only).
 //
 // These functions do not require the Xlib headers to be included (which is why
@@ skipping 47 matching lines @@
 // Return the shared memory type of our X connection.
 UI_BASE_EXPORT SharedMemorySupport QuerySharedMemorySupport(XDisplay* dpy);
 
 // Return true iff the display supports Xrender
 UI_BASE_EXPORT bool QueryRenderSupport(XDisplay* dpy);
 
 // Returns an X11 Cursor, sharable across the process.
 // |cursor_shape| is an X font cursor shape, see XCreateFontCursor().
 UI_BASE_EXPORT ::Cursor GetXCursor(int cursor_shape);
 
-// Resets the cache used by GetXCursor(). Only useful for tests that may delete
-// the display.
-UI_BASE_EXPORT void ResetXCursorCache();
-
 // Creates a custom X cursor from the image. This takes ownership of image. The
 // caller must not free/modify the image. The refcount of the newly created
 // cursor is set to 1.
 UI_BASE_EXPORT ::Cursor CreateReffedCustomXCursor(XcursorImage* image);
 
 // Increases the refcount of the custom cursor.
 UI_BASE_EXPORT void RefCustomXCursor(::Cursor cursor);
 
 // Decreases the refcount of the custom cursor, and destroys it if it reaches 0.
 UI_BASE_EXPORT void UnrefCustomXCursor(::Cursor cursor);
@@ skipping 250 matching lines @@
   ::Cursor get() const;
   void reset(::Cursor cursor);
 
  private:
   ::Cursor cursor_;
   XDisplay* display_;
 
   DISALLOW_COPY_AND_ASSIGN(XScopedCursor);
 };
 
+namespace test {
+// Resets the cache used by GetXCursor(). Only useful for tests that may delete

[Daniel Erat, 2014/05/12 21:19:48]

put this in an "#if defined(UNIT_TEST)" section instead?

[oshima, 2014/05/12 22:23:42]

I don't think this works because this is used in non unit test cc file
(aura_test_helper.cc and cursor_loader_x11.cc) . I just tried and got
link/compile errors.

I can change the CursorLoaderX11's test method to return ::Cursor
and call this from unittest though. Let me know if you like this change, or have
another suggestion.

(Note that reset XCursorCache still have to be outside of UNIT_TEST as it's
called from AuraTestHelper)

[Daniel Erat, 2014/05/12 23:02:22]

ah, never mind then. i was hoping that everything would get compiled with
UNIT_TEST defined when building tests, but maybe that's not how it works. this
seems fine to me, in that case (although i've maybe seen *ForTest() suffixes
added to testing-only method names more often than "test" namespaces being used
-- do you know if there's a presubmit check that things in the test namespace
don't get called from non-test code?)

+// the display.
+UI_BASE_EXPORT void ResetXCursorCache();
+
+// Returns the cached XcursorImage for |cursor|.
+UI_BASE_EXPORT const XcursorImage* GetCachedXcursorImage(::Cursor cursor);
+
+}  // namespace test
+
 }  // namespace ui
 
 #endif  // UI_BASE_X_X11_UTIL_H_