Index: cc/output/ca_layer_overlay.cc |
diff --git a/cc/output/ca_layer_overlay.cc b/cc/output/ca_layer_overlay.cc |
index 094940502daf0ba2249ea3f3b0d640382112f894..802fd41dfb9a9e5e40342bb44d7cd4721047e81b 100644 |
--- a/cc/output/ca_layer_overlay.cc |
+++ b/cc/output/ca_layer_overlay.cc |
@@ -128,6 +128,9 @@ CALayerResult FromRenderPassQuad(ResourceProvider* resource_provider, |
} |
} |
+ // The original RenderPassDrawQuad will be destroyed before the GLRenderer has |
+ // a chance to do any copying. Save a new copy. |
+ ca_layer_overlay->rpdq.reset(new RenderPassDrawQuad(*quad)); |
ca_layer_overlay->render_pass_id = quad->render_pass_id; |
ca_layer_overlay->contents_rect = gfx::RectF(0, 0, 1, 1); |
@@ -294,6 +297,16 @@ class CALayerOverlayProcessor { |
} // namespace |
+CALayerOverlaySharedState& CALayerOverlaySharedState::operator=( |
+ const CALayerOverlaySharedState& other) { |
+ sorting_context_id = other.sorting_context_id; |
+ is_clipped = other.is_clipped; |
+ clip_rect = other.clip_rect; |
+ opacity = other.opacity; |
+ transform = other.transform; |
+ return *this; |
ccameron
2016/08/04 01:46:01
This can just be =default then, right?
erikchen
2016/08/05 17:15:06
No longer necessary at all.
|
+} |
+ |
CALayerOverlay::CALayerOverlay() : filter(GL_LINEAR) {} |
CALayerOverlay::CALayerOverlay(const CALayerOverlay& other) = default; |