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

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

Issue 1129883003: Pass Surface ID namespace to renderer compositors. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Mac bug. Created 5 years, 7 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
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 <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 gfx::AcceleratedWidget AccessibilityGetAcceleratedWidget() override; 217 gfx::AcceleratedWidget AccessibilityGetAcceleratedWidget() override;
218 gfx::NativeViewAccessible AccessibilityGetNativeViewAccessible() override; 218 gfx::NativeViewAccessible AccessibilityGetNativeViewAccessible() override;
219 void ShowDisambiguationPopup(const gfx::Rect& rect_pixels, 219 void ShowDisambiguationPopup(const gfx::Rect& rect_pixels,
220 const SkBitmap& zoomed_bitmap) override; 220 const SkBitmap& zoomed_bitmap) override;
221 bool LockMouse() override; 221 bool LockMouse() override;
222 void UnlockMouse() override; 222 void UnlockMouse() override;
223 void OnSwapCompositorFrame(uint32 output_surface_id, 223 void OnSwapCompositorFrame(uint32 output_surface_id,
224 scoped_ptr<cc::CompositorFrame> frame) override; 224 scoped_ptr<cc::CompositorFrame> frame) override;
225 void DidStopFlinging() override; 225 void DidStopFlinging() override;
226 void OnDidNavigateMainFrameToNewPage() override; 226 void OnDidNavigateMainFrameToNewPage() override;
227 uint32_t GetSurfaceIdNamespace() override;
227 228
228 #if defined(OS_WIN) 229 #if defined(OS_WIN)
229 void SetParentNativeViewAccessible( 230 void SetParentNativeViewAccessible(
230 gfx::NativeViewAccessible accessible_parent) override; 231 gfx::NativeViewAccessible accessible_parent) override;
231 gfx::NativeViewId GetParentForWindowlessPlugin() const override; 232 gfx::NativeViewId GetParentForWindowlessPlugin() const override;
232 #endif 233 #endif
233 234
234 // Overridden from ui::TextInputClient: 235 // Overridden from ui::TextInputClient:
235 void SetCompositionText(const ui::CompositionText& composition) override; 236 void SetCompositionText(const ui::CompositionText& composition) override;
236 void ConfirmCompositionText() override; 237 void ConfirmCompositionText() override;
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after
670 // compositing surface and showing the disambiguation popup. 671 // compositing surface and showing the disambiguation popup.
671 gfx::Vector2dF disambiguation_scroll_offset_; 672 gfx::Vector2dF disambiguation_scroll_offset_;
672 673
673 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; 674 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_;
674 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); 675 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
675 }; 676 };
676 677
677 } // namespace content 678 } // namespace content
678 679
679 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 680 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698