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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_aura.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_AURA_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 size_t offset, 176 size_t offset,
177 const gfx::Range& range) OVERRIDE; 177 const gfx::Range& range) OVERRIDE;
178 virtual gfx::Size GetRequestedRendererSize() const OVERRIDE; 178 virtual gfx::Size GetRequestedRendererSize() const OVERRIDE;
179 virtual void SelectionBoundsChanged( 179 virtual void SelectionBoundsChanged(
180 const ViewHostMsg_SelectionBounds_Params& params) OVERRIDE; 180 const ViewHostMsg_SelectionBounds_Params& params) OVERRIDE;
181 virtual void ScrollOffsetChanged() OVERRIDE; 181 virtual void ScrollOffsetChanged() OVERRIDE;
182 virtual void CopyFromCompositingSurface( 182 virtual void CopyFromCompositingSurface(
183 const gfx::Rect& src_subrect, 183 const gfx::Rect& src_subrect,
184 const gfx::Size& dst_size, 184 const gfx::Size& dst_size,
185 const base::Callback<void(bool, const SkBitmap&)>& callback, 185 const base::Callback<void(bool, const SkBitmap&)>& callback,
186 const SkBitmap::Config config) OVERRIDE; 186 const SkColorType color_type) OVERRIDE;
187 virtual void CopyFromCompositingSurfaceToVideoFrame( 187 virtual void CopyFromCompositingSurfaceToVideoFrame(
188 const gfx::Rect& src_subrect, 188 const gfx::Rect& src_subrect,
189 const scoped_refptr<media::VideoFrame>& target, 189 const scoped_refptr<media::VideoFrame>& target,
190 const base::Callback<void(bool)>& callback) OVERRIDE; 190 const base::Callback<void(bool)>& callback) OVERRIDE;
191 virtual bool CanCopyToVideoFrame() const OVERRIDE; 191 virtual bool CanCopyToVideoFrame() const OVERRIDE;
192 virtual bool CanSubscribeFrame() const OVERRIDE; 192 virtual bool CanSubscribeFrame() const OVERRIDE;
193 virtual void BeginFrameSubscription( 193 virtual void BeginFrameSubscription(
194 scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber) OVERRIDE; 194 scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber) OVERRIDE;
195 virtual void EndFrameSubscription() OVERRIDE; 195 virtual void EndFrameSubscription() OVERRIDE;
196 virtual void AcceleratedSurfaceInitialized(int host_id, 196 virtual void AcceleratedSurfaceInitialized(int host_id,
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 338
339 OverscrollController* overscroll_controller() const { 339 OverscrollController* overscroll_controller() const {
340 return overscroll_controller_.get(); 340 return overscroll_controller_.get();
341 } 341 }
342 342
343 protected: 343 protected:
344 virtual ~RenderWidgetHostViewAura(); 344 virtual ~RenderWidgetHostViewAura();
345 345
346 // Exposed for tests. 346 // Exposed for tests.
347 aura::Window* window() { return window_; } 347 aura::Window* window() { return window_; }
348 virtual SkBitmap::Config PreferredReadbackFormat() OVERRIDE; 348 virtual SkColorType PreferredReadbackFormat() OVERRIDE;
349 virtual DelegatedFrameHost* GetDelegatedFrameHost() const OVERRIDE; 349 virtual DelegatedFrameHost* GetDelegatedFrameHost() const OVERRIDE;
350 350
351 private: 351 private:
352 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SetCompositionText); 352 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SetCompositionText);
353 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventState); 353 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventState);
354 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, 354 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest,
355 TouchEventPositionsArentRounded); 355 TouchEventPositionsArentRounded);
356 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventSyncAsync); 356 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, TouchEventSyncAsync);
357 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SwapNotifiesWindow); 357 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SwapNotifiesWindow);
358 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, 358 FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest,
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
593 scoped_ptr<aura::client::ScopedTooltipDisabler> tooltip_disabler_; 593 scoped_ptr<aura::client::ScopedTooltipDisabler> tooltip_disabler_;
594 594
595 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; 595 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_;
596 596
597 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); 597 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
598 }; 598 };
599 599
600 } // namespace content 600 } // namespace content
601 601
602 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 602 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698