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 <QuartzCore/QuartzCore.h> | 8 #include <QuartzCore/QuartzCore.h> |
9 | 9 |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
(...skipping 2037 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2048 if (!EnsureCompositedIOSurface()) | 2048 if (!EnsureCompositedIOSurface()) |
2049 GotAcceleratedCompositingError(); | 2049 GotAcceleratedCompositingError(); |
2050 } | 2050 } |
2051 } | 2051 } |
2052 | 2052 |
2053 void RenderWidgetHostViewMac::ShowDefinitionForSelection() { | 2053 void RenderWidgetHostViewMac::ShowDefinitionForSelection() { |
2054 RenderWidgetHostViewMacDictionaryHelper helper(this); | 2054 RenderWidgetHostViewMacDictionaryHelper helper(this); |
2055 helper.ShowDefinitionForSelection(); | 2055 helper.ShowDefinitionForSelection(); |
2056 } | 2056 } |
2057 | 2057 |
2058 void RenderWidgetHostViewMac::SetBackground(const SkBitmap& background) { | 2058 void RenderWidgetHostViewMac::SetBackgroundOpaque(bool opaque) { |
2059 RenderWidgetHostViewBase::SetBackground(background); | 2059 RenderWidgetHostViewBase::SetBackgroundOpaque(opaque); |
2060 if (render_widget_host_) | 2060 if (render_widget_host_) |
2061 render_widget_host_->Send(new ViewMsg_SetBackground( | 2061 render_widget_host_->SetBackgroundOpaque(opaque); |
2062 render_widget_host_->GetRoutingID(), background)); | |
2063 } | 2062 } |
2064 | 2063 |
2065 void RenderWidgetHostViewMac::CreateBrowserAccessibilityManagerIfNeeded() { | 2064 void RenderWidgetHostViewMac::CreateBrowserAccessibilityManagerIfNeeded() { |
2066 if (!GetBrowserAccessibilityManager()) { | 2065 if (!GetBrowserAccessibilityManager()) { |
2067 SetBrowserAccessibilityManager( | 2066 SetBrowserAccessibilityManager( |
2068 new BrowserAccessibilityManagerMac( | 2067 new BrowserAccessibilityManagerMac( |
2069 cocoa_view_, | 2068 cocoa_view_, |
2070 BrowserAccessibilityManagerMac::GetEmptyDocument(), | 2069 BrowserAccessibilityManagerMac::GetEmptyDocument(), |
2071 render_widget_host_)); | 2070 render_widget_host_)); |
2072 } | 2071 } |
(...skipping 2234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4307 } | 4306 } |
4308 | 4307 |
4309 - (void)disableRendering { | 4308 - (void)disableRendering { |
4310 // Disable the fade-out animation as the layer is removed. | 4309 // Disable the fade-out animation as the layer is removed. |
4311 ScopedCAActionDisabler disabler; | 4310 ScopedCAActionDisabler disabler; |
4312 [self removeFromSuperlayer]; | 4311 [self removeFromSuperlayer]; |
4313 renderWidgetHostView_ = nil; | 4312 renderWidgetHostView_ = nil; |
4314 } | 4313 } |
4315 | 4314 |
4316 @end // implementation SoftwareLayer | 4315 @end // implementation SoftwareLayer |
OLD | NEW |