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

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

Issue 19331002: Associate an id with the output surface to handle lost contexts (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix android, tests Created 7 years, 5 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 <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 bool has_horizontal_scrollbar) OVERRIDE; 234 bool has_horizontal_scrollbar) OVERRIDE;
235 virtual void SetScrollOffsetPinning( 235 virtual void SetScrollOffsetPinning(
236 bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE; 236 bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE;
237 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE; 237 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE;
238 virtual void OnAccessibilityNotifications( 238 virtual void OnAccessibilityNotifications(
239 const std::vector<AccessibilityHostMsg_NotificationParams>& 239 const std::vector<AccessibilityHostMsg_NotificationParams>&
240 params) OVERRIDE; 240 params) OVERRIDE;
241 virtual bool LockMouse() OVERRIDE; 241 virtual bool LockMouse() OVERRIDE;
242 virtual void UnlockMouse() OVERRIDE; 242 virtual void UnlockMouse() OVERRIDE;
243 virtual void OnSwapCompositorFrame( 243 virtual void OnSwapCompositorFrame(
244 uint32 output_surface_id,
244 scoped_ptr<cc::CompositorFrame> frame) OVERRIDE; 245 scoped_ptr<cc::CompositorFrame> frame) OVERRIDE;
245 #if defined(OS_WIN) 246 #if defined(OS_WIN)
246 virtual void SetParentNativeViewAccessible( 247 virtual void SetParentNativeViewAccessible(
247 gfx::NativeViewAccessible accessible_parent) OVERRIDE; 248 gfx::NativeViewAccessible accessible_parent) OVERRIDE;
248 #endif 249 #endif
249 250
250 // Overridden from ui::TextInputClient: 251 // Overridden from ui::TextInputClient:
251 virtual void SetCompositionText( 252 virtual void SetCompositionText(
252 const ui::CompositionText& composition) OVERRIDE; 253 const ui::CompositionText& composition) OVERRIDE;
253 virtual void ConfirmCompositionText() OVERRIDE; 254 virtual void ConfirmCompositionText() OVERRIDE;
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
485 float surface_scale_factor, 486 float surface_scale_factor,
486 const gfx::Rect& damage_rect, 487 const gfx::Rect& damage_rect,
487 const std::string& mailbox_name, 488 const std::string& mailbox_name,
488 const BufferPresentedCallback& ack_callback); 489 const BufferPresentedCallback& ack_callback);
489 490
490 void SwapBuffersCompleted( 491 void SwapBuffersCompleted(
491 const BufferPresentedCallback& ack_callback, 492 const BufferPresentedCallback& ack_callback,
492 const scoped_refptr<ui::Texture>& texture_to_return); 493 const scoped_refptr<ui::Texture>& texture_to_return);
493 494
494 void SwapDelegatedFrame( 495 void SwapDelegatedFrame(
496 uint32 output_surface_id,
495 scoped_ptr<cc::DelegatedFrameData> frame_data, 497 scoped_ptr<cc::DelegatedFrameData> frame_data,
496 float frame_device_scale_factor, 498 float frame_device_scale_factor,
497 const ui::LatencyInfo& latency_info); 499 const ui::LatencyInfo& latency_info);
498 void SendDelegatedFrameAck(); 500 void SendDelegatedFrameAck(uint32 output_surface_id);
499 501
500 void SwapSoftwareFrame( 502 void SwapSoftwareFrame(
503 uint32 output_surface_id,
501 scoped_ptr<cc::SoftwareFrameData> frame_data, 504 scoped_ptr<cc::SoftwareFrameData> frame_data,
502 float frame_device_scale_factor, 505 float frame_device_scale_factor,
503 const ui::LatencyInfo& latency_info); 506 const ui::LatencyInfo& latency_info);
504 void SendSoftwareFrameAck(unsigned software_frame_id); 507 void SendSoftwareFrameAck(uint32 output_surface_id,
508 unsigned software_frame_id);
505 509
506 BrowserAccessibilityManager* GetOrCreateBrowserAccessibilityManager(); 510 BrowserAccessibilityManager* GetOrCreateBrowserAccessibilityManager();
507 511
508 #if defined(OS_WIN) 512 #if defined(OS_WIN)
509 // Sets the cutout rects from transient windows. These are rectangles that 513 // Sets the cutout rects from transient windows. These are rectangles that
510 // windowed NPAPI plugins shouldn't paint in. Overwrites any previous cutout 514 // windowed NPAPI plugins shouldn't paint in. Overwrites any previous cutout
511 // rects. 515 // rects.
512 void UpdateTransientRects(const std::vector<gfx::Rect>& rects); 516 void UpdateTransientRects(const std::vector<gfx::Rect>& rects);
513 517
514 // Updates the total list of cutout rects, which is the union of transient 518 // Updates the total list of cutout rects, which is the union of transient
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
688 TouchEditingClient* touch_editing_client_; 692 TouchEditingClient* touch_editing_client_;
689 693
690 ui::LatencyInfo software_latency_info_; 694 ui::LatencyInfo software_latency_info_;
691 695
692 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); 696 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
693 }; 697 };
694 698
695 } // namespace content 699 } // namespace content
696 700
697 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 701 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698