Index: content/browser/renderer_host/render_widget_host_view_mac.h |
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.h b/content/browser/renderer_host/render_widget_host_view_mac.h |
index 49ef5a0790c35b0f7f349afec30a8f353f9937ed..c8fa95c59d871bffb382ee24d42e68165daff75c 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_mac.h |
+++ b/content/browser/renderer_host/render_widget_host_view_mac.h |
@@ -186,15 +186,16 @@ class Layer; |
actualRange:(NSRangePointer)actualRange; |
@end |
-@interface SoftwareLayer : CALayer { |
- @private |
- content::RenderWidgetHostViewMac* renderWidgetHostView_; |
-} |
+@interface SoftwareLayer : CALayer |
-- (id)initWithRenderWidgetHostViewMac:(content::RenderWidgetHostViewMac*)r; |
+- (id)init; |
-// Invalidate the RenderWidgetHostViewMac because it may be going away. If |
-// displayed again, it will draw white. |
+- (void)setContentsToData:(const void *)data |
+ withRowBytes:(size_t)rowBytes |
+ withPixelSize:(gfx::Size)pixelSize |
+ withScaleFactor:(float)scaleFactor; |
+ |
+// Remove the layer from the layer hierarchy. |
- (void)disableRendering; |
@end |
@@ -371,6 +372,10 @@ class CONTENT_EXPORT RenderWidgetHostViewMac |
float scale_factor, |
const std::vector<ui::LatencyInfo>& latency_info); |
+ void GotBrowserCompositorSoftwareFrame(cc::SoftwareFrameData* frame_data, |
+ float scale_factor, |
+ SkCanvas* canvas); |
+ |
// Draw the IOSurface by making its context current to this view. |
void DrawIOSurfaceWithoutCoreAnimation(); |