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

Unified Diff: content/browser/compositor/browser_compositor_view_mac.h

Issue 283053002: Add compositing, layers to app_list_demo Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase onto master -- probably slightly broken Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | ui/app_list/demo/app_list_demo_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/compositor/browser_compositor_view_mac.h
diff --git a/content/browser/compositor/browser_compositor_view_mac.h b/content/browser/compositor/browser_compositor_view_mac.h
index e6019c3521af3adaae6298f3a83e71cd7e0ba5ce..4a134ad9aa8ca6fcfdeb3c7e8517f9fd564ae2fc 100644
--- a/content/browser/compositor/browser_compositor_view_mac.h
+++ b/content/browser/compositor/browser_compositor_view_mac.h
@@ -13,6 +13,21 @@
#include "ui/events/latency_info.h"
#include "ui/gfx/geometry/size.h"
+#include "content/common/content_export.h"
+
+// Additions to the NSView interface for compositor frames.
+@interface NSView (BrowserCompositorView)
+- (void)gotAcceleratedIOSurfaceFrame:(IOSurfaceID)surface_handle
+ withOutputSurfaceID:(int)surface_id
+ withLatencyInfo:(std::vector<ui::LatencyInfo>) latency_info
+ withPixelSize:(gfx::Size)pixel_size
+ withScaleFactor:(float)scale_factor;
+
+- (void)gotSoftwareFrame:(cc::SoftwareFrameData*)frame_data
+ withScaleFactor:(float)scale_factor
+ withCanvas:(SkCanvas*)canvas;
+@end // NSView (BrowserCompositorView)
+
namespace content {
class BrowserCompositorViewMacInternal;
@@ -20,7 +35,7 @@ class BrowserCompositorViewMacInternal;
// The interface through which BrowserCompositorViewMac calls back into
// RenderWidgetHostViewMac (or any other structure that wishes to draw a
// NSView backed by a ui::Compositor).
-class BrowserCompositorViewMacClient {
+class CONTENT_EXPORT BrowserCompositorViewMacClient {
public:
// Drawing is usually throttled by the rate at which CoreAnimation draws
// frames to the screen. This can be used to disable throttling.
@@ -44,7 +59,7 @@ class BrowserCompositorViewMacClient {
// expensive in terms of work, this class is largely used to manage recycled
// instances of BrowserCompositorViewCocoa, which actually is a NSView and
// has a ui::Compositor instance.
-class BrowserCompositorViewMac {
+class CONTENT_EXPORT BrowserCompositorViewMac {
public:
// This will install the NSView which is drawn by the ui::Compositor into
// the NSView provided by the client.
@@ -86,7 +101,7 @@ class BrowserCompositorViewMac {
// While at least one instance of this class exists, a spare
// BrowserCompositorViewCocoa will be kept around to be recycled so that the
// next BrowserCompositorViewMac to be created will be be created quickly.
-class BrowserCompositorViewPlaceholderMac {
+class CONTENT_EXPORT BrowserCompositorViewPlaceholderMac {
public:
BrowserCompositorViewPlaceholderMac();
~BrowserCompositorViewPlaceholderMac();
« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | ui/app_list/demo/app_list_demo_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698