OLD | NEW |
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 CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_VIEW_MAC_H_ | 5 #ifndef CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_VIEW_MAC_H_ |
6 #define CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_VIEW_MAC_H_ | 6 #define CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_VIEW_MAC_H_ |
7 | 7 |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "cc/output/software_frame_data.h" | 10 #include "cc/output/software_frame_data.h" |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
63 // Mark a bracket in which new frames are pumped in a restricted nested run | 63 // Mark a bracket in which new frames are pumped in a restricted nested run |
64 // loop because the the target window is resizing or because the view is being | 64 // loop because the the target window is resizing or because the view is being |
65 // shown after previously being hidden. | 65 // shown after previously being hidden. |
66 void BeginPumpingFrames(); | 66 void BeginPumpingFrames(); |
67 void EndPumpingFrames(); | 67 void EndPumpingFrames(); |
68 | 68 |
69 static void GotAcceleratedFrame( | 69 static void GotAcceleratedFrame( |
70 gfx::AcceleratedWidget widget, | 70 gfx::AcceleratedWidget widget, |
71 uint64 surface_handle, int surface_id, | 71 uint64 surface_handle, int surface_id, |
72 const std::vector<ui::LatencyInfo>& latency_info, | 72 const std::vector<ui::LatencyInfo>& latency_info, |
73 gfx::Size pixel_size, float scale_factor); | 73 gfx::Size pixel_size, float scale_factor, |
| 74 int gpu_host_id, int gpu_route_id); |
74 | 75 |
75 static void GotSoftwareFrame( | 76 static void GotSoftwareFrame( |
76 gfx::AcceleratedWidget widget, | 77 gfx::AcceleratedWidget widget, |
77 cc::SoftwareFrameData* frame_data, float scale_factor, SkCanvas* canvas); | 78 cc::SoftwareFrameData* frame_data, float scale_factor, SkCanvas* canvas); |
78 | 79 |
79 private: | 80 private: |
80 BrowserCompositorViewMacClient* client_; | 81 BrowserCompositorViewMacClient* client_; |
81 scoped_ptr<BrowserCompositorViewMacInternal> internal_view_; | 82 scoped_ptr<BrowserCompositorViewMacInternal> internal_view_; |
82 }; | 83 }; |
83 | 84 |
84 // A class to keep around whenever a BrowserCompositorViewMac may be created. | 85 // A class to keep around whenever a BrowserCompositorViewMac may be created. |
85 // While at least one instance of this class exists, a spare | 86 // While at least one instance of this class exists, a spare |
86 // BrowserCompositorViewCocoa will be kept around to be recycled so that the | 87 // BrowserCompositorViewCocoa will be kept around to be recycled so that the |
87 // next BrowserCompositorViewMac to be created will be be created quickly. | 88 // next BrowserCompositorViewMac to be created will be be created quickly. |
88 class BrowserCompositorViewPlaceholderMac { | 89 class BrowserCompositorViewPlaceholderMac { |
89 public: | 90 public: |
90 BrowserCompositorViewPlaceholderMac(); | 91 BrowserCompositorViewPlaceholderMac(); |
91 ~BrowserCompositorViewPlaceholderMac(); | 92 ~BrowserCompositorViewPlaceholderMac(); |
92 }; | 93 }; |
93 | 94 |
94 } // namespace content | 95 } // namespace content |
95 | 96 |
96 #endif // CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_VIEW_MAC_H_ | 97 #endif // CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_VIEW_MAC_H_ |
OLD | NEW |