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 #include "content/browser/compositor/browser_compositor_view_mac.h" | 5 #include "content/browser/compositor/browser_compositor_view_mac.h" |
6 | 6 |
7 #include "base/lazy_instance.h" | 7 #include "base/lazy_instance.h" |
8 #include "base/trace_event/trace_event.h" | 8 #include "base/trace_event/trace_event.h" |
9 #include "content/browser/compositor/image_transport_factory.h" | 9 #include "content/browser/compositor/image_transport_factory.h" |
10 #include "content/browser/gpu/gpu_data_manager_impl.h" | 10 #include "content/browser/gpu/gpu_data_manager_impl.h" |
(...skipping 25 matching lines...) Expand all Loading... |
36 return GpuDataManagerImpl::GetInstance()->IsDriverBugWorkaroundActive( | 36 return GpuDataManagerImpl::GetInstance()->IsDriverBugWorkaroundActive( |
37 gpu::FORCE_GL_FINISH_AFTER_COMPOSITING); | 37 gpu::FORCE_GL_FINISH_AFTER_COMPOSITING); |
38 } | 38 } |
39 | 39 |
40 } // namespace | 40 } // namespace |
41 | 41 |
42 BrowserCompositorMac::BrowserCompositorMac() | 42 BrowserCompositorMac::BrowserCompositorMac() |
43 : accelerated_widget_mac_( | 43 : accelerated_widget_mac_( |
44 new ui::AcceleratedWidgetMac(WidgetNeedsGLFinishWorkaround())), | 44 new ui::AcceleratedWidgetMac(WidgetNeedsGLFinishWorkaround())), |
45 compositor_( | 45 compositor_( |
46 accelerated_widget_mac_->accelerated_widget(), | |
47 content::GetContextFactory(), | 46 content::GetContextFactory(), |
48 RenderWidgetResizeHelper::Get()->task_runner()) { | 47 RenderWidgetResizeHelper::Get()->task_runner()) { |
| 48 compositor_->OnAcceleratedWidgetAvailable( |
| 49 accelerated_widget_mac_->accelerated_widget()); |
49 compositor_.SetLocksWillTimeOut(false); | 50 compositor_.SetLocksWillTimeOut(false); |
50 Suspend(); | 51 Suspend(); |
51 compositor_.AddObserver(this); | 52 compositor_.AddObserver(this); |
52 } | 53 } |
53 | 54 |
54 BrowserCompositorMac::~BrowserCompositorMac() { | 55 BrowserCompositorMac::~BrowserCompositorMac() { |
55 compositor_.RemoveObserver(this); | 56 compositor_.RemoveObserver(this); |
56 } | 57 } |
57 | 58 |
58 void BrowserCompositorMac::Suspend() { | 59 void BrowserCompositorMac::Suspend() { |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
114 DCHECK_GT(g_placeholder_count, 0u); | 115 DCHECK_GT(g_placeholder_count, 0u); |
115 g_placeholder_count -= 1; | 116 g_placeholder_count -= 1; |
116 | 117 |
117 // If there are no placeholders allocated, destroy the recyclable | 118 // If there are no placeholders allocated, destroy the recyclable |
118 // BrowserCompositorMac. | 119 // BrowserCompositorMac. |
119 if (!g_placeholder_count) | 120 if (!g_placeholder_count) |
120 g_recyclable_browser_compositor.Get().reset(); | 121 g_recyclable_browser_compositor.Get().reset(); |
121 } | 122 } |
122 | 123 |
123 } // namespace content | 124 } // namespace content |
OLD | NEW |