Make SharedMemory track the size that was actually mapped

ui/surface/transport_dib_mac.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.
 
 #include "ui/surface/transport_dib.h"
 
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include "base/logging.h"
@@ skipping 43 matching lines @@
 bool TransportDIB::is_valid_handle(Handle dib) {
   return dib.fd >= 0;
 }
 
 // static
 bool TransportDIB::is_valid_id(Id id) {
   return id != 0;
 }
 
 skia::PlatformCanvas* TransportDIB::GetPlatformCanvas(int w, int h) {
-  if (!memory() && !Map())
+  if ((!memory() && !Map()) || !VerifyCanvasSize(w, h))

[apatrick_chromium, 2013/03/18 17:32:10]

Do you want to evaluate VerifyCanvasSize(w, h) first so the short-circuit avoids
mapping unnecessarily?

[jschuh, 2013/03/21 01:08:03]

Same answer as Android.

     return NULL;
   return skia::CreatePlatformCanvas(w, h, true, 
                                     reinterpret_cast<uint8_t*>(memory()),
                                     skia::RETURN_NULL_ON_FAILURE);
 }
 
 bool TransportDIB::Map() {
   if (!is_valid_handle(handle()))
     return false;
   if (memory())
@@ skipping 13 matching lines @@
   return shared_memory_.memory();
 }
 
 TransportDIB::Id TransportDIB::id() const {
   return shared_memory_.id();
 }
 
 TransportDIB::Handle TransportDIB::handle() const {
   return shared_memory_.handle();
 }