content/browser/frame_host/render_widget_host_view_child_frame.cc - 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/frame_host/render_widget_host_view_child_frame.cc

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/frame_host/render_widget_host_view_child_frame.h ('k') | content/browser/frame_host/render_widget_host_view_child_frame_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/render_widget_host_view_child_frame.cc

diff --git a/content/browser/frame_host/render_widget_host_view_child_frame.cc b/content/browser/frame_host/render_widget_host_view_child_frame.cc

index a6494e5d34508c461aa8199fb8a1ca1429680ece..f5760a6fdd2765fd8c5270a42fc3078ca052a60b 100644

--- a/content/browser/frame_host/render_widget_host_view_child_frame.cc

+++ b/content/browser/frame_host/render_widget_host_view_child_frame.cc

@@ -7,6 +7,7 @@

#include <algorithm>

#include <vector>

+#include "build/build_config.h"

#include "cc/surfaces/surface.h"

#include "cc/surfaces/surface_factory.h"

#include "cc/surfaces/surface_manager.h"

@@ -241,7 +242,7 @@ void RenderWidgetHostViewChildFrame::UnlockCompositingSurface() {

NOTIMPLEMENTED();

}

-void RenderWidgetHostViewChildFrame::SurfaceDrawn(uint32 output_surface_id,

+void RenderWidgetHostViewChildFrame::SurfaceDrawn(uint32_t output_surface_id,

cc::SurfaceDrawStatus drawn) {

cc::CompositorFrameAck ack;

DCHECK_GT(ack_pending_count_, 0U);

@@ -255,8 +256,8 @@ void RenderWidgetHostViewChildFrame::SurfaceDrawn(uint32 output_surface_id,

}

void RenderWidgetHostViewChildFrame::OnSwapCompositorFrame(

- uint32 output_surface_id,

- scoped_ptr<cc::CompositorFrame> frame) {

+ uint32_t output_surface_id,

+ scoped_ptr<cc::CompositorFrame> frame) {

last_scroll_offset_ = frame->metadata.root_scroll_offset;

if (!frame_connector_)