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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_android.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_ANDROID_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
7 7
8 #include <map> 8 #include <map>
9 #include <queue> 9 #include <queue>
10 10
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 const WebKit::WebMouseWheelEvent& event) OVERRIDE; 149 const WebKit::WebMouseWheelEvent& event) OVERRIDE;
150 virtual InputEventAckState FilterInputEvent( 150 virtual InputEventAckState FilterInputEvent(
151 const WebKit::WebInputEvent& input_event) OVERRIDE; 151 const WebKit::WebInputEvent& input_event) OVERRIDE;
152 virtual void OnAccessibilityNotifications( 152 virtual void OnAccessibilityNotifications(
153 const std::vector<AccessibilityHostMsg_NotificationParams>& 153 const std::vector<AccessibilityHostMsg_NotificationParams>&
154 params) OVERRIDE; 154 params) OVERRIDE;
155 virtual bool LockMouse() OVERRIDE; 155 virtual bool LockMouse() OVERRIDE;
156 virtual void UnlockMouse() OVERRIDE; 156 virtual void UnlockMouse() OVERRIDE;
157 virtual void HasTouchEventHandlers(bool need_touch_events) OVERRIDE; 157 virtual void HasTouchEventHandlers(bool need_touch_events) OVERRIDE;
158 virtual void OnSwapCompositorFrame( 158 virtual void OnSwapCompositorFrame(
159 uint32 output_surface_id,
159 scoped_ptr<cc::CompositorFrame> frame) OVERRIDE; 160 scoped_ptr<cc::CompositorFrame> frame) OVERRIDE;
160 virtual void OnOverscrolled(gfx::Vector2dF accumulated_overscroll, 161 virtual void OnOverscrolled(gfx::Vector2dF accumulated_overscroll,
161 gfx::Vector2dF current_fling_velocity) OVERRIDE; 162 gfx::Vector2dF current_fling_velocity) OVERRIDE;
162 virtual void ShowDisambiguationPopup(const gfx::Rect& target_rect, 163 virtual void ShowDisambiguationPopup(const gfx::Rect& target_rect,
163 const SkBitmap& zoomed_bitmap) OVERRIDE; 164 const SkBitmap& zoomed_bitmap) OVERRIDE;
164 virtual SmoothScrollGesture* CreateSmoothScrollGesture( 165 virtual SmoothScrollGesture* CreateSmoothScrollGesture(
165 bool scroll_down, int pixels_to_scroll, int mouse_event_x, 166 bool scroll_down, int pixels_to_scroll, int mouse_event_x,
166 int mouse_event_y) OVERRIDE; 167 int mouse_event_y) OVERRIDE;
167 168
168 // Implementation of BrowserAccessibilityDelegate: 169 // Implementation of BrowserAccessibilityDelegate:
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 229
229 void SynchronousFrameMetadata( 230 void SynchronousFrameMetadata(
230 const cc::CompositorFrameMetadata& frame_metadata); 231 const cc::CompositorFrameMetadata& frame_metadata);
231 232
232 private: 233 private:
233 void BuffersSwapped(const gpu::Mailbox& mailbox, 234 void BuffersSwapped(const gpu::Mailbox& mailbox,
234 const base::Closure& ack_callback); 235 const base::Closure& ack_callback);
235 236
236 void RunAckCallbacks(); 237 void RunAckCallbacks();
237 238
238 void SwapDelegatedFrame(scoped_ptr<cc::DelegatedFrameData> frame_data); 239 void SwapDelegatedFrame(uint32 output_surface_id,
239 void SendDelegatedFrameAck(); 240 scoped_ptr<cc::DelegatedFrameData> frame_data);
241 void SendDelegatedFrameAck(uint32 output_surface_id);
240 242
241 void UpdateContentViewCoreFrameMetadata( 243 void UpdateContentViewCoreFrameMetadata(
242 const cc::CompositorFrameMetadata& frame_metadata); 244 const cc::CompositorFrameMetadata& frame_metadata);
243 void ComputeContentsSize(const cc::CompositorFrameMetadata& frame_metadata); 245 void ComputeContentsSize(const cc::CompositorFrameMetadata& frame_metadata);
244 void ResetClipping(); 246 void ResetClipping();
245 void ClipContents(const gfx::Rect& clipping, const gfx::Size& content_size); 247 void ClipContents(const gfx::Rect& clipping, const gfx::Size& content_size);
246 248
247 void AttachLayers(); 249 void AttachLayers();
248 void RemoveLayers(); 250 void RemoveLayers();
249 251
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 // Used to render overscroll overlays. 305 // Used to render overscroll overlays.
304 bool overscroll_effect_enabled_; 306 bool overscroll_effect_enabled_;
305 scoped_ptr<OverscrollGlow> overscroll_effect_; 307 scoped_ptr<OverscrollGlow> overscroll_effect_;
306 308
307 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid); 309 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid);
308 }; 310 };
309 311
310 } // namespace content 312 } // namespace content
311 313
312 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ 314 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698