| Index: android_webview/browser/hardware_renderer.cc
|
| diff --git a/android_webview/browser/hardware_renderer.cc b/android_webview/browser/hardware_renderer.cc
|
| index aee41918b23ba47b2a631e7bd718871de9cf28a0..17b8b945b6a545863e3cae827bb978b880425d3b 100644
|
| --- a/android_webview/browser/hardware_renderer.cc
|
| +++ b/android_webview/browser/hardware_renderer.cc
|
| @@ -38,7 +38,6 @@ HardwareRenderer::HardwareRenderer(RenderThreadManager* state)
|
| : render_thread_manager_(state),
|
| last_egl_context_(eglGetCurrentContext()),
|
| gl_surface_(new AwGLSurface),
|
| - compositor_id_(0u), // Valid compositor id starts at 1.
|
| last_committed_output_surface_id_(0u),
|
| last_submitted_output_surface_id_(0u),
|
| output_surface_(NULL) {
|
| @@ -261,7 +260,7 @@ void HardwareRenderer::ReturnResourcesInChildFrame() {
|
|
|
| void HardwareRenderer::ReturnResourcesToCompositor(
|
| const cc::ReturnedResourceArray& resources,
|
| - uint32_t compositor_id,
|
| + CompositorID compositor_id,
|
| uint32_t output_surface_id) {
|
| if (output_surface_id != last_committed_output_surface_id_)
|
| return;
|
|
|