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

Side by Side Diff: content/browser/frame_host/render_widget_host_view_child_frame.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "content/browser/renderer_host/render_widget_host_view_base.h" 9 #include "content/browser/renderer_host/render_widget_host_view_base.h"
10 #include "content/common/content_export.h" 10 #include "content/common/content_export.h"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 virtual void SelectionChanged(const base::string16& text, 82 virtual void SelectionChanged(const base::string16& text,
83 size_t offset, 83 size_t offset,
84 const gfx::Range& range) OVERRIDE; 84 const gfx::Range& range) OVERRIDE;
85 virtual void SelectionBoundsChanged( 85 virtual void SelectionBoundsChanged(
86 const ViewHostMsg_SelectionBounds_Params& params) OVERRIDE; 86 const ViewHostMsg_SelectionBounds_Params& params) OVERRIDE;
87 virtual void ScrollOffsetChanged() OVERRIDE; 87 virtual void ScrollOffsetChanged() OVERRIDE;
88 virtual void CopyFromCompositingSurface( 88 virtual void CopyFromCompositingSurface(
89 const gfx::Rect& src_subrect, 89 const gfx::Rect& src_subrect,
90 const gfx::Size& dst_size, 90 const gfx::Size& dst_size,
91 const base::Callback<void(bool, const SkBitmap&)>& callback, 91 const base::Callback<void(bool, const SkBitmap&)>& callback,
92 const SkBitmap::Config config) OVERRIDE; 92 const SkColorType color_type) OVERRIDE;
93 virtual void CopyFromCompositingSurfaceToVideoFrame( 93 virtual void CopyFromCompositingSurfaceToVideoFrame(
94 const gfx::Rect& src_subrect, 94 const gfx::Rect& src_subrect,
95 const scoped_refptr<media::VideoFrame>& target, 95 const scoped_refptr<media::VideoFrame>& target,
96 const base::Callback<void(bool)>& callback) OVERRIDE; 96 const base::Callback<void(bool)>& callback) OVERRIDE;
97 virtual bool CanCopyToVideoFrame() const OVERRIDE; 97 virtual bool CanCopyToVideoFrame() const OVERRIDE;
98 virtual void AcceleratedSurfaceInitialized(int host_id, 98 virtual void AcceleratedSurfaceInitialized(int host_id,
99 int route_id) OVERRIDE; 99 int route_id) OVERRIDE;
100 virtual void AcceleratedSurfaceBuffersSwapped( 100 virtual void AcceleratedSurfaceBuffersSwapped(
101 const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params, 101 const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params,
102 int gpu_host_id) OVERRIDE; 102 int gpu_host_id) OVERRIDE;
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 virtual void LockCompositingSurface() OVERRIDE; 145 virtual void LockCompositingSurface() OVERRIDE;
146 virtual void UnlockCompositingSurface() OVERRIDE; 146 virtual void UnlockCompositingSurface() OVERRIDE;
147 #endif // defined(OS_ANDROID) 147 #endif // defined(OS_ANDROID)
148 148
149 #if defined(OS_WIN) 149 #if defined(OS_WIN)
150 virtual void SetParentNativeViewAccessible( 150 virtual void SetParentNativeViewAccessible(
151 gfx::NativeViewAccessible accessible_parent) OVERRIDE; 151 gfx::NativeViewAccessible accessible_parent) OVERRIDE;
152 virtual gfx::NativeViewId GetParentForWindowlessPlugin() const OVERRIDE; 152 virtual gfx::NativeViewId GetParentForWindowlessPlugin() const OVERRIDE;
153 #endif 153 #endif
154 154
155 virtual SkBitmap::Config PreferredReadbackFormat() OVERRIDE; 155 virtual SkColorType PreferredReadbackFormat() OVERRIDE;
156 156
157 protected: 157 protected:
158 friend class RenderWidgetHostView; 158 friend class RenderWidgetHostView;
159 159
160 // Members will become private when RenderWidgetHostViewGuest is removed. 160 // Members will become private when RenderWidgetHostViewGuest is removed.
161 // The model object. 161 // The model object.
162 RenderWidgetHostImpl* host_; 162 RenderWidgetHostImpl* host_;
163 163
164 // frame_connector_ provides a platform abstraction. Messages 164 // frame_connector_ provides a platform abstraction. Messages
165 // sent through it are routed to the embedding renderer process. 165 // sent through it are routed to the embedding renderer process.
166 CrossProcessFrameConnector* frame_connector_; 166 CrossProcessFrameConnector* frame_connector_;
167 167
168 private: 168 private:
169 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame); 169 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame);
170 }; 170 };
171 171
172 } // namespace content 172 } // namespace content
173 173
174 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ 174 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698