Changeset 135076 in webkit

Timestamp:

Nov 18, 2012 10:46:28 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium] add WebCursorInfo::imageScaleFactor
​https://bugs.webkit.org/show_bug.cgi?id=102612

Patch by Rick Byers <​rbyers@chromium.org> on 2012-11-18
Reviewed by Adam Barth.

Add cursor image scale factor (currently always 1) to chromium API, in preparation for
high-dpi cursor support in bug 99493.

• public/WebCursorInfo.h:

(WebKit::WebCursorInfo::WebCursorInfo):

• src/WebCursorInfo.cpp:

(WebKit::WebCursorInfo::WebCursorInfo):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebCursorInfo.h (modified) (2 diffs)
• src/WebCursorInfo.cpp (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-11-18  Rick Byers  <rbyers@chromium.org>
+
+        [chromium] add WebCursorInfo::imageScaleFactor
+        https://bugs.webkit.org/show_bug.cgi?id=102612
+
+        Reviewed by Adam Barth.
+
+        Add cursor image scale factor (currently always 1) to chromium API, in preparation for
+        high-dpi cursor support in bug 99493.
+
+        * public/WebCursorInfo.h:
+        (WebKit::WebCursorInfo::WebCursorInfo):
+        * src/WebCursorInfo.cpp:
+        (WebKit::WebCursorInfo::WebCursorInfo):
+
 2012-11-17  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebKit/chromium/public/WebCursorInfo.h

@@ -96 +96 @@
     Type type;
     WebPoint hotSpot;
+    float imageScaleFactor;
     WebImage customImage;
 
@@ -108 +109 @@
     explicit WebCursorInfo(Type type = TypePointer)
         : type(type)
+        , imageScaleFactor(1)
     {
 #ifdef WIN32

trunk/Source/WebKit/chromium/src/WebCursorInfo.cpp

@@ -39 +39 @@
 
 WebCursorInfo::WebCursorInfo(const Cursor& cursor)
+    : type(static_cast<Type>(cursor.type()))
+    , hotSpot(cursor.hotSpot())
+    , imageScaleFactor(1)
+    , customImage(cursor.image())
+#ifdef WIN32
+    , externalHandle(0)
+#endif
 {
-    type = static_cast<Type>(cursor.type());
-    hotSpot = cursor.hotSpot();
-    customImage = cursor.image();
-#ifdef WIN32
-    externalHandle = 0;
-#endif
 }