Work before enabling software compositing on Mac

Implement RenderWidgetHostViewMac::CopyFromCompositingSurface for the
software compositing path and disable copying to video frames and frame
subscription (this path needs to be functional, but not particularly
performant).

Fix a bug where RenderWidgetHostViewMac::SoftwareFrameWasFreed would
reach in to a destroyed RenderWidgetHostImpl.

Fix a bug where RenderWidgetHostViewMac::software_latency_info_ was
not updated in RenderWidgetHostViewMac::OnSwapCompositorFrame.

Fix a bug where the ack for a software frame is sent immediately, instead
of when the frame is actually drawn.

BUG=286038
R=hclam@chromium.org

Review URL: https://codereview.chromium.org/113603002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240558 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 1 deletions

diff --git a/content/browser/renderer_host/software_frame_manager.h b/content/browser/renderer_host/software_frame_manager.h
index 503a40d..6d19afd 100644
--- a/content/browser/renderer_host/software_frame_manager.h
+++ b/content/browser/renderer_host/software_frame_manager.h
@@ -52,10 +52,12 @@ class CONTENT_EXPORT SoftwareFrameManager : public RendererFrameManagerClient {
   void SetVisibility(bool visible);
   bool HasCurrentFrame() const;
   void DiscardCurrentFrame();
+  uint32 GetCurrentFrameOutputSurfaceId() const;
   void GetCurrentFrameMailbox(
       cc::TextureMailbox* mailbox,
       scoped_ptr<cc::SingleReleaseCallback>* callback);
-  const void* GetCurrentFramePixels() const;
+  void* GetCurrentFramePixels() const;
+  float GetCurrentFrameDeviceScaleFactor() const;
   gfx::Size GetCurrentFrameSizeInPixels() const;
   gfx::Size GetCurrentFrameSizeInDIP() const;