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

Side by Side Diff: content/test/test_render_view_host.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_TEST_TEST_RENDER_VIEW_HOST_H_ 5 #ifndef CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_
6 #define CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ 6 #define CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 int error_code) OVERRIDE; 111 int error_code) OVERRIDE;
112 virtual void Destroy() OVERRIDE; 112 virtual void Destroy() OVERRIDE;
113 virtual void SetTooltipText(const base::string16& tooltip_text) OVERRIDE {} 113 virtual void SetTooltipText(const base::string16& tooltip_text) OVERRIDE {}
114 virtual void SelectionBoundsChanged( 114 virtual void SelectionBoundsChanged(
115 const ViewHostMsg_SelectionBounds_Params& params) OVERRIDE {} 115 const ViewHostMsg_SelectionBounds_Params& params) OVERRIDE {}
116 virtual void ScrollOffsetChanged() OVERRIDE {} 116 virtual void ScrollOffsetChanged() OVERRIDE {}
117 virtual void CopyFromCompositingSurface( 117 virtual void CopyFromCompositingSurface(
118 const gfx::Rect& src_subrect, 118 const gfx::Rect& src_subrect,
119 const gfx::Size& dst_size, 119 const gfx::Size& dst_size,
120 const base::Callback<void(bool, const SkBitmap&)>& callback, 120 const base::Callback<void(bool, const SkBitmap&)>& callback,
121 const SkBitmap::Config config) OVERRIDE; 121 const SkColorType color_type) OVERRIDE;
122 virtual void CopyFromCompositingSurfaceToVideoFrame( 122 virtual void CopyFromCompositingSurfaceToVideoFrame(
123 const gfx::Rect& src_subrect, 123 const gfx::Rect& src_subrect,
124 const scoped_refptr<media::VideoFrame>& target, 124 const scoped_refptr<media::VideoFrame>& target,
125 const base::Callback<void(bool)>& callback) OVERRIDE; 125 const base::Callback<void(bool)>& callback) OVERRIDE;
126 virtual bool CanCopyToVideoFrame() const OVERRIDE; 126 virtual bool CanCopyToVideoFrame() const OVERRIDE;
127 virtual void AcceleratedSurfaceInitialized(int host_id, 127 virtual void AcceleratedSurfaceInitialized(int host_id,
128 int route_id) OVERRIDE; 128 int route_id) OVERRIDE;
129 virtual void AcceleratedSurfaceBuffersSwapped( 129 virtual void AcceleratedSurfaceBuffersSwapped(
130 const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params, 130 const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params,
131 int gpu_host_id) OVERRIDE; 131 int gpu_host_id) OVERRIDE;
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 private: 373 private:
374 typedef scoped_ptr<ui::test::ScopedSetSupportedScaleFactors> 374 typedef scoped_ptr<ui::test::ScopedSetSupportedScaleFactors>
375 ScopedSetSupportedScaleFactors; 375 ScopedSetSupportedScaleFactors;
376 ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_; 376 ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_;
377 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness); 377 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness);
378 }; 378 };
379 379
380 } // namespace content 380 } // namespace content
381 381
382 #endif // CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ 382 #endif // CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698