Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(360)

Side by Side Diff: chrome/browser/renderer_host/render_widget_host_view_views.cc

Issue 6462034: Refactor how surfaces are acquired for GPU compositing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove unnecessary include. Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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_view_views.h" 5 #include "chrome/browser/renderer_host/render_widget_host_view_views.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/message_loop.h" 12 #include "base/message_loop.h"
13 #include "base/metrics/histogram.h" 13 #include "base/metrics/histogram.h"
14 #include "base/string_number_conversions.h" 14 #include "base/string_number_conversions.h"
15 #include "base/task.h" 15 #include "base/task.h"
16 #include "base/time.h" 16 #include "base/time.h"
17 #include "chrome/browser/renderer_host/backing_store_skia.h" 17 #include "chrome/browser/renderer_host/backing_store_skia.h"
18 #include "chrome/browser/renderer_host/backing_store_x.h" 18 #include "chrome/browser/renderer_host/backing_store_x.h"
19 #include "chrome/browser/renderer_host/render_widget_host.h" 19 #include "chrome/browser/renderer_host/render_widget_host.h"
20 #include "chrome/common/native_web_keyboard_event.h" 20 #include "chrome/common/native_web_keyboard_event.h"
21 #include "chrome/common/render_messages.h" 21 #include "chrome/common/render_messages.h"
22 #include "chrome/common/result_codes.h" 22 #include "chrome/common/result_codes.h"
23 #include "third_party/WebKit/Source/WebKit/chromium/public/gtk/WebInputEventFact ory.h" 23 #include "third_party/WebKit/Source/WebKit/chromium/public/gtk/WebInputEventFact ory.h"
24 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" 24 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
25 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h" 25 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
26 #include "ui/base/l10n/l10n_util.h" 26 #include "ui/base/l10n/l10n_util.h"
27 #include "ui/base/x/x11_util.h" 27 #include "ui/base/x/x11_util.h"
28 #include "ui/gfx/canvas.h" 28 #include "ui/gfx/canvas.h"
29 #include "ui/gfx/canvas_skia.h" 29 #include "ui/gfx/canvas_skia.h"
30 #include "ui/gfx/gtk_native_view_id_manager.h"
30 #include "views/events/event.h" 31 #include "views/events/event.h"
31 #include "views/ime/ime_context.h" 32 #include "views/ime/ime_context.h"
32 #include "views/widget/widget.h" 33 #include "views/widget/widget.h"
33 #include "views/widget/widget_gtk.h" 34 #include "views/widget/widget_gtk.h"
34 35
35 static const int kMaxWindowWidth = 4000; 36 static const int kMaxWindowWidth = 4000;
36 static const int kMaxWindowHeight = 4000; 37 static const int kMaxWindowHeight = 4000;
37 static const char kRenderWidgetHostViewKey[] = "__RENDER_WIDGET_HOST_VIEW__"; 38 static const char kRenderWidgetHostViewKey[] = "__RENDER_WIDGET_HOST_VIEW__";
38 static const char kBackingStoreSkiaSwitch[] = "use-backing-store-skia"; 39 static const char kBackingStoreSkiaSwitch[] = "use-backing-store-skia";
39 40
(...skipping 739 matching lines...) Expand 10 before | Expand all | Expand 10 after
779 return false; 780 return false;
780 } 781 }
781 782
782 void RenderWidgetHostViewViews::AcceleratedCompositingActivated( 783 void RenderWidgetHostViewViews::AcceleratedCompositingActivated(
783 bool activated) { 784 bool activated) {
784 // TODO(anicolao): figure out if we need something here 785 // TODO(anicolao): figure out if we need something here
785 if (activated) 786 if (activated)
786 NOTIMPLEMENTED(); 787 NOTIMPLEMENTED();
787 } 788 }
788 789
790 gfx::PluginWindowHandle RenderWidgetHostViewViews::AcquireCompositingSurface() {
791 GtkNativeViewManager* manager = GtkNativeViewManager::GetInstance();
792 gfx::PluginWindowHandle surface = gfx::kNullPluginWindow;
793 gfx::NativeViewId view_id = gfx::IdFromNativeView(GetInnerNativeView());
794
795 if (!manager->GetXIDForId(&surface, view_id)) {
796 DLOG(ERROR) << "Can't find XID for view id " << view_id;
797 }
798 return surface;
799 }
800
801 void RenderWidgetHostViewViews::ReleaseCompositingSurface(
802 gfx::PluginWindowHandle surface) {
803 }
804
789 WebKit::WebMouseEvent RenderWidgetHostViewViews::WebMouseEventFromViewsEvent( 805 WebKit::WebMouseEvent RenderWidgetHostViewViews::WebMouseEventFromViewsEvent(
790 const views::MouseEvent& event) { 806 const views::MouseEvent& event) {
791 WebKit::WebMouseEvent wmevent; 807 WebKit::WebMouseEvent wmevent;
792 InitializeWebMouseEventFromViewsEvent(event, GetMirroredPosition(), &wmevent); 808 InitializeWebMouseEventFromViewsEvent(event, GetMirroredPosition(), &wmevent);
793 809
794 // Setting |wmevent.button| is not necessary for -move events, but it is 810 // Setting |wmevent.button| is not necessary for -move events, but it is
795 // necessary for -clicks and -drags. 811 // necessary for -clicks and -drags.
796 if (event.IsMiddleMouseButton()) { 812 if (event.IsMiddleMouseButton()) {
797 wmevent.modifiers |= WebKit::WebInputEvent::MiddleButtonDown; 813 wmevent.modifiers |= WebKit::WebInputEvent::MiddleButtonDown;
798 wmevent.button = WebKit::WebMouseEvent::ButtonMiddle; 814 wmevent.button = WebKit::WebMouseEvent::ButtonMiddle;
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
968 } 984 }
969 985
970 // static 986 // static
971 RenderWidgetHostView* 987 RenderWidgetHostView*
972 RenderWidgetHostView::GetRenderWidgetHostViewFromNativeView( 988 RenderWidgetHostView::GetRenderWidgetHostViewFromNativeView(
973 gfx::NativeView widget) { 989 gfx::NativeView widget) {
974 gpointer user_data = g_object_get_data(G_OBJECT(widget), 990 gpointer user_data = g_object_get_data(G_OBJECT(widget),
975 kRenderWidgetHostViewKey); 991 kRenderWidgetHostViewKey);
976 return reinterpret_cast<RenderWidgetHostView*>(user_data); 992 return reinterpret_cast<RenderWidgetHostView*>(user_data);
977 } 993 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698