content/renderer/child_frame_compositing_helper.h - Issue 1547073003: Switch to standard integer types in content/renderer/.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/child_frame_compositing_helper.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/cache_storage/webserviceworkercachestorage_impl.h ('k') | content/renderer/child_frame_compositing_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/child_frame_compositing_helper.h

diff --git a/content/renderer/child_frame_compositing_helper.h b/content/renderer/child_frame_compositing_helper.h

index 1f26c9fffe8e0a914a14d8663f0be4856b0053f6..d2d4e78cda2510a40c87334415d1d23c5db862c5 100644

--- a/content/renderer/child_frame_compositing_helper.h

+++ b/content/renderer/child_frame_compositing_helper.h

@@ -5,9 +5,12 @@

#ifndef CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_

#define CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_

+#include <stdint.h>

#include <string>

#include <vector>

+#include "base/macros.h"

#include "base/memory/ref_counted.h"

#include "base/memory/scoped_ptr.h"

#include "base/memory/shared_memory.h"

@@ -66,7 +69,7 @@ class CONTENT_EXPORT ChildFrameCompositingHelper

void OnContainerDestroy();

void OnCompositorFrameSwapped(scoped_ptr<cc::CompositorFrame> frame,

int route_id,

- uint32 output_surface_id,

+ uint32_t output_surface_id,

int host_id,

base::SharedMemoryHandle handle);

void OnSetSurface(const cc::SurfaceId& surface_id,

@@ -126,7 +129,7 @@ class CONTENT_EXPORT ChildFrameCompositingHelper

int host_routing_id_;

int last_route_id_;

- uint32 last_output_surface_id_;

+ uint32_t last_output_surface_id_;

int last_host_id_;

bool ack_pending_;

bool opaque_;