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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_mac.h

Issue 374633002: SkBitmap::Config is deprecated, use SkColorType instead (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address comments from #4 Created 6 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 #include <IOSurface/IOSurfaceAPI.h> 9 #include <IOSurface/IOSurfaceAPI.h>
10 #include <list> 10 #include <list>
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 virtual void SelectionChanged(const base::string16& text, 289 virtual void SelectionChanged(const base::string16& text,
290 size_t offset, 290 size_t offset,
291 const gfx::Range& range) OVERRIDE; 291 const gfx::Range& range) OVERRIDE;
292 virtual void SelectionBoundsChanged( 292 virtual void SelectionBoundsChanged(
293 const ViewHostMsg_SelectionBounds_Params& params) OVERRIDE; 293 const ViewHostMsg_SelectionBounds_Params& params) OVERRIDE;
294 virtual void ScrollOffsetChanged() OVERRIDE; 294 virtual void ScrollOffsetChanged() OVERRIDE;
295 virtual void CopyFromCompositingSurface( 295 virtual void CopyFromCompositingSurface(
296 const gfx::Rect& src_subrect, 296 const gfx::Rect& src_subrect,
297 const gfx::Size& dst_size, 297 const gfx::Size& dst_size,
298 const base::Callback<void(bool, const SkBitmap&)>& callback, 298 const base::Callback<void(bool, const SkBitmap&)>& callback,
299 SkBitmap::Config config) OVERRIDE; 299 SkColorType color_type) OVERRIDE;
300 virtual void CopyFromCompositingSurfaceToVideoFrame( 300 virtual void CopyFromCompositingSurfaceToVideoFrame(
301 const gfx::Rect& src_subrect, 301 const gfx::Rect& src_subrect,
302 const scoped_refptr<media::VideoFrame>& target, 302 const scoped_refptr<media::VideoFrame>& target,
303 const base::Callback<void(bool)>& callback) OVERRIDE; 303 const base::Callback<void(bool)>& callback) OVERRIDE;
304 virtual bool CanCopyToVideoFrame() const OVERRIDE; 304 virtual bool CanCopyToVideoFrame() const OVERRIDE;
305 virtual bool CanSubscribeFrame() const OVERRIDE; 305 virtual bool CanSubscribeFrame() const OVERRIDE;
306 virtual void BeginFrameSubscription( 306 virtual void BeginFrameSubscription(
307 scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber) OVERRIDE; 307 scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber) OVERRIDE;
308 virtual void EndFrameSubscription() OVERRIDE; 308 virtual void EndFrameSubscription() OVERRIDE;
309 virtual void OnSwapCompositorFrame( 309 virtual void OnSwapCompositorFrame(
(...skipping 27 matching lines...) Expand all
337 InputEventAckState ack_result) OVERRIDE; 337 InputEventAckState ack_result) OVERRIDE;
338 338
339 // IPC::Sender implementation. 339 // IPC::Sender implementation.
340 virtual bool Send(IPC::Message* message) OVERRIDE; 340 virtual bool Send(IPC::Message* message) OVERRIDE;
341 341
342 // SoftwareFrameManagerClient implementation: 342 // SoftwareFrameManagerClient implementation:
343 virtual void SoftwareFrameWasFreed( 343 virtual void SoftwareFrameWasFreed(
344 uint32 output_surface_id, unsigned frame_id) OVERRIDE; 344 uint32 output_surface_id, unsigned frame_id) OVERRIDE;
345 virtual void ReleaseReferencesToSoftwareFrame() OVERRIDE; 345 virtual void ReleaseReferencesToSoftwareFrame() OVERRIDE;
346 346
347 virtual SkBitmap::Config PreferredReadbackFormat() OVERRIDE; 347 virtual SkColorType PreferredReadbackFormat() OVERRIDE;
348 348
349 // CompositingIOSurfaceLayerClient implementation. 349 // CompositingIOSurfaceLayerClient implementation.
350 virtual void AcceleratedLayerDidDrawFrame(bool succeeded) OVERRIDE; 350 virtual void AcceleratedLayerDidDrawFrame(bool succeeded) OVERRIDE;
351 351
352 // Forwards the mouse event to the renderer. 352 // Forwards the mouse event to the renderer.
353 void ForwardMouseEvent(const blink::WebMouseEvent& event); 353 void ForwardMouseEvent(const blink::WebMouseEvent& event);
354 354
355 void KillSelf(); 355 void KillSelf();
356 356
357 void SetTextInputActive(bool active); 357 void SetTextInputActive(bool active);
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
629 scoped_ptr<RenderWidgetHostViewFrameSubscriber> frame_subscriber_; 629 scoped_ptr<RenderWidgetHostViewFrameSubscriber> frame_subscriber_;
630 630
631 base::WeakPtrFactory<RenderWidgetHostViewMac> 631 base::WeakPtrFactory<RenderWidgetHostViewMac>
632 software_frame_weak_ptr_factory_; 632 software_frame_weak_ptr_factory_;
633 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); 633 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
634 }; 634 };
635 635
636 } // namespace content 636 } // namespace content
637 637
638 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 638 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698