Index: android_webview/browser/hardware_renderer.h |
diff --git a/android_webview/browser/hardware_renderer.h b/android_webview/browser/hardware_renderer.h |
index 922a9403c024c7a8265f1ee6748913f135542518..94ea7d9104926116a5688e5864c0c32317ccd2f5 100644 |
--- a/android_webview/browser/hardware_renderer.h |
+++ b/android_webview/browser/hardware_renderer.h |
@@ -7,6 +7,7 @@ |
#include <memory> |
+#include "android_webview/browser/compositor_id.h" |
#include "android_webview/browser/render_thread_manager.h" |
#include "base/macros.h" |
#include "cc/surfaces/display_client.h" |
@@ -51,7 +52,7 @@ class HardwareRenderer : public cc::DisplayClient, |
void ReturnResourcesInChildFrame(); |
void ReturnResourcesToCompositor(const cc::ReturnedResourceArray& resources, |
- uint32_t compositor_routing_id, |
+ CompositorID compositor_id, |
boliu
2016/06/13 15:30:44
const&
hush (inactive)
2016/06/14 23:48:28
Done.
|
uint32_t output_surface_id); |
RenderThreadManager* render_thread_manager_; |
@@ -78,7 +79,7 @@ class HardwareRenderer : public cc::DisplayClient, |
std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_; |
cc::SurfaceId child_id_; |
cc::SurfaceId root_id_; |
- uint32_t compositor_id_; |
+ CompositorID compositor_id_; |
// HardwareRenderer guarantees resources are returned in the order of |
// output_surface_id, and resources for old output surfaces are dropped. |
uint32_t last_committed_output_surface_id_; |