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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_mac.mm

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_mac.h" 5 #include "content/browser/renderer_host/render_widget_host_view_mac.h"
6 6
7 #import <objc/runtime.h> 7 #import <objc/runtime.h>
8 #include <OpenGL/gl.h> 8 #include <OpenGL/gl.h>
9 #include <QuartzCore/QuartzCore.h> 9 #include <QuartzCore/QuartzCore.h>
10 10
(...skipping 1546 matching lines...) Expand 10 before | Expand all | Expand 10 after
1557 frame->metadata.device_scale_factor, 1557 frame->metadata.device_scale_factor,
1558 frame->metadata.latency_info, 1558 frame->metadata.latency_info,
1559 &frame->metadata.satisfies_sequences); 1559 &frame->metadata.satisfies_sequences);
1560 } else { 1560 } else {
1561 DLOG(ERROR) << "Received unexpected frame type."; 1561 DLOG(ERROR) << "Received unexpected frame type.";
1562 bad_message::ReceivedBadMessage(render_widget_host_->GetProcess(), 1562 bad_message::ReceivedBadMessage(render_widget_host_->GetProcess(),
1563 bad_message::RWHVM_UNEXPECTED_FRAME_TYPE); 1563 bad_message::RWHVM_UNEXPECTED_FRAME_TYPE);
1564 } 1564 }
1565 } 1565 }
1566 1566
1567 void RenderWidgetHostViewMac::ClearCompositorFrame() {
1568 if (delegated_frame_host_)
1569 delegated_frame_host_->ClearDelegatedFrame();
1570 }
1571
1567 void RenderWidgetHostViewMac::GetScreenInfo(blink::WebScreenInfo* results) { 1572 void RenderWidgetHostViewMac::GetScreenInfo(blink::WebScreenInfo* results) {
1568 *results = GetWebScreenInfo(GetNativeView()); 1573 *results = GetWebScreenInfo(GetNativeView());
1569 } 1574 }
1570 1575
1571 bool RenderWidgetHostViewMac::GetScreenColorProfile( 1576 bool RenderWidgetHostViewMac::GetScreenColorProfile(
1572 std::vector<char>* color_profile) { 1577 std::vector<char>* color_profile) {
1573 DCHECK(color_profile->empty()); 1578 DCHECK(color_profile->empty());
1574 NSWindow* window = GetWebContents()->GetTopLevelNativeWindow(); 1579 NSWindow* window = GetWebContents()->GetTopLevelNativeWindow();
1575 return gfx::GetDisplayColorProfile(window, color_profile); 1580 return gfx::GetDisplayColorProfile(window, color_profile);
1576 } 1581 }
(...skipping 1828 matching lines...) Expand 10 before | Expand all | Expand 10 after
3405 3410
3406 // "-webkit-app-region: drag | no-drag" is implemented on Mac by excluding 3411 // "-webkit-app-region: drag | no-drag" is implemented on Mac by excluding
3407 // regions that are not draggable. (See ControlRegionView in 3412 // regions that are not draggable. (See ControlRegionView in
3408 // native_app_window_cocoa.mm). This requires the render host view to be 3413 // native_app_window_cocoa.mm). This requires the render host view to be
3409 // draggable by default. 3414 // draggable by default.
3410 - (BOOL)mouseDownCanMoveWindow { 3415 - (BOOL)mouseDownCanMoveWindow {
3411 return YES; 3416 return YES;
3412 } 3417 }
3413 3418
3414 @end 3419 @end
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_mac.h ('k') | content/common/content_constants_internal.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698