| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_view_gtk.h" | 5 #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h" |
| 6 | 6 |
| 7 // If this gets included after the gtk headers, then a bunch of compiler | 7 // If this gets included after the gtk headers, then a bunch of compiler |
| 8 // errors happen because of a "#define Status int" in Xlib.h, which interacts | 8 // errors happen because of a "#define Status int" in Xlib.h, which interacts |
| 9 // badly with net::URLRequestStatus::Status. | 9 // badly with net::URLRequestStatus::Status. |
| 10 #include "chrome/common/render_messages.h" | 10 #include "chrome/common/render_messages.h" |
| (...skipping 1101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1112 | 1112 |
| 1113 if (animate) { | 1113 if (animate) { |
| 1114 overlay_animation_.Reset(); | 1114 overlay_animation_.Reset(); |
| 1115 overlay_animation_.Show(); | 1115 overlay_animation_.Show(); |
| 1116 } else { | 1116 } else { |
| 1117 overlay_animation_.Reset(1.0); | 1117 overlay_animation_.Reset(1.0); |
| 1118 gtk_widget_queue_draw(view_.get()); | 1118 gtk_widget_queue_draw(view_.get()); |
| 1119 } | 1119 } |
| 1120 } | 1120 } |
| 1121 | 1121 |
| 1122 void RenderWidgetHostViewGtk::UnhandledWheelEvent( |
| 1123 const WebKit::WebMouseWheelEvent& event) { |
| 1124 } |
| 1125 |
| 1126 void RenderWidgetHostViewGtk::SetHasHorizontalScrollbar( |
| 1127 bool has_horizontal_scrollbar) { |
| 1128 } |
| 1129 |
| 1130 void RenderWidgetHostViewGtk::SetScrollOffsetPinning( |
| 1131 bool is_pinned_to_left, bool is_pinned_to_right) { |
| 1132 } |
| 1133 |
| 1134 |
| 1122 void RenderWidgetHostViewGtk::AcceleratedCompositingActivated(bool activated) { | 1135 void RenderWidgetHostViewGtk::AcceleratedCompositingActivated(bool activated) { |
| 1123 GtkPreserveWindow* widget = | 1136 GtkPreserveWindow* widget = |
| 1124 reinterpret_cast<GtkPreserveWindow*>(view_.get()); | 1137 reinterpret_cast<GtkPreserveWindow*>(view_.get()); |
| 1125 | 1138 |
| 1126 gtk_preserve_window_delegate_resize(widget, activated); | 1139 gtk_preserve_window_delegate_resize(widget, activated); |
| 1127 } | 1140 } |
| 1128 | 1141 |
| 1129 gfx::PluginWindowHandle RenderWidgetHostViewGtk::GetCompositingSurface() { | 1142 gfx::PluginWindowHandle RenderWidgetHostViewGtk::GetCompositingSurface() { |
| 1130 if (compositing_surface_ == gfx::kNullPluginWindow) { | 1143 if (compositing_surface_ == gfx::kNullPluginWindow) { |
| 1131 GtkNativeViewManager* manager = GtkNativeViewManager::GetInstance(); | 1144 GtkNativeViewManager* manager = GtkNativeViewManager::GetInstance(); |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1187 } | 1200 } |
| 1188 | 1201 |
| 1189 // static | 1202 // static |
| 1190 RenderWidgetHostView* | 1203 RenderWidgetHostView* |
| 1191 RenderWidgetHostView::GetRenderWidgetHostViewFromNativeView( | 1204 RenderWidgetHostView::GetRenderWidgetHostViewFromNativeView( |
| 1192 gfx::NativeView widget) { | 1205 gfx::NativeView widget) { |
| 1193 gpointer user_data = g_object_get_data(G_OBJECT(widget), | 1206 gpointer user_data = g_object_get_data(G_OBJECT(widget), |
| 1194 kRenderWidgetHostViewKey); | 1207 kRenderWidgetHostViewKey); |
| 1195 return reinterpret_cast<RenderWidgetHostView*>(user_data); | 1208 return reinterpret_cast<RenderWidgetHostView*>(user_data); |
| 1196 } | 1209 } |
| OLD | NEW |