| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "chrome/browser/renderer_host/render_widget_host.h" | 5 #include "chrome/browser/renderer_host/render_widget_host.h" |
| 6 | 6 |
| 7 #include "app/keyboard_codes.h" | 7 #include "app/keyboard_codes.h" |
| 8 #include "base/auto_reset.h" | 8 #include "base/auto_reset.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
| (...skipping 963 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 974 } | 974 } |
| 975 | 975 |
| 976 void RenderWidgetHost::OnMsgGpuRenderingActivated(bool activated) { | 976 void RenderWidgetHost::OnMsgGpuRenderingActivated(bool activated) { |
| 977 #if defined(OS_MACOSX) | 977 #if defined(OS_MACOSX) |
| 978 bool old_state = is_gpu_rendering_active_; | 978 bool old_state = is_gpu_rendering_active_; |
| 979 #endif | 979 #endif |
| 980 is_gpu_rendering_active_ = activated; | 980 is_gpu_rendering_active_ = activated; |
| 981 #if defined(OS_MACOSX) | 981 #if defined(OS_MACOSX) |
| 982 if (old_state != is_gpu_rendering_active_ && view_) | 982 if (old_state != is_gpu_rendering_active_ && view_) |
| 983 view_->GpuRenderingStateDidChange(); | 983 view_->GpuRenderingStateDidChange(); |
| 984 #elif defined(TOOLKIT_USES_GTK) |
| 985 view_->AcceleratedCompositingActivated(activated); |
| 984 #endif | 986 #endif |
| 985 } | 987 } |
| 986 | 988 |
| 987 #if defined(OS_MACOSX) | 989 #if defined(OS_MACOSX) |
| 988 | 990 |
| 989 void RenderWidgetHost::OnMsgGetScreenInfo(gfx::NativeViewId view, | 991 void RenderWidgetHost::OnMsgGetScreenInfo(gfx::NativeViewId view, |
| 990 WebScreenInfo* results) { | 992 WebScreenInfo* results) { |
| 991 gfx::NativeView native_view = view_ ? view_->GetNativeView() : NULL; | 993 gfx::NativeView native_view = view_ ? view_->GetNativeView() : NULL; |
| 992 *results = WebScreenInfoFactory::screenInfo(native_view); | 994 *results = WebScreenInfoFactory::screenInfo(native_view); |
| 993 } | 995 } |
| (...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1197 // of this key event. | 1199 // of this key event. |
| 1198 if (!processed && !is_hidden_ && !front_item.skip_in_browser) { | 1200 if (!processed && !is_hidden_ && !front_item.skip_in_browser) { |
| 1199 UnhandledKeyboardEvent(front_item); | 1201 UnhandledKeyboardEvent(front_item); |
| 1200 | 1202 |
| 1201 // WARNING: This RenderWidgetHost can be deallocated at this point | 1203 // WARNING: This RenderWidgetHost can be deallocated at this point |
| 1202 // (i.e. in the case of Ctrl+W, where the call to | 1204 // (i.e. in the case of Ctrl+W, where the call to |
| 1203 // UnhandledKeyboardEvent destroys this RenderWidgetHost). | 1205 // UnhandledKeyboardEvent destroys this RenderWidgetHost). |
| 1204 } | 1206 } |
| 1205 } | 1207 } |
| 1206 } | 1208 } |
| OLD | NEW |