Fix ThumbnailGenerator on Windows.

app/surface/transport_dib_win.cc

 // Copyright (c) 2009 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 <windows.h>
+
 #include <limits>
-#include <windows.h>
 
 #include "app/surface/transport_dib.h"

[brettw, 2010/11/09 06:02:40]

Technically this include should be first. Can you move it up to the top while
you're reordering includes?

[kkania, 2012/05/10 19:54:12]

Done.

 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/sys_info.h"
 #include "skia/ext/platform_canvas.h"
 
 TransportDIB::TransportDIB() {
 }
 
 TransportDIB::~TransportDIB() {
 }
@@ skipping 15 matching lines @@
     return NULL;
   }
 
   dib->size_ = size;
   dib->sequence_num_ = sequence_num;
 
   return dib;
 }
 
 // static
-TransportDIB* TransportDIB::Map(TransportDIB::Handle handle) {
-  TransportDIB* dib = new TransportDIB(handle);
-  if (!dib->shared_memory_.Map(0 /* map whole shared memory segment */)) {
+TransportDIB* TransportDIB::Map(Handle handle) {
+  scoped_ptr<TransportDIB> dib(CreateWithHandle(handle));
+  if (!dib->Map())
+    return NULL;
+  return dib.release();
+}
+
+// static
+TransportDIB* TransportDIB::CreateWithHandle(Handle handle) {
+  return new TransportDIB(handle);
+}
+
+// static
+bool TransportDIB::is_valid(Handle dib) {
+  return dib != NULL;
+}
+
+skia::PlatformCanvas* TransportDIB::GetPlatformCanvas(int w, int h) {
+  // This DIB already mapped the file into this process, but PlatformCanvas
+  // will map it again.
+  DCHECK(!memory()) << "Mapped file twice in the same process.";
+
+  scoped_ptr<skia::PlatformCanvas> canvas(new skia::PlatformCanvas);
+  if (!canvas->initialize(w, h, true, handle()))
+    return NULL;
+  return canvas.release();
+}
+
+bool TransportDIB::Map() {
+  if (!is_valid(handle()))
+    return false;
+  if (memory())
+    return true;
+
+  if (!shared_memory_.Map(0 /* map whole shared memory segment */)) {
     LOG(ERROR) << "Failed to map transport DIB"
-               << " handle:" << handle
-               << " error:" << GetLastError();
-    delete dib;
-    return NULL;
+               << " handle:" << shared_memory_.handle()
+               << " error:" << ::GetLastError();
+    return false;
   }
 
   // There doesn't seem to be any way to find the size of the shared memory
   // region! GetFileSize indicates that the handle is invalid. Thus, we
   // conservatively set the size to the maximum and hope that the renderer
   // isn't about to ask us to read off the end of the array.
-  dib->size_ = std::numeric_limits<size_t>::max();
-
-  return dib;
-}
-
-bool TransportDIB::is_valid(Handle dib) {
-  return dib != NULL;
-}
-
-skia::PlatformCanvas* TransportDIB::GetPlatformCanvas(int w, int h) {
-  scoped_ptr<skia::PlatformCanvas> canvas(new skia::PlatformCanvas);
-  if (!canvas->initialize(w, h, true, handle()))
-    return NULL;
-  return canvas.release();
+  size_ = std::numeric_limits<size_t>::max();
+  return true;
 }
 
 void* TransportDIB::memory() const {
   return shared_memory_.memory();
 }
 
 TransportDIB::Handle TransportDIB::handle() const {
   return shared_memory_.handle();
 }
 
 TransportDIB::Id TransportDIB::id() const {
-  return Id(shared_memory_.handle(), sequence_num_);
+  return Id(handle(), sequence_num_);
 }