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

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

Issue 11861020: Aura: Browser-side changes for Composite-To-Mailbox (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 virtual void ProcessAckedTouchEvent( 134 virtual void ProcessAckedTouchEvent(
135 const WebKit::WebTouchEvent& touch, 135 const WebKit::WebTouchEvent& touch,
136 InputEventAckState ack_result) OVERRIDE; 136 InputEventAckState ack_result) OVERRIDE;
137 virtual void SetHasHorizontalScrollbar( 137 virtual void SetHasHorizontalScrollbar(
138 bool has_horizontal_scrollbar) OVERRIDE; 138 bool has_horizontal_scrollbar) OVERRIDE;
139 virtual void SetScrollOffsetPinning( 139 virtual void SetScrollOffsetPinning(
140 bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE; 140 bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE;
141 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE; 141 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE;
142 virtual bool LockMouse() OVERRIDE; 142 virtual bool LockMouse() OVERRIDE;
143 virtual void UnlockMouse() OVERRIDE; 143 virtual void UnlockMouse() OVERRIDE;
144 virtual void OnSwapCompositorFrame(const cc::CompositorFrame& frame,
145 int render_host_id,
146 int route_id) OVERRIDE;
144 147
145 // Overridden from ui::TextInputClient: 148 // Overridden from ui::TextInputClient:
146 virtual void SetCompositionText( 149 virtual void SetCompositionText(
147 const ui::CompositionText& composition) OVERRIDE; 150 const ui::CompositionText& composition) OVERRIDE;
148 virtual void ConfirmCompositionText() OVERRIDE; 151 virtual void ConfirmCompositionText() OVERRIDE;
149 virtual void ClearCompositionText() OVERRIDE; 152 virtual void ClearCompositionText() OVERRIDE;
150 virtual void InsertText(const string16& text) OVERRIDE; 153 virtual void InsertText(const string16& text) OVERRIDE;
151 virtual void InsertChar(char16 ch, int flags) OVERRIDE; 154 virtual void InsertChar(char16 ch, int flags) OVERRIDE;
152 virtual ui::TextInputType GetTextInputType() const OVERRIDE; 155 virtual ui::TextInputType GetTextInputType() const OVERRIDE;
153 virtual bool CanComposeInline() const OVERRIDE; 156 virtual bool CanComposeInline() const OVERRIDE;
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 bool result); 299 bool result);
297 300
298 ui::Compositor* GetCompositor(); 301 ui::Compositor* GetCompositor();
299 302
300 // Detaches |this| from the input method object. 303 // Detaches |this| from the input method object.
301 void DetachFromInputMethod(); 304 void DetachFromInputMethod();
302 305
303 // Converts |rect| from window coordinate to screen coordinate. 306 // Converts |rect| from window coordinate to screen coordinate.
304 gfx::Rect ConvertRectToScreen(const gfx::Rect& rect); 307 gfx::Rect ConvertRectToScreen(const gfx::Rect& rect);
305 308
309 void BuffersSwapped(const gfx::Size& size,
310 const std::string& mailbox_name,
311 int route_id,
312 int host_id);
313
306 bool SwapBuffersPrepare(const gfx::Rect& surface_rect, 314 bool SwapBuffersPrepare(const gfx::Rect& surface_rect,
307 const gfx::Rect& damage_rect, 315 const gfx::Rect& damage_rect,
308 const std::string& mailbox_name, 316 const std::string& mailbox_name,
309 BufferPresentedParams* params); 317 BufferPresentedParams* params);
310 318
311 void SwapBuffersCompleted(const BufferPresentedParams& params); 319 void SwapBuffersCompleted(const BufferPresentedParams& params);
312 320
313 // The model object. 321 // The model object.
314 RenderWidgetHostImpl* host_; 322 RenderWidgetHostImpl* host_;
315 323
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 NO_PENDING_COMMIT, 440 NO_PENDING_COMMIT,
433 }; 441 };
434 CanLockCompositorState can_lock_compositor_; 442 CanLockCompositorState can_lock_compositor_;
435 443
436 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); 444 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
437 }; 445 };
438 446
439 } // namespace content 447 } // namespace content
440 448
441 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 449 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698