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

Unified Diff: content/renderer/media/android/stream_texture_factory_synchronous_impl.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
Index: content/renderer/media/android/stream_texture_factory_synchronous_impl.h
diff --git a/content/renderer/media/android/stream_texture_factory_synchronous_impl.h b/content/renderer/media/android/stream_texture_factory_synchronous_impl.h
index 6f1da285eb65397003af69b7399d27abed75cf76..cca38a855a37691a9e8346dcd12d8842e791040e 100644
--- a/content/renderer/media/android/stream_texture_factory_synchronous_impl.h
+++ b/content/renderer/media/android/stream_texture_factory_synchronous_impl.h
@@ -5,7 +5,10 @@
#ifndef CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_SYNCHRONOUS_IMPL_H_
#define CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_SYNCHRONOUS_IMPL_H_
+#include <stdint.h>
+
#include "base/callback.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/observer_list.h"
#include "content/renderer/media/android/stream_texture_factory.h"
@@ -28,9 +31,9 @@ class StreamTextureFactorySynchronousImpl : public StreamTextureFactory {
class ContextProvider : public base::RefCountedThreadSafe<ContextProvider> {
public:
virtual scoped_refptr<gfx::SurfaceTexture> GetSurfaceTexture(
- uint32 stream_id) = 0;
+ uint32_t stream_id) = 0;
- virtual uint32 CreateStreamTexture(uint32 texture_id) = 0;
+ virtual uint32_t CreateStreamTexture(uint32_t texture_id) = 0;
virtual gpu::gles2::GLES2Interface* ContextGL() = 0;
@@ -50,11 +53,11 @@ class StreamTextureFactorySynchronousImpl : public StreamTextureFactory {
int frame_id);
StreamTextureProxy* CreateProxy() override;
- void EstablishPeer(int32 stream_id, int player_id, int frame_id) override;
+ void EstablishPeer(int32_t stream_id, int player_id, int frame_id) override;
unsigned CreateStreamTexture(unsigned texture_target,
unsigned* texture_id,
gpu::Mailbox* texture_mailbox) override;
- void SetStreamTextureSize(int32 stream_id, const gfx::Size& size) override;
+ void SetStreamTextureSize(int32_t stream_id, const gfx::Size& size) override;
gpu::gles2::GLES2Interface* ContextGL() override;
void AddObserver(StreamTextureFactoryContextObserver* obs) override;
void RemoveObserver(StreamTextureFactoryContextObserver* obs) override;

Powered by Google App Engine
This is Rietveld 408576698