Merge pull request #6661 from MaxWhere/minor-fixes

A minor fix for sendInputEvent and improvements related to cursor-changed event

atom/browser/api/atom_api_web_contents.cc

@@ -1299,7 +1299,9 @@ void WebContents::OnCursorChange(const content::WebCursor& cursor) {
   if (cursor.IsCustom()) {
     Emit("cursor-changed", CursorTypeToString(info),
       gfx::Image::CreateFrom1xBitmap(info.custom_image),
-      info.image_scale_factor);
+      info.image_scale_factor,
+      gfx::Size(info.custom_image.width(), info.custom_image.height()),
+      info.hotspot);
   } else {
     Emit("cursor-changed", CursorTypeToString(info));
   }

atom/common/api/atom_api_native_image.cc

@@ -25,6 +25,7 @@
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_util.h"
+#include "third_party/skia/include/core/SkPixelRef.h"
 
 #if defined(OS_WIN)
 #include "atom/common/asar/archive.h"
@@ -219,6 +220,14 @@ v8::Local<v8::Value> NativeImage::ToPNG(v8::Isolate* isolate) {
                             static_cast<size_t>(png->size())).ToLocalChecked();
 }
 
+v8::Local<v8::Value> NativeImage::ToBitmap(v8::Isolate* isolate) {
+  const SkBitmap* bitmap = image_.ToSkBitmap();
+  SkPixelRef* ref = bitmap->pixelRef();
+  return node::Buffer::Copy(isolate,
+                            reinterpret_cast<const char*>(ref->pixels()),
+                            bitmap->getSafeSize()).ToLocalChecked();
+}
+
 v8::Local<v8::Value> NativeImage::ToJPEG(v8::Isolate* isolate, int quality) {
   std::vector<unsigned char> output;
   gfx::JPEG1xEncodedDataFromImage(image_, quality, &output);
@@ -350,6 +359,7 @@ void NativeImage::BuildPrototype(
   mate::ObjectTemplateBuilder(isolate, prototype)
       .SetMethod("toPNG", &NativeImage::ToPNG)
       .SetMethod("toJPEG", &NativeImage::ToJPEG)
+      .SetMethod("toBitmap", &NativeImage::ToBitmap)
       .SetMethod("getNativeHandle", &NativeImage::GetNativeHandle)
       .SetMethod("toDataURL", &NativeImage::ToDataURL)
       .SetMethod("isEmpty", &NativeImage::IsEmpty)

atom/common/api/atom_api_native_image.h

@@ -70,6 +70,7 @@ class NativeImage : public mate::Wrappable<NativeImage> {
  private:
   v8::Local<v8::Value> ToPNG(v8::Isolate* isolate);
   v8::Local<v8::Value> ToJPEG(v8::Isolate* isolate, int quality);
+  v8::Local<v8::Value> ToBitmap(v8::Isolate* isolate);
   v8::Local<v8::Value> GetNativeHandle(
     v8::Isolate* isolate,
     mate::Arguments* args);

atom/common/keyboard_util.cc

@@ -159,7 +159,8 @@ ui::KeyboardCode KeyboardCodeFromKeyIdentifier(const std::string& s,
       return ui::VKEY_UNKNOWN;
     }
   } else {
-    LOG(WARNING) << "Invalid accelerator token: " << str;
+    if (str.size() > 2)
+      LOG(WARNING) << "Invalid accelerator token: " << str;
     return ui::VKEY_UNKNOWN;
   }
 }

atom/common/native_mate_converters/blink_converter.cc

@@ -4,6 +4,7 @@
 
 #include "atom/common/native_mate_converters/blink_converter.h"
 
+#include <algorithm>
 #include <string>
 #include <vector>
 
@@ -175,10 +176,18 @@ bool Converter<blink::WebKeyboardEvent>::FromV8(
     out->modifiers |= blink::WebInputEvent::ShiftKey;
   out->setKeyIdentifierFromWindowsKeyCode();
   if ((out->type == blink::WebInputEvent::Char ||
-       out->type == blink::WebInputEvent::RawKeyDown) &&
-      str.size() == 1) {
-    out->text[0] = str[0];
-    out->unmodifiedText[0] = str[0];
+       out->type == blink::WebInputEvent::RawKeyDown)) {
+    // Make sure to not read beyond the buffer in case some bad code doesn't
+    // NULL-terminate it (this is called from plugins).
+    size_t text_length_cap = blink::WebKeyboardEvent::textLengthCap;
+    base::string16 text16 = base::UTF8ToUTF16(str);
+
+    memset(out->text, 0, text_length_cap);
+    memset(out->unmodifiedText, 0, text_length_cap);
+    for (size_t i = 0; i < std::min(text_length_cap, text16.size()); ++i) {
+      out->text[i] = text16[i];
+      out->unmodifiedText[i] = text16[i];
+    }
   }
   return true;
 }

docs/api/native-image.md

@@ -152,6 +152,10 @@ Returns a [Buffer][buffer] that contains the image's `PNG` encoded data.
 
 Returns a [Buffer][buffer] that contains the image's `JPEG` encoded data.
 
+#### `image.toBitmap()`
+
+Returns a [Buffer][buffer] that contains the image's raw pixel data.
+
 #### `image.toDataURL()`
 
 Returns the data URL of the image.

docs/api/web-contents.md

@@ -334,7 +334,13 @@ Returns:
 * `event` Event
 * `type` String
 * `image` NativeImage (optional)
-* `scale` Float (optional)
+* `scale` Float (optional) - scaling factor for the custom cursor
+* `size` Object (optional) - the size of the `image`
+  * `width` Integer
+  * `height` Integer
+* `hotspot` Object (optional) - coordinates of the custom cursor's hotspot
+  * `x` Integer - x coordinate
+  * `y` Integer - y coordinate
 
 Emitted when the cursor's type changes. The `type` parameter can be `default`,
 `crosshair`, `pointer`, `text`, `wait`, `help`, `e-resize`, `n-resize`,
@@ -346,8 +352,8 @@ Emitted when the cursor's type changes. The `type` parameter can be `default`,
 `not-allowed`, `zoom-in`, `zoom-out`, `grab`, `grabbing`, `custom`.
 
 If the `type` parameter is `custom`, the `image` parameter will hold the custom
-cursor image in a `NativeImage`, and the `scale` will hold scaling information
-for the image.
+cursor image in a `NativeImage`, and `scale`, `size` and `hotspot` will hold 
+additional information about the custom cursor.
 
 #### Event: 'context-menu'