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

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

Issue 2553763002: Fix cursor missing in tabCapture on OSX Sierra (Closed)
Patch Set: implement CursorRenderer Created 4 years 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/cursor_renderer_mac.h
diff --git a/content/browser/media/capture/cursor_renderer_mac.h b/content/browser/media/capture/cursor_renderer_mac.h
index dc0ab1a322d06c8b44da9b244b05e83b3d5d9027..a6dd250f426913fdf20dc191c5e6763296affee6 100644
--- a/content/browser/media/capture/cursor_renderer_mac.h
+++ b/content/browser/media/capture/cursor_renderer_mac.h
@@ -5,12 +5,7 @@
#ifndef CONTENT_BROWSER_MEDIA_CAPTURE_CURSOR_RENDERER_MAC_H_
#define CONTENT_BROWSER_MEDIA_CAPTURE_CURSOR_RENDERER_MAC_H_
-#include "base/mac/scoped_cftyperef.h"
-#include "base/macros.h"
-#include "base/memory/weak_ptr.h"
#include "content/browser/media/capture/cursor_renderer.h"
-#include "content/common/content_export.h"
-#include "media/base/video_frame.h"
namespace content {
@@ -18,28 +13,21 @@ namespace content {
// frame.
class CONTENT_EXPORT CursorRendererMac : public CursorRenderer {
public:
- explicit CursorRendererMac(NSView* view);
+ explicit CursorRendererMac(gfx::NativeView view);
~CursorRendererMac() final;
// CursorRender implementation.
- void Clear() final;
- bool SnapshotCursorState(const gfx::Rect& region_in_frame) final;
- void RenderOnVideoFrame(
- const scoped_refptr<media::VideoFrame>& target) const final;
- base::WeakPtr<CursorRenderer> GetWeakPtr() final;
+ bool IsCapturedViewActive() final;
+ gfx::Size GetCapturedViewSize() final;
+ gfx::Point GetCursorPositionInView() final;
+ gfx::NativeCursor GetLastKnownCursor() final;
+ gfx::Point GetLastKnownCursorHotPoint() final;
+ SkBitmap GetLastKnownCursorImage() final;
private:
NSView* const view_;
- base::ScopedCFTypeRef<CFDataRef> last_cursor_data_;
- int last_cursor_width_;
- int last_cursor_height_;
- gfx::Point cursor_position_in_frame_;
+ gfx::Point last_known_cursor_location_;
- base::TimeTicks last_mouse_movement_timestamp_;
- float last_mouse_location_x_;
- float last_mouse_location_y_;
-
- base::WeakPtrFactory<CursorRendererMac> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(CursorRendererMac);
};

Powered by Google App Engine
This is Rietveld 408576698