| 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 1027 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1038 int32 width, | 1038 int32 width, |
| 1039 int32 height, | 1039 int32 height, |
| 1040 TransportDIB::Handle transport_dib) { | 1040 TransportDIB::Handle transport_dib) { |
| 1041 if (view_) { | 1041 if (view_) { |
| 1042 view_->AcceleratedSurfaceSetTransportDIB(window, width, height, | 1042 view_->AcceleratedSurfaceSetTransportDIB(window, width, height, |
| 1043 transport_dib); | 1043 transport_dib); |
| 1044 } | 1044 } |
| 1045 } | 1045 } |
| 1046 | 1046 |
| 1047 void RenderWidgetHost::OnAcceleratedSurfaceBuffersSwapped( | 1047 void RenderWidgetHost::OnAcceleratedSurfaceBuffersSwapped( |
| 1048 gfx::PluginWindowHandle window) { | 1048 gfx::PluginWindowHandle window, uint64 surface_id) { |
| 1049 if (view_) { | 1049 if (view_) { |
| 1050 view_->AcceleratedSurfaceBuffersSwapped(window); | 1050 view_->AcceleratedSurfaceBuffersSwapped(window, surface_id); |
| 1051 } | 1051 } |
| 1052 } | 1052 } |
| 1053 #elif defined(OS_POSIX) | 1053 #elif defined(OS_POSIX) |
| 1054 | 1054 |
| 1055 void RenderWidgetHost::OnMsgCreatePluginContainer(gfx::PluginWindowHandle id) { | 1055 void RenderWidgetHost::OnMsgCreatePluginContainer(gfx::PluginWindowHandle id) { |
| 1056 // TODO(piman): view_ can only be NULL with delayed view creation in | 1056 // TODO(piman): view_ can only be NULL with delayed view creation in |
| 1057 // extensions (see ExtensionHost::CreateRenderViewSoon). Figure out how to | 1057 // extensions (see ExtensionHost::CreateRenderViewSoon). Figure out how to |
| 1058 // support plugins in that case. | 1058 // support plugins in that case. |
| 1059 if (view_) { | 1059 if (view_) { |
| 1060 view_->CreatePluginContainer(id); | 1060 view_->CreatePluginContainer(id); |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1214 // of this key event. | 1214 // of this key event. |
| 1215 if (!processed && !is_hidden_ && !front_item.skip_in_browser) { | 1215 if (!processed && !is_hidden_ && !front_item.skip_in_browser) { |
| 1216 UnhandledKeyboardEvent(front_item); | 1216 UnhandledKeyboardEvent(front_item); |
| 1217 | 1217 |
| 1218 // WARNING: This RenderWidgetHost can be deallocated at this point | 1218 // WARNING: This RenderWidgetHost can be deallocated at this point |
| 1219 // (i.e. in the case of Ctrl+W, where the call to | 1219 // (i.e. in the case of Ctrl+W, where the call to |
| 1220 // UnhandledKeyboardEvent destroys this RenderWidgetHost). | 1220 // UnhandledKeyboardEvent destroys this RenderWidgetHost). |
| 1221 } | 1221 } |
| 1222 } | 1222 } |
| 1223 } | 1223 } |
| OLD | NEW |