| 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 1943 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1954 Source<RenderWidgetHost>(render_widget_host_), | 1954 Source<RenderWidgetHost>(render_widget_host_), |
| 1955 NotificationService::NoDetails()); | 1955 NotificationService::NoDetails()); |
| 1956 } else { | 1956 } else { |
| 1957 DLOG(ERROR) << "Received unexpected frame type."; | 1957 DLOG(ERROR) << "Received unexpected frame type."; |
| 1958 RecordAction( | 1958 RecordAction( |
| 1959 base::UserMetricsAction("BadMessageTerminate_UnexpectedFrameType")); | 1959 base::UserMetricsAction("BadMessageTerminate_UnexpectedFrameType")); |
| 1960 render_widget_host_->GetProcess()->ReceivedBadMessage(); | 1960 render_widget_host_->GetProcess()->ReceivedBadMessage(); |
| 1961 } | 1961 } |
| 1962 } | 1962 } |
| 1963 | 1963 |
| 1964 void RenderWidgetHostViewMac::OnAcceleratedCompositingStateChange() { | |
| 1965 } | |
| 1966 | |
| 1967 void RenderWidgetHostViewMac::AcceleratedSurfaceInitialized(int host_id, | 1964 void RenderWidgetHostViewMac::AcceleratedSurfaceInitialized(int host_id, |
| 1968 int route_id) { | 1965 int route_id) { |
| 1969 } | 1966 } |
| 1970 | 1967 |
| 1971 void RenderWidgetHostViewMac::GetScreenInfo(blink::WebScreenInfo* results) { | 1968 void RenderWidgetHostViewMac::GetScreenInfo(blink::WebScreenInfo* results) { |
| 1972 *results = GetWebScreenInfo(GetNativeView()); | 1969 *results = GetWebScreenInfo(GetNativeView()); |
| 1973 } | 1970 } |
| 1974 | 1971 |
| 1975 gfx::Rect RenderWidgetHostViewMac::GetBoundsInRootWindow() { | 1972 gfx::Rect RenderWidgetHostViewMac::GetBoundsInRootWindow() { |
| 1976 // TODO(shess): In case of !window, the view has been removed from | 1973 // TODO(shess): In case of !window, the view has been removed from |
| (...skipping 2457 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4434 } | 4431 } |
| 4435 | 4432 |
| 4436 - (void)disableRendering { | 4433 - (void)disableRendering { |
| 4437 // Disable the fade-out animation as the layer is removed. | 4434 // Disable the fade-out animation as the layer is removed. |
| 4438 ScopedCAActionDisabler disabler; | 4435 ScopedCAActionDisabler disabler; |
| 4439 [self removeFromSuperlayer]; | 4436 [self removeFromSuperlayer]; |
| 4440 renderWidgetHostView_ = nil; | 4437 renderWidgetHostView_ = nil; |
| 4441 } | 4438 } |
| 4442 | 4439 |
| 4443 @end // implementation SoftwareLayer | 4440 @end // implementation SoftwareLayer |
| OLD | NEW |