content/browser/compositor/offscreen_browser_compositor_output_surface.h - Issue 1549113002: Switch to standard integer types in content/browser/.

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/browser/compositor/offscreen_browser_compositor_output_surface.h

Issue 1549113002: Switch to standard integer types in content/browser/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase 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/browser/compositor/image_transport_factory_browsertest.cc ('k') | content/browser/compositor/offscreen_browser_compositor_output_surface.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/compositor/offscreen_browser_compositor_output_surface.h

diff --git a/content/browser/compositor/offscreen_browser_compositor_output_surface.h b/content/browser/compositor/offscreen_browser_compositor_output_surface.h

index 3110b07874b8bff19036e6625dbd58517856ec31..abbb20c065d5e53d5172d0c731a3a325f2ce58ca 100644

--- a/content/browser/compositor/offscreen_browser_compositor_output_surface.h

+++ b/content/browser/compositor/offscreen_browser_compositor_output_surface.h

@@ -5,9 +5,13 @@

#ifndef CONTENT_BROWSER_COMPOSITOR_OFFSCREEN_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_

#define CONTENT_BROWSER_COMPOSITOR_OFFSCREEN_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_

+#include <stdint.h>

#include "base/cancelable_callback.h"

+#include "base/macros.h"

#include "base/memory/scoped_ptr.h"

#include "base/memory/weak_ptr.h"

+#include "build/build_config.h"

#include "content/browser/compositor/browser_compositor_output_surface.h"

namespace ui {

@@ -49,7 +53,7 @@ class OffscreenBrowserCompositorOutputSurface

bool SurfaceShouldNotShowFramesAfterSuspendForRecycle() const override;

#endif

- uint32 fbo_;

+ uint32_t fbo_;

bool is_backbuffer_discarded_;

scoped_ptr<ReflectorTexture> reflector_texture_;