android_webview/browser/hardware_renderer.cc - Issue 619843002: cc: Make separate interface for BeginFrame ipc from OutputSurface

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: android_webview/browser/hardware_renderer.cc

Issue 619843002: cc: Make separate interface for BeginFrame ipc from OutputSurface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased on master and fix skyostil's comment Created 6 years, 1 month 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: android_webview/browser/hardware_renderer.cc

diff --git a/android_webview/browser/hardware_renderer.cc b/android_webview/browser/hardware_renderer.cc

index 5af1109c32f86a45598bd06d4b37aa3199d11cf9..fbdfa23592d0129c9729df09558b4c1eaf2c5357 100644

--- a/android_webview/browser/hardware_renderer.cc

+++ b/android_webview/browser/hardware_renderer.cc

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

#include "cc/layers/layer.h"

#include "cc/output/compositor_frame.h"

#include "cc/output/output_surface.h"

+#include "cc/scheduler/begin_frame_source.h"

#include "cc/trees/layer_tree_host.h"

#include "cc/trees/layer_tree_settings.h"

#include "gpu/command_buffer/client/gl_in_process_context.h"

@@ -101,7 +102,7 @@ HardwareRenderer::HardwareRenderer(SharedRendererState* state)

settings.single_thread_proxy_scheduler = false;

layer_tree_host_ = cc::LayerTreeHost::CreateSingleThreaded(

- this, this, NULL, NULL, settings, NULL);

+ this, this, NULL, NULL, settings, NULL, nullptr);

dcheng 2014/11/10 22:56:15 The inconsistency between NULL and nullptr here is

simonhong 2014/11/11 12:54:14 Done.

layer_tree_host_->SetRootLayer(root_layer_);

layer_tree_host_->SetLayerTreeHostClientReady();

layer_tree_host_->set_has_transparent_background(true);

« no previous file with comments | « no previous file | cc/layers/layer_perftest.cc » ('j') | cc/layers/layer_unittest.cc » ('J')