| Index: content/renderer/renderer_clipboard_delegate.cc
|
| diff --git a/content/renderer/renderer_clipboard_delegate.cc b/content/renderer/renderer_clipboard_delegate.cc
|
| index e1285d2c07b28b377ac969666bfa07c933cf1b38..6ce0203782fa61a413338b33399e68a2c39d7161 100644
|
| --- a/content/renderer/renderer_clipboard_delegate.cc
|
| +++ b/content/renderer/renderer_clipboard_delegate.cc
|
| @@ -20,8 +20,8 @@ namespace content {
|
| RendererClipboardDelegate::RendererClipboardDelegate() {
|
| }
|
|
|
| -uint64 RendererClipboardDelegate::GetSequenceNumber(ui::ClipboardType type) {
|
| - uint64 sequence_number = 0;
|
| +uint64_t RendererClipboardDelegate::GetSequenceNumber(ui::ClipboardType type) {
|
| + uint64_t sequence_number = 0;
|
| RenderThreadImpl::current()->Send(
|
| new ClipboardHostMsg_GetSequenceNumber(type, &sequence_number));
|
| return sequence_number;
|
| @@ -57,8 +57,8 @@ void RendererClipboardDelegate::ReadText(ui::ClipboardType type,
|
| void RendererClipboardDelegate::ReadHTML(ui::ClipboardType type,
|
| base::string16* markup,
|
| GURL* url,
|
| - uint32* fragment_start,
|
| - uint32* fragment_end) {
|
| + uint32_t* fragment_start,
|
| + uint32_t* fragment_end) {
|
| RenderThreadImpl::current()->Send(new ClipboardHostMsg_ReadHTML(
|
| type, markup, url, fragment_start, fragment_end));
|
| }
|
| @@ -71,7 +71,7 @@ void RendererClipboardDelegate::ReadRTF(ui::ClipboardType type,
|
| void RendererClipboardDelegate::ReadImage(ui::ClipboardType type,
|
| std::string* data) {
|
| base::SharedMemoryHandle image_handle;
|
| - uint32 image_size = 0;
|
| + uint32_t image_size = 0;
|
| RenderThreadImpl::current()->Send(
|
| new ClipboardHostMsg_ReadImage(type, &image_handle, &image_size));
|
| if (base::SharedMemory::IsHandleValid(image_handle)) {
|
| @@ -135,14 +135,14 @@ bool RendererClipboardDelegate::WriteImage(ui::ClipboardType clipboard_type,
|
| if (!pixels)
|
| return false;
|
|
|
| - base::CheckedNumeric<uint32> checked_buf_size = 4;
|
| + base::CheckedNumeric<uint32_t> checked_buf_size = 4;
|
| checked_buf_size *= size.width();
|
| checked_buf_size *= size.height();
|
| if (!checked_buf_size.IsValid())
|
| return false;
|
|
|
| // Allocate a shared memory buffer to hold the bitmap bits.
|
| - uint32 buf_size = checked_buf_size.ValueOrDie();
|
| + uint32_t buf_size = checked_buf_size.ValueOrDie();
|
| shared_buf = ChildThreadImpl::current()->AllocateSharedMemory(buf_size);
|
| if (!shared_buf)
|
| return false;
|
|
|