BASELINE: Update Chromium to 47.0.2526.14

Also adding in sources needed for spellchecking.

Change-Id: Idd44170fa1616f26315188970a8d5ba7d472b18a
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>

4 files changed, 12 insertions, 17 deletions

diff --git a/chromium/ui/surface/accelerated_surface_mac.h b/chromium/ui/surface/accelerated_surface_mac.h
index 4191d36fe3a..4684f5f4d02 100644
--- a/chromium/ui/surface/accelerated_surface_mac.h
+++ b/chromium/ui/surface/accelerated_surface_mac.h
@@ -6,7 +6,7 @@
 #define UI_SURFACE_ACCELERATED_SURFACE_MAC_H_
 
 #include <CoreFoundation/CoreFoundation.h>
-#include <IOSurface/IOSurfaceAPI.h>
+#include <IOSurface/IOSurface.h>
 
 #include "base/callback.h"
 #include "base/mac/scoped_cftyperef.h"
diff --git a/chromium/ui/surface/transport_dib.h b/chromium/ui/surface/transport_dib.h
index c2321448df3..a166238bc07 100644
--- a/chromium/ui/surface/transport_dib.h
+++ b/chromium/ui/surface/transport_dib.h
@@ -26,11 +26,7 @@ class SURFACE_EXPORT TransportDIB {
 
 // A Handle is the type which can be sent over the wire so that the remote
 // side can map the transport DIB.
-#if defined(OS_WIN)
-  typedef HANDLE Handle;
-#else  // OS_POSIX
   typedef base::SharedMemoryHandle Handle;
-#endif
 
   // Returns a default, invalid handle, that is meant to indicate a missing
   // Transport DIB.
diff --git a/chromium/ui/surface/transport_dib_posix.cc b/chromium/ui/surface/transport_dib_posix.cc
index 0a55dbdb0b7..25b2529c763 100644
--- a/chromium/ui/surface/transport_dib_posix.cc
+++ b/chromium/ui/surface/transport_dib_posix.cc
@@ -73,9 +73,10 @@ bool TransportDIB::Map() {
   if (memory())
     return true;
 
-  int size = base::SharedMemory::GetSizeFromSharedMemoryHandle(
-      shared_memory_.handle());
-  if (size == -1 || !shared_memory_.Map(size))
+  size_t size;
+  bool success = base::SharedMemory::GetSizeFromSharedMemoryHandle(
+      shared_memory_.handle(), &size);
+  if (!success || !shared_memory_.Map(size))
     return false;
 
   size_ = size;
diff --git a/chromium/ui/surface/transport_dib_win.cc b/chromium/ui/surface/transport_dib_win.cc
index e8d36adbd5a..af55af28434 100644
--- a/chromium/ui/surface/transport_dib_win.cc
+++ b/chromium/ui/surface/transport_dib_win.cc
@@ -20,10 +20,8 @@ TransportDIB::TransportDIB()
 TransportDIB::~TransportDIB() {
 }
 
-TransportDIB::TransportDIB(HANDLE handle)
-    : shared_memory_(handle, false /* read write */),
-      size_(0) {
-}
+TransportDIB::TransportDIB(base::SharedMemoryHandle handle)
+    : shared_memory_(handle, false /* read write */), size_(0) {}
 
 // static
 TransportDIB* TransportDIB::Create(size_t size, uint32 sequence_num) {
@@ -55,7 +53,7 @@ TransportDIB* TransportDIB::CreateWithHandle(Handle handle) {
 
 // static
 bool TransportDIB::is_valid_handle(Handle dib) {
-  return dib != NULL;
+  return dib.IsValid();
 }
 
 skia::PlatformCanvas* TransportDIB::GetPlatformCanvas(int w, int h) {
@@ -66,9 +64,9 @@ skia::PlatformCanvas* TransportDIB::GetPlatformCanvas(int w, int h) {
   // We can't check the canvas size before mapping, but it's safe because
   // Windows will fail to map the section if the dimensions of the canvas
   // are too large.
-  skia::PlatformCanvas* canvas =
-      skia::CreatePlatformCanvas(w, h, true, shared_memory_.handle(),
-                                 skia::RETURN_NULL_ON_FAILURE);
+  skia::PlatformCanvas* canvas = skia::CreatePlatformCanvas(
+      w, h, true, shared_memory_.handle().GetHandle(),
+      skia::RETURN_NULL_ON_FAILURE);
 
   // Calculate the size for the memory region backing the canvas.
   if (canvas)
@@ -85,7 +83,7 @@ bool TransportDIB::Map() {
 
   if (!shared_memory_.Map(0 /* map whole shared memory segment */)) {
     LOG(ERROR) << "Failed to map transport DIB"
-               << " handle:" << shared_memory_.handle()
+               << " handle:" << shared_memory_.handle().GetHandle()
                << " error:" << ::GetLastError();
     return false;
   }