Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1475)

Unified Diff: content/browser/media/capture/aura_window_capture_machine.h

Issue 1412173003: cast: support cursor rendering for tab capture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed left over logs Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/media/capture/aura_window_capture_machine.h
diff --git a/content/browser/media/capture/aura_window_capture_machine.h b/content/browser/media/capture/aura_window_capture_machine.h
index 858c71422708ad172dc41c0e4799737ce8605c9f..f330ac6fcf80a5a4138a163ee36ec990734e31dd 100644
--- a/content/browser/media/capture/aura_window_capture_machine.h
+++ b/content/browser/media/capture/aura_window_capture_machine.h
@@ -8,6 +8,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/timer/timer.h"
+#include "content/browser/media/capture/cursor_renderer.h"
#include "media/capture/content/screen_capture_device_core.h"
#include "ui/aura/window.h"
#include "ui/aura/window_observer.h"
@@ -91,15 +92,6 @@ class AuraWindowCaptureMachine
const CaptureFrameCallback& capture_frame_cb,
scoped_ptr<cc::CopyOutputResult> result);
- // Helper function to update cursor state.
- // |region_in_frame| defines where the desktop is rendered in the captured
- // frame.
- // Returns the current cursor position in captured frame.
- gfx::Point UpdateCursorState(const gfx::Rect& region_in_frame);
-
- // Clears cursor state.
- void ClearCursorState();
-
// The window associated with the desktop.
aura::Window* desktop_window_;
@@ -118,10 +110,8 @@ class AuraWindowCaptureMachine
// YUV readback pipeline.
scoped_ptr<content::ReadbackYUVInterface> yuv_readback_pipeline_;
- // Cursor state.
- ui::Cursor last_cursor_;
- gfx::Size window_size_when_cursor_last_updated_;
- SkBitmap scaled_cursor_bitmap_;
+ // Renders mouse cursor on frame
+ scoped_ptr<content::CursorRenderer> cursor_renderer_;
// TODO(jiayl): Remove power_save_blocker_ when there is an API to keep the
// screen from sleeping for the drive-by web.

Powered by Google App Engine
This is Rietveld 408576698