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

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

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 #include "content/browser/renderer_host/render_widget_host_view_aura.h" 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback_helpers.h" 10 #include "base/callback_helpers.h"
(...skipping 923 matching lines...) Expand 10 before | Expand all | Expand 10 after
934 934
935 if (touch_editing_client_) { 935 if (touch_editing_client_) {
936 touch_editing_client_->OnSelectionOrCursorChanged(selection_anchor_rect_, 936 touch_editing_client_->OnSelectionOrCursorChanged(selection_anchor_rect_,
937 selection_focus_rect_); 937 selection_focus_rect_);
938 } 938 }
939 } 939 }
940 940
941 void RenderWidgetHostViewAura::CopyFromCompositingSurface( 941 void RenderWidgetHostViewAura::CopyFromCompositingSurface(
942 const gfx::Rect& src_subrect, 942 const gfx::Rect& src_subrect,
943 const gfx::Size& dst_size, 943 const gfx::Size& dst_size,
944 const base::Callback<void(bool, const SkBitmap&)>& callback, 944 CopyFromCompositingSurfaceCallback& callback,
945 const SkColorType color_type) { 945 const SkColorType color_type) {
946 delegated_frame_host_->CopyFromCompositingSurface( 946 delegated_frame_host_->CopyFromCompositingSurface(
947 src_subrect, dst_size, callback, color_type); 947 src_subrect, dst_size, callback, color_type);
948 } 948 }
949 949
950 void RenderWidgetHostViewAura::CopyFromCompositingSurfaceToVideoFrame( 950 void RenderWidgetHostViewAura::CopyFromCompositingSurfaceToVideoFrame(
951 const gfx::Rect& src_subrect, 951 const gfx::Rect& src_subrect,
952 const scoped_refptr<media::VideoFrame>& target, 952 const scoped_refptr<media::VideoFrame>& target,
953 const base::Callback<void(bool)>& callback) { 953 const base::Callback<void(bool)>& callback) {
954 delegated_frame_host_->CopyFromCompositingSurfaceToVideoFrame( 954 delegated_frame_host_->CopyFromCompositingSurfaceToVideoFrame(
(...skipping 1544 matching lines...) Expand 10 before | Expand all | Expand 10 after
2499 2499
2500 //////////////////////////////////////////////////////////////////////////////// 2500 ////////////////////////////////////////////////////////////////////////////////
2501 // RenderWidgetHostViewBase, public: 2501 // RenderWidgetHostViewBase, public:
2502 2502
2503 // static 2503 // static
2504 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { 2504 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) {
2505 GetScreenInfoForWindow(results, NULL); 2505 GetScreenInfoForWindow(results, NULL);
2506 } 2506 }
2507 2507
2508 } // namespace content 2508 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698