Make SharedMemory use uint32 instead of size_t. This removes the remaining size_t's from the IPC code.

Review URL: http://codereview.chromium.org/581001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39164 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 30 insertions, 27 deletions

diff --git a/chrome/renderer/command_buffer_proxy.cc b/chrome/renderer/command_buffer_proxy.cc
index f1651db..2b71fa8 100644
--- a/chrome/renderer/command_buffer_proxy.cc
+++ b/chrome/renderer/command_buffer_proxy.cc
@@ -133,7 +133,7 @@ Buffer CommandBufferProxy::GetTransferBuffer(int32 id) {
   // Assuming we are in the renderer process, the service is responsible for
   // duplicating the handle. This might not be true for NaCl.
   base::SharedMemoryHandle handle;
-  size_t size;
+  uint32 size;
   if (!Send(new CommandBufferMsg_GetTransferBuffer(route_id_,
                                                    id,
                                                    &handle,
diff --git a/chrome/renderer/mock_printer.cc b/chrome/renderer/mock_printer.cc
index e8fbac0..235e056 100644
--- a/chrome/renderer/mock_printer.cc
+++ b/chrome/renderer/mock_printer.cc
@@ -145,43 +145,46 @@ int MockPrinter::GetPrintedPages() const {
   return page_number_;
 }
 
-const MockPrinterPage* MockPrinter::GetPrintedPage(size_t pageno) const {
+const MockPrinterPage* MockPrinter::GetPrintedPage(unsigned int pageno) const {
   if (pages_.size() > pageno)
     return pages_[pageno];
   else
     return NULL;
 }
 
-int MockPrinter::GetWidth(size_t page) const {
+int MockPrinter::GetWidth(unsigned int page) const {
   if (printer_status_ != PRINTER_READY || page >= pages_.size())
     return -1;
   return pages_[page]->width();
 }
 
-int MockPrinter::GetHeight(size_t page) const {
+int MockPrinter::GetHeight(unsigned int page) const {
   if (printer_status_ != PRINTER_READY || page >= pages_.size())
     return -1;
   return pages_[page]->height();
 }
 
-bool MockPrinter::GetBitmapChecksum(size_t page, std::string* checksum) const {
+bool MockPrinter::GetBitmapChecksum(
+    unsigned int page, std::string* checksum) const {
   if (printer_status_ != PRINTER_READY || page >= pages_.size())
     return false;
   *checksum = pages_[page]->image().checksum();
   return true;
 }
 
-bool MockPrinter::SaveSource(size_t page, const FilePath& filepath) const {
+bool MockPrinter::SaveSource(
+    unsigned int page, const FilePath& filepath) const {
   if (printer_status_ != PRINTER_READY || page >= pages_.size())
     return false;
   const uint8* source_data = pages_[page]->source_data();
-  size_t source_size = pages_[page]->source_size();
+  uint32 source_size = pages_[page]->source_size();
   file_util::WriteFile(filepath, reinterpret_cast<const char*>(source_data),
                        source_size);
   return true;
 }
 
-bool MockPrinter::SaveBitmap(size_t page, const FilePath& filepath) const {
+bool MockPrinter::SaveBitmap(
+    unsigned int page, const FilePath& filepath) const {
   if (printer_status_ != PRINTER_READY || page >= pages_.size())
     return false;
 
diff --git a/chrome/renderer/mock_printer.h b/chrome/renderer/mock_printer.h
index 80f6c4b..c97f149 100644
--- a/chrome/renderer/mock_printer.h
+++ b/chrome/renderer/mock_printer.h
@@ -24,7 +24,7 @@ struct ViewHostMsg_DidPrintPage_Params;
 class MockPrinterPage : public base::RefCounted<MockPrinterPage> {
  public:
   MockPrinterPage(const void* source_data,
-                  size_t source_size,
+                  uint32 source_size,
                   const printing::Image& image)
         : source_size_(source_size),
           image_(image) {
@@ -40,11 +40,11 @@ class MockPrinterPage : public base::RefCounted<MockPrinterPage> {
   int width() const { return image_.size().width(); }
   int height() const { return image_.size().height(); }
   const uint8* source_data() const { return source_data_.get(); }
-  const size_t source_size() const { return source_size_; }
+  const uint32 source_size() const { return source_size_; }
   const printing::Image& image() const { return image_; }
 
  private:
-  size_t source_size_;
+  uint32 source_size_;
   scoped_array<uint8> source_data_;
   printing::Image image_;
 
@@ -89,19 +89,19 @@ class MockPrinter {
 
   // Get a pointer to the printed page, returns NULL if pageno has not been
   // printed.  The pointer is for read only view and should not be deleted.
-  const MockPrinterPage* GetPrintedPage(size_t pageno) const;
+  const MockPrinterPage* GetPrintedPage(unsigned int pageno) const;
 
-  int GetWidth(size_t page) const;
-  int GetHeight(size_t page) const;
-  bool GetBitmapChecksum(size_t page, std::string* checksum) const;
-  bool GetSource(size_t page, const void** data, size_t* size) const;
-  bool GetBitmap(size_t page, const void** data, size_t* size) const;
-  bool SaveSource(size_t page, const FilePath& filepath) const;
-  bool SaveBitmap(size_t page, const FilePath& filepath) const;
+  int GetWidth(unsigned int page) const;
+  int GetHeight(unsigned int page) const;
+  bool GetBitmapChecksum(unsigned int page, std::string* checksum) const;
+  bool GetSource(unsigned int page, const void** data, uint32* size) const;
+  bool GetBitmap(unsigned int page, const void** data, uint32* size) const;
+  bool SaveSource(unsigned int page, const FilePath& filepath) const;
+  bool SaveBitmap(unsigned int page, const FilePath& filepath) const;
 
  protected:
   int CreateDocumentCookie();
-  bool GetChecksum(const void* data, size_t size, std::string* checksum) const;
+  bool GetChecksum(const void* data, uint32 size, std::string* checksum) const;
 
  private:
   // In pixels according to dpi_x and dpi_y.
diff --git a/chrome/renderer/mock_render_thread.cc b/chrome/renderer/mock_render_thread.cc
index bcb1517..1fa513f 100644
--- a/chrome/renderer/mock_render_thread.cc
+++ b/chrome/renderer/mock_render_thread.cc
@@ -122,7 +122,7 @@ void MockRenderThread::OnDuplicateSection(
 
 #if defined(OS_MACOSX)
 void MockRenderThread::OnAllocatePDFTransport(
-    size_t buffer_size, base::SharedMemoryHandle* handle) {
+    uint32 buffer_size, base::SharedMemoryHandle* handle) {
   base::SharedMemory shared_buf;
   shared_buf.Create(L"", false, false, buffer_size);
   if (!shared_buf.Map(buffer_size)) {
diff --git a/chrome/renderer/mock_render_thread.h b/chrome/renderer/mock_render_thread.h
index d4ed9f7..4f3b1d9 100644
--- a/chrome/renderer/mock_render_thread.h
+++ b/chrome/renderer/mock_render_thread.h
@@ -93,7 +93,7 @@ class MockRenderThread : public RenderThreadBase {
 #endif
 
 #if defined(OS_MACOSX)
-  void OnAllocatePDFTransport(size_t buffer_size,
+  void OnAllocatePDFTransport(uint32 buffer_size,
                               base::SharedMemoryHandle* handle);
 #endif
 
diff --git a/chrome/renderer/print_web_view_helper_linux.cc b/chrome/renderer/print_web_view_helper_linux.cc
index 4b2f92f..415bf1d 100644
--- a/chrome/renderer/print_web_view_helper_linux.cc
+++ b/chrome/renderer/print_web_view_helper_linux.cc
@@ -80,7 +80,7 @@ void PrintWebViewHelper::PrintPages(const ViewMsg_PrintPages_Params& params,
   metafile.Close();
 
   // Get the size of the resulting metafile.
-  unsigned int buf_size = metafile.GetDataSize();
+  uint32 buf_size = metafile.GetDataSize();
   DCHECK_GT(buf_size, 0u);
 
   base::FileDescriptor fd;
diff --git a/chrome/renderer/print_web_view_helper_mac.mm b/chrome/renderer/print_web_view_helper_mac.mm
index ae579bb..6e2cc2d 100644
--- a/chrome/renderer/print_web_view_helper_mac.mm
+++ b/chrome/renderer/print_web_view_helper_mac.mm
@@ -207,7 +207,7 @@ void PrintWebViewHelper::PrintPage(const ViewMsg_PrintPage_Params& params,
   base::SharedMemory shared_buf;
 
   // Ask the browser to create the shared memory for us.
-  unsigned int buf_size = metafile.GetDataSize();
+  uint32 buf_size = metafile.GetDataSize();
   base::SharedMemoryHandle shared_mem_handle;
   if (Send(new ViewHostMsg_AllocatePDFTransport(routing_id(), buf_size,
                                                 &shared_mem_handle))) {
diff --git a/chrome/renderer/print_web_view_helper_win.cc b/chrome/renderer/print_web_view_helper_win.cc
index 1d9d595..6ba70a3 100644
--- a/chrome/renderer/print_web_view_helper_win.cc
+++ b/chrome/renderer/print_web_view_helper_win.cc
@@ -244,7 +244,7 @@ void PrintWebViewHelper::PrintPage(const ViewMsg_PrintPage_Params& params,
   }
 
   // Get the size of the compiled metafile.
-  unsigned buf_size = metafile.GetDataSize();
+  uint32 buf_size = metafile.GetDataSize();
   DCHECK_GT(buf_size, 128u);
   ViewHostMsg_DidPrintPage_Params page_params;
   page_params.data_size = 0;
diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc
index 8b5d3fd..e4f8dd9 100644
--- a/chrome/renderer/renderer_glue.cc
+++ b/chrome/renderer/renderer_glue.cc
@@ -90,7 +90,7 @@ void ScopedClipboardWriterGlue::WriteBitmapFromPixels(const void* pixels,
   if (shared_buf_)
     return;
 
-  size_t buf_size = 4 * size.width() * size.height();
+  uint32 buf_size = 4 * size.width() * size.height();
 
   // Allocate a shared memory buffer to hold the bitmap bits.
 #if defined(OS_MACOSX)
diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc
index 6747ef0..178f07f 100644
--- a/chrome/renderer/webplugin_delegate_proxy.cc
+++ b/chrome/renderer/webplugin_delegate_proxy.cc
@@ -805,7 +805,7 @@ bool WebPluginDelegateProxy::BackgroundChanged(
 
 void WebPluginDelegateProxy::Print(gfx::NativeDrawingContext context) {
   base::SharedMemoryHandle shared_memory;
-  size_t size;
+  uint32 size;
   if (!Send(new PluginMsg_Print(instance_id_, &shared_memory, &size)))
     return;