Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1539)

Unified Diff: content/renderer/gpu/mailbox_output_surface.h

Issue 1547073003: Switch to standard integer types in content/renderer/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/gpu/gpu_benchmarking_extension.cc ('k') | content/renderer/gpu/mailbox_output_surface.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/gpu/mailbox_output_surface.h
diff --git a/content/renderer/gpu/mailbox_output_surface.h b/content/renderer/gpu/mailbox_output_surface.h
index 148efa3e2c9e934a3337dae4fcd664af54930f61..1d4b95559f84b82270f2da3326efd300600588f8 100644
--- a/content/renderer/gpu/mailbox_output_surface.h
+++ b/content/renderer/gpu/mailbox_output_surface.h
@@ -5,6 +5,9 @@
#ifndef CONTENT_RENDERER_GPU_MAILBOX_OUTPUT_SURFACE_H_
#define CONTENT_RENDERER_GPU_MAILBOX_OUTPUT_SURFACE_H_
+#include <stddef.h>
+#include <stdint.h>
+
#include <queue>
#include "base/memory/ref_counted.h"
@@ -27,8 +30,8 @@ class FrameSwapMessageQueue;
class MailboxOutputSurface : public CompositorOutputSurface {
public:
MailboxOutputSurface(
- int32 routing_id,
- uint32 output_surface_id,
+ int32_t routing_id,
+ uint32_t output_surface_id,
const scoped_refptr<ContextProviderCommandBuffer>& context_provider,
const scoped_refptr<ContextProviderCommandBuffer>&
worker_context_provider,
@@ -46,18 +49,18 @@ class MailboxOutputSurface : public CompositorOutputSurface {
private:
// CompositorOutputSurface overrides.
- void OnSwapAck(uint32 output_surface_id,
+ void OnSwapAck(uint32_t output_surface_id,
const cc::CompositorFrameAck& ack) override;
size_t GetNumAcksPending();
struct TransferableFrame {
TransferableFrame();
- TransferableFrame(uint32 texture_id,
+ TransferableFrame(uint32_t texture_id,
const gpu::Mailbox& mailbox,
const gfx::Size size);
- uint32 texture_id;
+ uint32_t texture_id;
gpu::Mailbox mailbox;
gpu::SyncToken sync_token;
gfx::Size size;
@@ -67,7 +70,7 @@ class MailboxOutputSurface : public CompositorOutputSurface {
std::deque<TransferableFrame> pending_textures_;
std::queue<TransferableFrame> returned_textures_;
- uint32 fbo_;
+ uint32_t fbo_;
bool is_backbuffer_discarded_;
cc::ResourceFormat format_;
};
« no previous file with comments | « content/renderer/gpu/gpu_benchmarking_extension.cc ('k') | content/renderer/gpu/mailbox_output_surface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698