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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_gtk.cc

Issue 10352016: Consolidate RenderWidgetHost::CopyFromBackingStore and RenderWidgetHost::AsyncCopyFromBackingStore. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 7 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) 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_gtk.h" 5 #include "content/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 "content/common/view_messages.h" 10 #include "content/common/view_messages.h"
(...skipping 970 matching lines...) Expand 10 before | Expand all | Expand 10 after
981 } 981 }
982 982
983 BackingStore* RenderWidgetHostViewGtk::AllocBackingStore( 983 BackingStore* RenderWidgetHostViewGtk::AllocBackingStore(
984 const gfx::Size& size) { 984 const gfx::Size& size) {
985 gint depth = gdk_visual_get_depth(gtk_widget_get_visual(view_.get())); 985 gint depth = gdk_visual_get_depth(gtk_widget_get_visual(view_.get()));
986 return new BackingStoreGtk(host_, size, 986 return new BackingStoreGtk(host_, size,
987 ui::GetVisualFromGtkWidget(view_.get()), 987 ui::GetVisualFromGtkWidget(view_.get()),
988 depth); 988 depth);
989 } 989 }
990 990
991 bool RenderWidgetHostViewGtk::CopyFromCompositingSurface( 991 void RenderWidgetHostViewGtk::CopyFromCompositingSurface(
992 const gfx::Size& size,
993 skia::PlatformCanvas* output) {
994 // TODO(mazda): Implement this.
995 NOTIMPLEMENTED();
996 return false;
997 }
998
999 void RenderWidgetHostViewGtk::AsyncCopyFromCompositingSurface(
1000 const gfx::Size& size, 992 const gfx::Size& size,
1001 skia::PlatformCanvas* output, 993 skia::PlatformCanvas* output,
1002 base::Callback<void(bool)> callback) { 994 base::Callback<void(bool)> callback) {
1003 // TODO(mazda): Implement this. 995 // TODO(mazda): Implement this.
1004 NOTIMPLEMENTED(); 996 NOTIMPLEMENTED();
1005 callback.Run(false); 997 callback.Run(false);
1006 } 998 }
1007 999
1008 void RenderWidgetHostViewGtk::AcceleratedSurfaceBuffersSwapped( 1000 void RenderWidgetHostViewGtk::AcceleratedSurfaceBuffersSwapped(
1009 const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params, 1001 const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params,
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
1406 return new RenderWidgetHostViewGtk(widget); 1398 return new RenderWidgetHostViewGtk(widget);
1407 } 1399 }
1408 1400
1409 // static 1401 // static
1410 void content::RenderWidgetHostViewPort::GetDefaultScreenInfo( 1402 void content::RenderWidgetHostViewPort::GetDefaultScreenInfo(
1411 WebKit::WebScreenInfo* results) { 1403 WebKit::WebScreenInfo* results) {
1412 GdkWindow* gdk_window = 1404 GdkWindow* gdk_window =
1413 gdk_display_get_default_group(gdk_display_get_default()); 1405 gdk_display_get_default_group(gdk_display_get_default());
1414 content::GetScreenInfoFromNativeWindow(gdk_window, results); 1406 content::GetScreenInfoFromNativeWindow(gdk_window, results);
1415 } 1407 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698