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

Side by Side Diff: mojo/services/native_viewport/native_viewport_impl.h

Issue 607233002: Nukes NativeViewportClient::OnCreated (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix build Created 6 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
« no previous file with comments | « mojo/mojo_examples.gypi ('k') | mojo/services/native_viewport/native_viewport_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 MOJO_SERVICES_NATIVE_VIEWPORT_IMPL_H_ 5 #ifndef MOJO_SERVICES_NATIVE_VIEWPORT_IMPL_H_
6 #define MOJO_SERVICES_NATIVE_VIEWPORT_IMPL_H_ 6 #define MOJO_SERVICES_NATIVE_VIEWPORT_IMPL_H_
7 7
8 #include "base/memory/weak_ptr.h" 8 #include "base/memory/weak_ptr.h"
9 #include "cc/surfaces/surface_id.h" 9 #include "cc/surfaces/surface_id.h"
10 #include "mojo/services/native_viewport/platform_viewport.h" 10 #include "mojo/services/native_viewport/platform_viewport.h"
(...skipping 10 matching lines...) Expand all
21 class ApplicationImpl; 21 class ApplicationImpl;
22 class ViewportSurface; 22 class ViewportSurface;
23 23
24 class NativeViewportImpl : public InterfaceImpl<NativeViewport>, 24 class NativeViewportImpl : public InterfaceImpl<NativeViewport>,
25 public PlatformViewport::Delegate { 25 public PlatformViewport::Delegate {
26 public: 26 public:
27 NativeViewportImpl(ApplicationImpl* app, bool is_headless); 27 NativeViewportImpl(ApplicationImpl* app, bool is_headless);
28 virtual ~NativeViewportImpl(); 28 virtual ~NativeViewportImpl();
29 29
30 // InterfaceImpl<NativeViewport> implementation. 30 // InterfaceImpl<NativeViewport> implementation.
31 virtual void Create(SizePtr bounds) OVERRIDE; 31 virtual void Create(SizePtr size,
32 const Callback<void(uint64_t)>& callback) OVERRIDE;
32 virtual void Show() OVERRIDE; 33 virtual void Show() OVERRIDE;
33 virtual void Hide() OVERRIDE; 34 virtual void Hide() OVERRIDE;
34 virtual void Close() OVERRIDE; 35 virtual void Close() OVERRIDE;
35 virtual void SetBounds(SizePtr bounds) OVERRIDE; 36 virtual void SetSize(SizePtr size) OVERRIDE;
36 virtual void SubmittedFrame(SurfaceIdPtr surface_id) OVERRIDE; 37 virtual void SubmittedFrame(SurfaceIdPtr surface_id) OVERRIDE;
37 38
38 // PlatformViewport::Delegate implementation. 39 // PlatformViewport::Delegate implementation.
39 virtual void OnBoundsChanged(const gfx::Rect& bounds) OVERRIDE; 40 virtual void OnBoundsChanged(const gfx::Rect& bounds) OVERRIDE;
40 virtual void OnAcceleratedWidgetAvailable( 41 virtual void OnAcceleratedWidgetAvailable(
41 gfx::AcceleratedWidget widget) OVERRIDE; 42 gfx::AcceleratedWidget widget) OVERRIDE;
42 virtual bool OnEvent(ui::Event* ui_event) OVERRIDE; 43 virtual bool OnEvent(ui::Event* ui_event) OVERRIDE;
43 virtual void OnDestroyed() OVERRIDE; 44 virtual void OnDestroyed() OVERRIDE;
44 45
45 void AckEvent(); 46 void AckEvent();
46 47
47 private: 48 private:
48 bool is_headless_; 49 bool is_headless_;
49 scoped_ptr<PlatformViewport> platform_viewport_; 50 scoped_ptr<PlatformViewport> platform_viewport_;
50 scoped_ptr<ViewportSurface> viewport_surface_; 51 scoped_ptr<ViewportSurface> viewport_surface_;
51 uint64_t widget_id_; 52 uint64_t widget_id_;
52 gfx::Rect bounds_; 53 gfx::Size size_;
53 GpuPtr gpu_service_; 54 GpuPtr gpu_service_;
54 SurfacesServicePtr surfaces_service_; 55 SurfacesServicePtr surfaces_service_;
55 cc::SurfaceId child_surface_id_; 56 cc::SurfaceId child_surface_id_;
56 bool waiting_for_event_ack_; 57 bool waiting_for_event_ack_;
58 Callback<void(uint64_t)> create_callback_;
57 base::WeakPtrFactory<NativeViewportImpl> weak_factory_; 59 base::WeakPtrFactory<NativeViewportImpl> weak_factory_;
58 60
59 DISALLOW_COPY_AND_ASSIGN(NativeViewportImpl); 61 DISALLOW_COPY_AND_ASSIGN(NativeViewportImpl);
60 }; 62 };
61 63
62 } // namespace mojo 64 } // namespace mojo
63 65
64 #endif // MOJO_SERVICES_NATIVE_VIEWPORT_IMPL_H_ 66 #endif // MOJO_SERVICES_NATIVE_VIEWPORT_IMPL_H_
OLDNEW
« no previous file with comments | « mojo/mojo_examples.gypi ('k') | mojo/services/native_viewport/native_viewport_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698