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

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

Issue 1339803002: Clear page display after navigation if no rendered output arrives (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Made ClearCompositorFrame pure virtual Created 5 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 <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 1170 matching lines...) Expand 10 before | Expand all | Expand 10 after
1181 delegated_frame_host_->SwapDelegatedFrame( 1181 delegated_frame_host_->SwapDelegatedFrame(
1182 output_surface_id, frame->delegated_frame_data.Pass(), 1182 output_surface_id, frame->delegated_frame_data.Pass(),
1183 frame->metadata.device_scale_factor, frame->metadata.latency_info, 1183 frame->metadata.device_scale_factor, frame->metadata.latency_info,
1184 &frame->metadata.satisfies_sequences); 1184 &frame->metadata.satisfies_sequences);
1185 SelectionUpdated(frame->metadata.selection.is_editable, 1185 SelectionUpdated(frame->metadata.selection.is_editable,
1186 frame->metadata.selection.is_empty_text_form_control, 1186 frame->metadata.selection.is_empty_text_form_control,
1187 ConvertSelectionBound(frame->metadata.selection.start), 1187 ConvertSelectionBound(frame->metadata.selection.start),
1188 ConvertSelectionBound(frame->metadata.selection.end)); 1188 ConvertSelectionBound(frame->metadata.selection.end));
1189 } 1189 }
1190 1190
1191 void RenderWidgetHostViewAura::ClearCompositorFrame() {
1192 delegated_frame_host_->ClearDelegatedFrame();
1193 }
1194
1191 void RenderWidgetHostViewAura::DidStopFlinging() { 1195 void RenderWidgetHostViewAura::DidStopFlinging() {
1192 selection_controller_client_->OnScrollCompleted(); 1196 selection_controller_client_->OnScrollCompleted();
1193 } 1197 }
1194 1198
1195 #if defined(OS_WIN) 1199 #if defined(OS_WIN)
1196 void RenderWidgetHostViewAura::SetParentNativeViewAccessible( 1200 void RenderWidgetHostViewAura::SetParentNativeViewAccessible(
1197 gfx::NativeViewAccessible accessible_parent) { 1201 gfx::NativeViewAccessible accessible_parent) {
1198 } 1202 }
1199 1203
1200 gfx::NativeViewId RenderWidgetHostViewAura::GetParentForWindowlessPlugin() 1204 gfx::NativeViewId RenderWidgetHostViewAura::GetParentForWindowlessPlugin()
(...skipping 1681 matching lines...) Expand 10 before | Expand all | Expand 10 after
2882 2886
2883 //////////////////////////////////////////////////////////////////////////////// 2887 ////////////////////////////////////////////////////////////////////////////////
2884 // RenderWidgetHostViewBase, public: 2888 // RenderWidgetHostViewBase, public:
2885 2889
2886 // static 2890 // static
2887 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { 2891 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) {
2888 GetScreenInfoForWindow(results, NULL); 2892 GetScreenInfoForWindow(results, NULL);
2889 } 2893 }
2890 2894
2891 } // namespace content 2895 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698