content/common/gpu/image_transport_surface_calayer_mac.mm - Issue 753933002: MacViews: Move content::AcceleratedWidget to new component, ui/accelerated_widget_mac

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/common/gpu/image_transport_surface_calayer_mac.mm

Issue 753933002: MacViews: Move content::AcceleratedWidget to new component, ui/accelerated_widget_mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20141124-MacViews-MoveSoftwareLayerMac-fromcl

Patch Set: rebase to master Created 6 years, 1 month 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 side-by-side diff with in-line comments

Download patch

« content/browser/gpu/gpu_process_host_ui_shim.cc ('K') | « content/browser/renderer_host/render_widget_host_view_mac.mm ('k') | content/common/gpu/image_transport_surface_iosurface_mac.cc » ('j') | ui/compositor/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/gpu/image_transport_surface_calayer_mac.mm

diff --git a/content/common/gpu/image_transport_surface_calayer_mac.mm b/content/common/gpu/image_transport_surface_calayer_mac.mm

index 59a3d9108985e4b45bd7dcbcc94fb1f0a426445f..0aa3d88d2a09a6810e47dbca82902ca4bd54dd72 100644

--- a/content/common/gpu/image_transport_surface_calayer_mac.mm

+++ b/content/common/gpu/image_transport_surface_calayer_mac.mm

@@ -8,8 +8,8 @@

#include "base/command_line.h"

#include "base/mac/sdk_forward_declarations.h"

-#include "content/common/gpu/surface_handle_types_mac.h"

#include "ui/base/cocoa/animation_utils.h"

+#include "ui/compositor/mac/surface_handle_types_mac.h"

#include "ui/gfx/geometry/size_conversions.h"

#include "ui/gl/gl_gl_api_implementation.h"

#include "ui/gl/gl_switches.h"

@@ -337,7 +337,7 @@ void CALayerStorageProvider::UnblockBrowserIfNeeded() {

pending_draw_weak_factory_.InvalidateWeakPtrs();

has_pending_draw_ = false;

transport_surface_->SendSwapBuffers(

- SurfaceHandleFromCAContextID([context_ contextId]),

+ ui::SurfaceHandleFromCAContextID([context_ contextId]),

fbo_pixel_size_,

fbo_scale_factor_);

}