Do not scale cursor image for 2x image

ui/base/x/x11_util.cc

 // 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.
 
 // This file defines utility functions for X11 (Linux only). This code has been
 // ported from XCB since we can't use XCB on Ubuntu while its 32-bit support
 // remains woefully incomplete.
 
 #include "ui/base/x/x11_util.h"
 
@@ skipping 149 matching lines @@
 
   void Unref(::Cursor cursor) {
     if (cache_[cursor]->Unref())
       cache_.erase(cursor);
   }
 
   void Clear() {
     cache_.clear();
   }
 
+  const XcursorImage* GetXcursorImage(::Cursor cursor) const {
+    return cache_.find(cursor)->second->image();
+  }
+
  private:
   friend struct DefaultSingletonTraits<XCustomCursorCache>;
 
   class XCustomCursor {
    public:
     // This takes ownership of the image.
     XCustomCursor(XcursorImage* image)
         : image_(image),
           ref_(1) {
       cursor_ = XcursorImageLoadCursor(gfx::GetXDisplay(), image);
@@ skipping 12 matching lines @@
 
     // Returns true if the cursor was destroyed because of the unref.
     bool Unref() {
       if (--ref_ == 0) {
         delete this;
         return true;
       }
       return false;
     }
 
+    const XcursorImage* image() const {
+      return image_;
+    };
+
    private:
     XcursorImage* image_;
     int ref_;
     ::Cursor cursor_;
 
     DISALLOW_COPY_AND_ASSIGN(XCustomCursor);
   };
 
   XCustomCursorCache() {}
   ~XCustomCursorCache() {
@@ skipping 96 matching lines @@
 
   return render_supported;
 }
 
 ::Cursor GetXCursor(int cursor_shape) {
   if (!cursor_cache)
     cursor_cache = new XCursorCache;
   return cursor_cache->GetCursor(cursor_shape);
 }
 
-void ResetXCursorCache() {
-  delete cursor_cache;
-  cursor_cache = NULL;
-}
-
 ::Cursor CreateReffedCustomXCursor(XcursorImage* image) {
   return XCustomCursorCache::GetInstance()->InstallCustomCursor(image);
 }
 
 void RefCustomXCursor(::Cursor cursor) {
   XCustomCursorCache::GetInstance()->Ref(cursor);
 }
 
 void UnrefCustomXCursor(::Cursor cursor) {
   XCustomCursorCache::GetInstance()->Unref(cursor);
@@ skipping 931 matching lines @@
 ::Cursor XScopedCursor::get() const {
   return cursor_;
 }
 
 void XScopedCursor::reset(::Cursor cursor) {
   if (cursor_)
     XFreeCursor(display_, cursor_);
   cursor_ = cursor;
 }
 
+namespace test {
+
+void ResetXCursorCache() {
+  delete cursor_cache;
+  cursor_cache = NULL;
+}
+
+const XcursorImage* GetCachedXcursorImage(::Cursor cursor) {
+  return XCustomCursorCache::GetInstance()->GetXcursorImage(cursor);
+}
+}
+
 // ----------------------------------------------------------------------------
 // These functions are declared in x11_util_internal.h because they require
 // XLib.h to be included, and it conflicts with many other headers.
 XRenderPictFormat* GetRenderARGB32Format(XDisplay* dpy) {
   static XRenderPictFormat* pictformat = NULL;
   if (pictformat)
     return pictformat;
 
   // First look for a 32-bit format which ignores the alpha value
   XRenderPictFormat templ;
@@ skipping 73 matching lines @@
       << "request_code " << static_cast<int>(error_event.request_code) << ", "
       << "minor_code " << static_cast<int>(error_event.minor_code)
       << " (" << request_str << ")";
 }
 
 // ----------------------------------------------------------------------------
 // End of x11_util_internal.h
 
 
 }  // namespace ui