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

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

Issue 571413002: Declare a new name for CompositingSurface completion callback. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed build issue. Created 6 years, 3 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
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 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 virtual void SetTooltipText(const base::string16& tooltip_text) OVERRIDE; 179 virtual void SetTooltipText(const base::string16& tooltip_text) OVERRIDE;
180 virtual void SelectionChanged(const base::string16& text, 180 virtual void SelectionChanged(const base::string16& text,
181 size_t offset, 181 size_t offset,
182 const gfx::Range& range) OVERRIDE; 182 const gfx::Range& range) OVERRIDE;
183 virtual gfx::Size GetRequestedRendererSize() const OVERRIDE; 183 virtual gfx::Size GetRequestedRendererSize() const OVERRIDE;
184 virtual void SelectionBoundsChanged( 184 virtual void SelectionBoundsChanged(
185 const ViewHostMsg_SelectionBounds_Params& params) OVERRIDE; 185 const ViewHostMsg_SelectionBounds_Params& params) OVERRIDE;
186 virtual void CopyFromCompositingSurface( 186 virtual void CopyFromCompositingSurface(
187 const gfx::Rect& src_subrect, 187 const gfx::Rect& src_subrect,
188 const gfx::Size& dst_size, 188 const gfx::Size& dst_size,
189 const base::Callback<void(bool, const SkBitmap&)>& callback, 189 CopyFromCompositingSurfaceCallback& callback,
190 const SkColorType color_type) OVERRIDE; 190 const SkColorType color_type) OVERRIDE;
191 virtual void CopyFromCompositingSurfaceToVideoFrame( 191 virtual void CopyFromCompositingSurfaceToVideoFrame(
192 const gfx::Rect& src_subrect, 192 const gfx::Rect& src_subrect,
193 const scoped_refptr<media::VideoFrame>& target, 193 const scoped_refptr<media::VideoFrame>& target,
194 const base::Callback<void(bool)>& callback) OVERRIDE; 194 const base::Callback<void(bool)>& callback) OVERRIDE;
195 virtual bool CanCopyToVideoFrame() const OVERRIDE; 195 virtual bool CanCopyToVideoFrame() const OVERRIDE;
196 virtual bool CanSubscribeFrame() const OVERRIDE; 196 virtual bool CanSubscribeFrame() const OVERRIDE;
197 virtual void BeginFrameSubscription( 197 virtual void BeginFrameSubscription(
198 scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber) OVERRIDE; 198 scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber) OVERRIDE;
199 virtual void EndFrameSubscription() OVERRIDE; 199 virtual void EndFrameSubscription() OVERRIDE;
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
611 scoped_ptr<aura::client::ScopedTooltipDisabler> tooltip_disabler_; 611 scoped_ptr<aura::client::ScopedTooltipDisabler> tooltip_disabler_;
612 612
613 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; 613 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_;
614 614
615 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); 615 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
616 }; 616 };
617 617
618 } // namespace content 618 } // namespace content
619 619
620 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 620 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698