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

Side by Side Diff: content/browser/frame_host/render_widget_host_view_guest.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_GUEST_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_GUEST_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_GUEST_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_GUEST_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 virtual void SetTooltipText(const base::string16& tooltip_text) OVERRIDE; 84 virtual void SetTooltipText(const base::string16& tooltip_text) OVERRIDE;
85 virtual void SelectionChanged(const base::string16& text, 85 virtual void SelectionChanged(const base::string16& text,
86 size_t offset, 86 size_t offset,
87 const gfx::Range& range) OVERRIDE; 87 const gfx::Range& range) OVERRIDE;
88 virtual void SelectionBoundsChanged( 88 virtual void SelectionBoundsChanged(
89 const ViewHostMsg_SelectionBounds_Params& params) OVERRIDE; 89 const ViewHostMsg_SelectionBounds_Params& params) OVERRIDE;
90 virtual void CopyFromCompositingSurface( 90 virtual void CopyFromCompositingSurface(
91 const gfx::Rect& src_subrect, 91 const gfx::Rect& src_subrect,
92 const gfx::Size& dst_size, 92 const gfx::Size& dst_size,
93 const base::Callback<void(bool, const SkBitmap&)>& callback, 93 const base::Callback<void(bool, const SkBitmap&)>& callback,
94 const SkBitmap::Config config) OVERRIDE; 94 const SkColorType color_type) OVERRIDE;
95 virtual void AcceleratedSurfaceBuffersSwapped( 95 virtual void AcceleratedSurfaceBuffersSwapped(
96 const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params, 96 const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params,
97 int gpu_host_id) OVERRIDE; 97 int gpu_host_id) OVERRIDE;
98 virtual void AcceleratedSurfacePostSubBuffer( 98 virtual void AcceleratedSurfacePostSubBuffer(
99 const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params, 99 const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params,
100 int gpu_host_id) OVERRIDE; 100 int gpu_host_id) OVERRIDE;
101 virtual void OnSwapCompositorFrame( 101 virtual void OnSwapCompositorFrame(
102 uint32 output_surface_id, 102 uint32 output_surface_id,
103 scoped_ptr<cc::CompositorFrame> frame) OVERRIDE; 103 scoped_ptr<cc::CompositorFrame> frame) OVERRIDE;
104 #if defined(USE_AURA) 104 #if defined(USE_AURA)
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 virtual void SetParentNativeViewAccessible( 139 virtual void SetParentNativeViewAccessible(
140 gfx::NativeViewAccessible accessible_parent) OVERRIDE; 140 gfx::NativeViewAccessible accessible_parent) OVERRIDE;
141 virtual gfx::NativeViewId GetParentForWindowlessPlugin() const OVERRIDE; 141 virtual gfx::NativeViewId GetParentForWindowlessPlugin() const OVERRIDE;
142 #endif 142 #endif
143 143
144 // Overridden from ui::GestureEventHelper. 144 // Overridden from ui::GestureEventHelper.
145 virtual bool CanDispatchToConsumer(ui::GestureConsumer* consumer) OVERRIDE; 145 virtual bool CanDispatchToConsumer(ui::GestureConsumer* consumer) OVERRIDE;
146 virtual void DispatchGestureEvent(ui::GestureEvent* event) OVERRIDE; 146 virtual void DispatchGestureEvent(ui::GestureEvent* event) OVERRIDE;
147 virtual void DispatchCancelTouchEvent(ui::TouchEvent* event) OVERRIDE; 147 virtual void DispatchCancelTouchEvent(ui::TouchEvent* event) OVERRIDE;
148 148
149 virtual SkBitmap::Config PreferredReadbackFormat() OVERRIDE; 149 virtual SkColorType PreferredReadbackFormat() OVERRIDE;
150 150
151 protected: 151 protected:
152 friend class RenderWidgetHostView; 152 friend class RenderWidgetHostView;
153 153
154 private: 154 private:
155 // Destroys this view without calling |Destroy| on |platform_view_|. 155 // Destroys this view without calling |Destroy| on |platform_view_|.
156 void DestroyGuestView(); 156 void DestroyGuestView();
157 157
158 // Builds and forwards a WebKitGestureEvent to the renderer. 158 // Builds and forwards a WebKitGestureEvent to the renderer.
159 bool ForwardGestureEventToRenderer(ui::GestureEvent* gesture); 159 bool ForwardGestureEventToRenderer(ui::GestureEvent* gesture);
(...skipping 13 matching lines...) Expand all
173 RenderWidgetHostViewBase* platform_view_; 173 RenderWidgetHostViewBase* platform_view_;
174 #if defined(USE_AURA) 174 #if defined(USE_AURA)
175 scoped_ptr<ui::GestureRecognizer> gesture_recognizer_; 175 scoped_ptr<ui::GestureRecognizer> gesture_recognizer_;
176 #endif 176 #endif
177 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewGuest); 177 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewGuest);
178 }; 178 };
179 179
180 } // namespace content 180 } // namespace content
181 181
182 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_GUEST_H_ 182 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_GUEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698