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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_aura.h

Issue 10915298: Add CCDelegatingRenderer, and corresponding IPCs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix clang Created 8 years, 2 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 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
7 7
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/memory/linked_ptr.h" 12 #include "base/memory/linked_ptr.h"
13 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
15 #include "cc/compositor_frame.h"
15 #include "content/browser/renderer_host/image_transport_factory.h" 16 #include "content/browser/renderer_host/image_transport_factory.h"
16 #include "content/browser/renderer_host/render_widget_host_view_base.h" 17 #include "content/browser/renderer_host/render_widget_host_view_base.h"
17 #include "content/common/content_export.h" 18 #include "content/common/content_export.h"
18 #include "ui/aura/client/activation_delegate.h" 19 #include "ui/aura/client/activation_delegate.h"
19 #include "ui/aura/window_delegate.h" 20 #include "ui/aura/window_delegate.h"
20 #include "ui/base/ime/text_input_client.h" 21 #include "ui/base/ime/text_input_client.h"
21 #include "ui/compositor/compositor_observer.h" 22 #include "ui/compositor/compositor_observer.h"
22 #include "ui/gfx/rect.h" 23 #include "ui/gfx/rect.h"
23 #include "webkit/glue/webcursor.h" 24 #include "webkit/glue/webcursor.h"
24 25
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 virtual void AcceleratedSurfacePostSubBuffer( 119 virtual void AcceleratedSurfacePostSubBuffer(
119 const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params_in_pixel, 120 const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params_in_pixel,
120 int gpu_host_id) OVERRIDE; 121 int gpu_host_id) OVERRIDE;
121 virtual void AcceleratedSurfaceSuspend() OVERRIDE; 122 virtual void AcceleratedSurfaceSuspend() OVERRIDE;
122 virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) OVERRIDE; 123 virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) OVERRIDE;
123 virtual void AcceleratedSurfaceNew( 124 virtual void AcceleratedSurfaceNew(
124 int32 width_in_pixel, 125 int32 width_in_pixel,
125 int32 height_in_pixel, 126 int32 height_in_pixel,
126 uint64 surface_id) OVERRIDE; 127 uint64 surface_id) OVERRIDE;
127 virtual void AcceleratedSurfaceRelease(uint64 surface_id) OVERRIDE; 128 virtual void AcceleratedSurfaceRelease(uint64 surface_id) OVERRIDE;
129 virtual void SwapCompositorFrame(
130 const cc::CompositorFrame& frame) OVERRIDE;
128 virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE; 131 virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE;
129 virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE; 132 virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE;
130 virtual void ProcessTouchAck(WebKit::WebInputEvent::Type type, 133 virtual void ProcessTouchAck(WebKit::WebInputEvent::Type type,
131 bool processed) OVERRIDE; 134 bool processed) OVERRIDE;
132 virtual void SetHasHorizontalScrollbar( 135 virtual void SetHasHorizontalScrollbar(
133 bool has_horizontal_scrollbar) OVERRIDE; 136 bool has_horizontal_scrollbar) OVERRIDE;
134 virtual void SetScrollOffsetPinning( 137 virtual void SetScrollOffsetPinning(
135 bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE; 138 bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE;
136 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE; 139 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE;
137 virtual bool LockMouse() OVERRIDE; 140 virtual bool LockMouse() OVERRIDE;
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 245
243 // Run the compositing callbacks. 246 // Run the compositing callbacks.
244 void RunCompositingDidCommitCallbacks(ui::Compositor* compositor); 247 void RunCompositingDidCommitCallbacks(ui::Compositor* compositor);
245 void RunCompositingWillStartCallbacks(ui::Compositor* compositor); 248 void RunCompositingWillStartCallbacks(ui::Compositor* compositor);
246 249
247 // Insert a sync point into the compositor's command stream and acknowledge 250 // Insert a sync point into the compositor's command stream and acknowledge
248 // that we have presented the accelerated surface buffer. 251 // that we have presented the accelerated surface buffer.
249 static void InsertSyncPointAndACK(int32 route_id, 252 static void InsertSyncPointAndACK(int32 route_id,
250 int gpu_host_id, 253 int gpu_host_id,
251 ui::Compositor* compositor); 254 ui::Compositor* compositor);
255 void SwapCompositorFrameAck(const cc::TransferableResourceList& resources, ui: :Compositor*);
256 void SendSwapCompositorFrameAck(ui::Compositor*);
252 257
253 // Called when window_ is removed from the window tree. 258 // Called when window_ is removed from the window tree.
254 void RemovingFromRootWindow(); 259 void RemovingFromRootWindow();
255 260
256 // After clearing |current_surface_|, and waiting for the compositor to finish 261 // After clearing |current_surface_|, and waiting for the compositor to finish
257 // using it, call this to inform the gpu process. 262 // using it, call this to inform the gpu process.
258 void SetSurfaceNotInUseByCompositor(ui::Compositor* compositor); 263 void SetSurfaceNotInUseByCompositor(ui::Compositor* compositor);
259 264
260 // This is called every time |current_surface_| usage changes (by thumbnailer, 265 // This is called every time |current_surface_| usage changes (by thumbnailer,
261 // compositor draws, and tab visibility). Every time usage of current surface 266 // compositor draws, and tab visibility). Every time usage of current surface
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 // Used to track the state of the window we're created from. Only used when 397 // Used to track the state of the window we're created from. Only used when
393 // created fullscreen. 398 // created fullscreen.
394 scoped_ptr<aura::WindowTracker> host_tracker_; 399 scoped_ptr<aura::WindowTracker> host_tracker_;
395 400
396 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); 401 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
397 }; 402 };
398 403
399 } // namespace content 404 } // namespace content
400 405
401 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 406 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698