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

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

Issue 1113573002: Maintain minimal error response. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed build issue. Created 5 years, 7 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 <set> 7 #include <set>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 1046 matching lines...) Expand 10 before | Expand all | Expand 10 after
1057 if (touch_editing_client_) { 1057 if (touch_editing_client_) {
1058 touch_editing_client_->OnSelectionOrCursorChanged( 1058 touch_editing_client_->OnSelectionOrCursorChanged(
1059 anchor_bound, focus_bound); 1059 anchor_bound, focus_bound);
1060 } 1060 }
1061 } 1061 }
1062 1062
1063 void RenderWidgetHostViewAura::CopyFromCompositingSurface( 1063 void RenderWidgetHostViewAura::CopyFromCompositingSurface(
1064 const gfx::Rect& src_subrect, 1064 const gfx::Rect& src_subrect,
1065 const gfx::Size& dst_size, 1065 const gfx::Size& dst_size,
1066 ReadbackRequestCallback& callback, 1066 ReadbackRequestCallback& callback,
1067 const SkColorType color_type) { 1067 const SkColorType preferred_color_type) {
1068 delegated_frame_host_->CopyFromCompositingSurface( 1068 delegated_frame_host_->CopyFromCompositingSurface(
1069 src_subrect, dst_size, callback, color_type); 1069 src_subrect, dst_size, callback, preferred_color_type);
1070 } 1070 }
1071 1071
1072 void RenderWidgetHostViewAura::CopyFromCompositingSurfaceToVideoFrame( 1072 void RenderWidgetHostViewAura::CopyFromCompositingSurfaceToVideoFrame(
1073 const gfx::Rect& src_subrect, 1073 const gfx::Rect& src_subrect,
1074 const scoped_refptr<media::VideoFrame>& target, 1074 const scoped_refptr<media::VideoFrame>& target,
1075 const base::Callback<void(bool)>& callback) { 1075 const base::Callback<void(bool)>& callback) {
1076 delegated_frame_host_->CopyFromCompositingSurfaceToVideoFrame( 1076 delegated_frame_host_->CopyFromCompositingSurfaceToVideoFrame(
1077 src_subrect, target, callback); 1077 src_subrect, target, callback);
1078 } 1078 }
1079 1079
(...skipping 1598 matching lines...) Expand 10 before | Expand all | Expand 10 after
2678 NativeWebKeyboardEvent copy_event(event); 2678 NativeWebKeyboardEvent copy_event(event);
2679 copy_event.match_edit_command = true; 2679 copy_event.match_edit_command = true;
2680 host_->ForwardKeyboardEvent(copy_event); 2680 host_->ForwardKeyboardEvent(copy_event);
2681 return; 2681 return;
2682 } 2682 }
2683 #endif 2683 #endif
2684 2684
2685 host_->ForwardKeyboardEvent(event); 2685 host_->ForwardKeyboardEvent(event);
2686 } 2686 }
2687 2687
2688 SkColorType RenderWidgetHostViewAura::PreferredReadbackFormat() {
2689 return kN32_SkColorType;
2690 }
2691
2692 //////////////////////////////////////////////////////////////////////////////// 2688 ////////////////////////////////////////////////////////////////////////////////
2693 // DelegatedFrameHost, public: 2689 // DelegatedFrameHost, public:
2694 2690
2695 ui::Layer* RenderWidgetHostViewAura::DelegatedFrameHostGetLayer() const { 2691 ui::Layer* RenderWidgetHostViewAura::DelegatedFrameHostGetLayer() const {
2696 return window_->layer(); 2692 return window_->layer();
2697 } 2693 }
2698 2694
2699 bool RenderWidgetHostViewAura::DelegatedFrameHostIsVisible() const { 2695 bool RenderWidgetHostViewAura::DelegatedFrameHostIsVisible() const {
2700 return !host_->is_hidden(); 2696 return !host_->is_hidden();
2701 } 2697 }
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
2764 2760
2765 //////////////////////////////////////////////////////////////////////////////// 2761 ////////////////////////////////////////////////////////////////////////////////
2766 // RenderWidgetHostViewBase, public: 2762 // RenderWidgetHostViewBase, public:
2767 2763
2768 // static 2764 // static
2769 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { 2765 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) {
2770 GetScreenInfoForWindow(results, NULL); 2766 GetScreenInfoForWindow(results, NULL);
2771 } 2767 }
2772 2768
2773 } // namespace content 2769 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698