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

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

Issue 2005013002: mac: ensure ui::Compositor exists for visible RWHVs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Also clean up swap buffers Created 4 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include <stdint.h> 10 #include <stdint.h>
(...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
587 render_widget_host_->SetView(this); 587 render_widget_host_->SetView(this);
588 588
589 // Let the page-level input event router know about our surface ID 589 // Let the page-level input event router know about our surface ID
590 // namespace for surface-based hit testing. 590 // namespace for surface-based hit testing.
591 if (render_widget_host_->delegate() && 591 if (render_widget_host_->delegate() &&
592 render_widget_host_->delegate()->GetInputEventRouter()) { 592 render_widget_host_->delegate()->GetInputEventRouter()) {
593 render_widget_host_->delegate() 593 render_widget_host_->delegate()
594 ->GetInputEventRouter() 594 ->GetInputEventRouter()
595 ->AddSurfaceIdNamespaceOwner(GetSurfaceIdNamespace(), this); 595 ->AddSurfaceIdNamespaceOwner(GetSurfaceIdNamespace(), this);
596 } 596 }
597
598 if (!render_widget_host_->is_hidden())
599 EnsureBrowserCompositorView();
597 } 600 }
598 601
599 RenderWidgetHostViewMac::~RenderWidgetHostViewMac() { 602 RenderWidgetHostViewMac::~RenderWidgetHostViewMac() {
600 display::Screen::GetScreen()->RemoveObserver(this); 603 display::Screen::GetScreen()->RemoveObserver(this);
601 604
602 // This is being called from |cocoa_view_|'s destructor, so invalidate the 605 // This is being called from |cocoa_view_|'s destructor, so invalidate the
603 // pointer. 606 // pointer.
604 cocoa_view_ = nil; 607 cocoa_view_ = nil;
605 608
606 UnlockMouse(); 609 UnlockMouse();
(...skipping 863 matching lines...) Expand 10 before | Expand all | Expand 10 after
1470 if (frame->delegated_frame_data) { 1473 if (frame->delegated_frame_data) {
1471 float scale_factor = frame->metadata.device_scale_factor; 1474 float scale_factor = frame->metadata.device_scale_factor;
1472 1475
1473 // Compute the frame size based on the root render pass rect size. 1476 // Compute the frame size based on the root render pass rect size.
1474 cc::RenderPass* root_pass = 1477 cc::RenderPass* root_pass =
1475 frame->delegated_frame_data->render_pass_list.back().get(); 1478 frame->delegated_frame_data->render_pass_list.back().get();
1476 gfx::Size pixel_size = root_pass->output_rect.size(); 1479 gfx::Size pixel_size = root_pass->output_rect.size();
1477 gfx::Size dip_size = gfx::ConvertSizeToDIP(scale_factor, pixel_size); 1480 gfx::Size dip_size = gfx::ConvertSizeToDIP(scale_factor, pixel_size);
1478 1481
1479 root_layer_->SetBounds(gfx::Rect(dip_size)); 1482 root_layer_->SetBounds(gfx::Rect(dip_size));
1480 if (!render_widget_host_->is_hidden()) { 1483 if (!browser_compositor->compositor()) {
danakj 2016/05/24 00:34:40 Is this inverted? if (!a) a->Foo() is a crash
ccameron 2016/05/24 00:37:39 Just needs "if (browser_compositor)"
1481 EnsureBrowserCompositorView();
1482 browser_compositor_->compositor()->SetScaleAndSize( 1484 browser_compositor_->compositor()->SetScaleAndSize(
1483 scale_factor, pixel_size); 1485 scale_factor, pixel_size);
1484 } 1486 }
1485 1487
1486 SendVSyncParametersToRenderer(); 1488 SendVSyncParametersToRenderer();
1487 1489
1488 delegated_frame_host_->SwapDelegatedFrame(output_surface_id, 1490 delegated_frame_host_->SwapDelegatedFrame(output_surface_id,
1489 std::move(frame)); 1491 std::move(frame));
1490 } else { 1492 } else {
1491 DLOG(ERROR) << "Received unexpected frame type."; 1493 DLOG(ERROR) << "Received unexpected frame type.";
(...skipping 1939 matching lines...) Expand 10 before | Expand all | Expand 10 after
3431 3433
3432 // "-webkit-app-region: drag | no-drag" is implemented on Mac by excluding 3434 // "-webkit-app-region: drag | no-drag" is implemented on Mac by excluding
3433 // regions that are not draggable. (See ControlRegionView in 3435 // regions that are not draggable. (See ControlRegionView in
3434 // native_app_window_cocoa.mm). This requires the render host view to be 3436 // native_app_window_cocoa.mm). This requires the render host view to be
3435 // draggable by default. 3437 // draggable by default.
3436 - (BOOL)mouseDownCanMoveWindow { 3438 - (BOOL)mouseDownCanMoveWindow {
3437 return YES; 3439 return YES;
3438 } 3440 }
3439 3441
3440 @end 3442 @end
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698