Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 503 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 514 render_widget_host_->SetView(this); | 514 render_widget_host_->SetView(this); |
| 515 | 515 |
| 516 // Let the page-level input event router know about our surface ID | 516 // Let the page-level input event router know about our surface ID |
| 517 // namespace for surface-based hit testing. | 517 // namespace for surface-based hit testing. |
| 518 if (render_widget_host_->delegate() && | 518 if (render_widget_host_->delegate() && |
| 519 render_widget_host_->delegate()->GetInputEventRouter()) { | 519 render_widget_host_->delegate()->GetInputEventRouter()) { |
| 520 render_widget_host_->delegate() | 520 render_widget_host_->delegate() |
| 521 ->GetInputEventRouter() | 521 ->GetInputEventRouter() |
| 522 ->AddSurfaceClientIdOwner(GetSurfaceClientId(), this); | 522 ->AddSurfaceClientIdOwner(GetSurfaceClientId(), this); |
| 523 } | 523 } |
| 524 | |
| 525 RenderViewHost* rvh = RenderViewHost::From(render_widget_host_); | |
| 526 if (rvh) { | |
| 527 WebPreferences prefs = rvh->GetWebkitPreferences(); | |
| 528 // TODO(mostynb): actually use prefs. Landing this as a separate CL | |
| 529 // first to rebaseline some unreliable layout tests. | |
| 530 (void)prefs; | |
|
Avi (use Gerrit)
2016/07/20 18:25:36
ignore_result() from base/macros.h?
Mostyn Bramley-Moore
2016/07/20 18:48:38
Done.
| |
| 531 } | |
| 524 } | 532 } |
| 525 | 533 |
| 526 RenderWidgetHostViewMac::~RenderWidgetHostViewMac() { | 534 RenderWidgetHostViewMac::~RenderWidgetHostViewMac() { |
| 527 display::Screen::GetScreen()->RemoveObserver(this); | 535 display::Screen::GetScreen()->RemoveObserver(this); |
| 528 | 536 |
| 529 // This is being called from |cocoa_view_|'s destructor, so invalidate the | 537 // This is being called from |cocoa_view_|'s destructor, so invalidate the |
| 530 // pointer. | 538 // pointer. |
| 531 cocoa_view_ = nil; | 539 cocoa_view_ = nil; |
| 532 | 540 |
| 533 UnlockMouse(); | 541 UnlockMouse(); |
| (...skipping 2693 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3227 | 3235 |
| 3228 // "-webkit-app-region: drag | no-drag" is implemented on Mac by excluding | 3236 // "-webkit-app-region: drag | no-drag" is implemented on Mac by excluding |
| 3229 // regions that are not draggable. (See ControlRegionView in | 3237 // regions that are not draggable. (See ControlRegionView in |
| 3230 // native_app_window_cocoa.mm). This requires the render host view to be | 3238 // native_app_window_cocoa.mm). This requires the render host view to be |
| 3231 // draggable by default. | 3239 // draggable by default. |
| 3232 - (BOOL)mouseDownCanMoveWindow { | 3240 - (BOOL)mouseDownCanMoveWindow { |
| 3233 return YES; | 3241 return YES; |
| 3234 } | 3242 } |
| 3235 | 3243 |
| 3236 @end | 3244 @end |
| OLD | NEW |